diff --git a/Source/NETworkManager.Converters/WiFiAuthenticationTypeToHumanReadableStringConverter.cs b/Source/NETworkManager.Converters/WiFiAuthenticationTypeToHumanReadableStringConverter.cs
deleted file mode 100644
index 06868a4a98..0000000000
--- a/Source/NETworkManager.Converters/WiFiAuthenticationTypeToHumanReadableStringConverter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using Windows.Networking.Connectivity;
-using NETworkManager.Models.Network;
-
-namespace NETworkManager.Converters;
-
-public sealed class WiFiAuthenticationTypeToHumanReadableStringConverter : IValueConverter
-{
-    /* Translate the name of the accent */
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value is not NetworkAuthenticationType type
-            ? "-/-"
-            : $"{WiFi.GetHumanReadableNetworkAuthenticationType(type)}";
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager.Converters/WiFiChannelCenterFrequencyToChannelStringConverter.cs b/Source/NETworkManager.Converters/WiFiChannelCenterFrequencyToChannelStringConverter.cs
deleted file mode 100644
index a061d751dd..0000000000
--- a/Source/NETworkManager.Converters/WiFiChannelCenterFrequencyToChannelStringConverter.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace NETworkManager.Converters;
-
-public sealed class WiFiChannelCenterFrequencyToChannelStringConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value is not int channel ? "-/-" : $"{channel}";
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager.Converters/WiFiPhyKindToStringConverter.cs b/Source/NETworkManager.Converters/WiFiPhyKindToStringConverter.cs
deleted file mode 100644
index 6e0eef97bf..0000000000
--- a/Source/NETworkManager.Converters/WiFiPhyKindToStringConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using Windows.Devices.WiFi;
-using NETworkManager.Models.Network;
-
-namespace NETworkManager.Converters;
-
-public sealed class WiFiPhyKindToStringConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return value is not WiFiPhyKind phyKind ? "-/-" : $"{WiFi.GetHumanReadablePhyKind(phyKind)}";
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager.Models/Network/WiFi.cs b/Source/NETworkManager.Models/Network/WiFi.cs
index 3c5af19d2d..0066ee502a 100644
--- a/Source/NETworkManager.Models/Network/WiFi.cs
+++ b/Source/NETworkManager.Models/Network/WiFi.cs
@@ -6,6 +6,7 @@
 using Windows.Devices.WiFi;
 using Windows.Networking.Connectivity;
 using Windows.Security.Credentials;
+using NETworkManager.Models.Lookup;
 
 namespace NETworkManager.Models.Network;
 
@@ -81,6 +82,9 @@ public static async Task<WiFiNetworkScanInfo> GetNetworksAsync(WiFiAdapter adapt
                 Channel = GetChannelFromChannelFrequency(channelFrequencyInGigahertz),
                 IsHidden = string.IsNullOrEmpty(availableNetwork.Ssid),
                 IsConnected = availableNetwork.Bssid.Equals(bssid, StringComparison.OrdinalIgnoreCase),
+                NetworkAuthenticationType = GetHumanReadableNetworkAuthenticationType(availableNetwork.SecuritySettings.NetworkAuthenticationType),
+                Vendor = (await OUILookup.LookupByMacAddressAsync(availableNetwork.Bssid)).FirstOrDefault()?.Vendor ?? "-/-",
+                PhyKind = GetHumanReadablePhyKind(availableNetwork.PhyKind)
             };
 
             wifiNetworkInfos.Add(wifiNetworkInfo);
diff --git a/Source/NETworkManager.Models/Network/WiFiNetworkInfo.cs b/Source/NETworkManager.Models/Network/WiFiNetworkInfo.cs
index 20c61a38fd..6c94b8ffa5 100644
--- a/Source/NETworkManager.Models/Network/WiFiNetworkInfo.cs
+++ b/Source/NETworkManager.Models/Network/WiFiNetworkInfo.cs
@@ -25,10 +25,10 @@ public WiFiNetworkInfo()
     /// <summary>
     ///    Radio that is used like 2.4 GHz, 5 GHz, etc.
     /// </summary>
-    public WiFiRadio Radio { get; set; }
+    public WiFiRadio Radio { get; init; }
 
     /// <summary>
-    ///    The channel center frequency in Gigahertz.
+    ///    The channel center frequency in Gigahertz like 2.4 GHz, 5 GHz, etc.
     /// </summary>
     public double ChannelCenterFrequencyInGigahertz { get; set; }
 
@@ -47,5 +47,19 @@ public WiFiNetworkInfo()
     /// </summary>
     public bool IsConnected { get; set; }
 
+    /// <summary>
+    /// Human-readable network authentication type.
+    /// </summary>
+    public string NetworkAuthenticationType { get; set; }
+    
+    /// <summary>
+    /// Vendor of the Wi-Fi network like Cisco, Netgear, etc.
+    /// </summary>
+    public string Vendor { get; set; }
+    
+    /// <summary>
+    /// Human-readable phy kind.
+    /// </summary>
+    public string PhyKind { get; set; }
     #endregion
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/WiFiViewModel.cs b/Source/NETworkManager/ViewModels/WiFiViewModel.cs
index c7e0ea52e8..93aad6ce3c 100644
--- a/Source/NETworkManager/ViewModels/WiFiViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WiFiViewModel.cs
@@ -84,7 +84,7 @@ public bool IsAdaptersLoading
         }
     }
 
-    private List<WiFiAdapterInfo> _adapters = new();
+    private List<WiFiAdapterInfo> _adapters = [];
 
     public List<WiFiAdapterInfo> Adapters
     {
@@ -487,13 +487,14 @@ public WiFiViewModel(IDialogCoordinator instance)
             if (string.IsNullOrEmpty(Search))
                 return true;
 
-            // Search by: SSID, Security, Channel, BSSID (MAC address), Vendor, Phy kind
+            // Search by: SSID, Security, Frequency , Channel, BSSID (MAC address), Vendor, Phy kind
             return info.AvailableNetwork.Ssid.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
-                   WiFi.GetHumanReadableNetworkAuthenticationType(info.AvailableNetwork.SecuritySettings.NetworkAuthenticationType).IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
+                   info.NetworkAuthenticationType.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
+                   $"{info.ChannelCenterFrequencyInGigahertz}".IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
                    $"{info.Channel}".IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
                    info.AvailableNetwork.Bssid.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
-                   OUILookup.LookupByMacAddress(info.AvailableNetwork.Bssid).FirstOrDefault()?.Vendor.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
-                   WiFi.GetHumanReadablePhyKind(info.AvailableNetwork.PhyKind).IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1;
+                   info.Vendor.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1 ||
+                   info.PhyKind.IndexOf(Search, StringComparison.OrdinalIgnoreCase) > -1;
         };
 
         // Load network adapters
diff --git a/Source/NETworkManager/Views/WiFiView.xaml b/Source/NETworkManager/Views/WiFiView.xaml
index c7c228893e..6a4d21ffdb 100644
--- a/Source/NETworkManager/Views/WiFiView.xaml
+++ b/Source/NETworkManager/Views/WiFiView.xaml
@@ -27,18 +27,12 @@
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:IntNotZeroToVisibilityCollapsedConverter x:Key="IntNotZeroToVisibilityCollapsedConverter" />
         <converters:IntZeroToVisibilityCollapsedConverter x:Key="IntZeroToVisibilityCollapsedConverter" />
-        <converters:MACAddressToVendorConverter x:Key="MACAddressToVendorConverter" />
         <converters:TimeSpanToMillisecondConverter x:Key="TimeSpanToMillisecondConverter" />
         <converters:TimeSpanToStringConverter x:Key="TimeSpanToStringConverter" />
-        <converters:WiFiAuthenticationTypeToHumanReadableStringConverter
-            x:Key="WiFiAuthenticationTypeToHumanReadableStringConverter" />
-        <converters:WiFiChannelCenterFrequencyToChannelStringConverter
-            x:Key="WiFiChannelCenterFrequencyToChannelStringConverter" />
         <converters:WiFiChannelCenterFrequencyToFrequencyStringConverter
             x:Key="WiFiChannelCenterFrequencyToFrequencyStringConverter" />
         <converters:WiFiNetworkRssiInDecibelMilliwattsToSignalStrengthStringConverter
             x:Key="WiFiNetworkRssiInDecibelMilliwattsToSignalStrengthStringConverter" />
-        <converters:WiFiPhyKindToStringConverter x:Key="WiFiPhyKindToStringConverter" />
     </UserControl.Resources>
     <Grid>
         <Grid>
@@ -306,7 +300,7 @@
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem Header="{x:Static Member=localization:Strings.Security}"
                                                               Command="{Binding Path=CopyDataToClipboardCommand}"
-                                                              CommandParameter="{Binding Path=SelectedNetwork.AvailableNetwork.SecuritySettings.NetworkAuthenticationType, Converter={StaticResource ResourceKey=WiFiAuthenticationTypeToHumanReadableStringConverter}}"
+                                                              CommandParameter="{Binding Path=SelectedNetwork.NetworkAuthenticationType}"
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem Header="{x:Static Member=localization:Strings.Frequency}"
                                                               Command="{Binding Path=CopyDataToClipboardCommand}"
@@ -314,7 +308,7 @@
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem Header="{x:Static Member=localization:Strings.Channel}"
                                                               Command="{Binding Path=CopyDataToClipboardCommand}"
-                                                              CommandParameter="{Binding Path=SelectedNetwork.Channel, Converter={StaticResource ResourceKey=WiFiChannelCenterFrequencyToChannelStringConverter}}"
+                                                              CommandParameter="{Binding Path=SelectedNetwork.Channel}"
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem
                                                         Header="{x:Static Member=localization:Strings.SignalStrength}"
@@ -337,11 +331,11 @@
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem Header="{x:Static Member=localization:Strings.Vendor}"
                                                               Command="{Binding Path=CopyDataToClipboardCommand}"
-                                                              CommandParameter="{Binding Path=SelectedNetwork.AvailableNetwork.Bssid, Converter={StaticResource ResourceKey=MACAddressToVendorConverter}}"
+                                                              CommandParameter="{Binding Path=SelectedNetwork.Vendor}"
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem Header="{x:Static Member=localization:Strings.PhyKind}"
                                                               Command="{Binding Path=CopyDataToClipboardCommand}"
-                                                              CommandParameter="{Binding Path=SelectedNetwork.AvailableNetwork.PhyKind, Converter={StaticResource ResourceKey=WiFiPhyKindToStringConverter}}"
+                                                              CommandParameter="{Binding Path=SelectedNetwork.PhyKind}"
                                                               Style="{StaticResource ResourceKey=CopyMenuItem}" />
                                                     <MenuItem
                                                         Header="{x:Static Member=localization:Strings.NetworkKind}"
@@ -569,15 +563,15 @@
                                                 SortMemberPath="IsConnected" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Security}"
-                                                Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).SecuritySettings.NetworkAuthenticationType, Converter={StaticResource ResourceKey=WiFiAuthenticationTypeToHumanReadableStringConverter}}"
-                                                SortMemberPath="AvailableNetwork.SecuritySettings.NetworkAuthenticationType" />
+                                                Binding="{Binding Path=(network:WiFiNetworkInfo.NetworkAuthenticationType)}"
+                                                SortMemberPath="NetworkAuthenticationType" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Frequency}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.ChannelCenterFrequencyInGigahertz), Converter={StaticResource ResourceKey=WiFiChannelCenterFrequencyToFrequencyStringConverter}}"
-                                                SortMemberPath="AvailableNetwork.ChannelCenterFrequencyInKilohertz" />
+                                                SortMemberPath="ChannelCenterFrequencyInGigahertz" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.Channel}"
-                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.Channel), Converter={StaticResource ResourceKey=WiFiChannelCenterFrequencyToChannelStringConverter}}"
-                                                                SortMemberPath="AvailableNetwork.ChannelCenterFrequencyInKilohertz" />
+                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.Channel)}"
+                                                                SortMemberPath="Channel" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.SignalStrength}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).NetworkRssiInDecibelMilliwatts, Converter={StaticResource ResourceKey=WiFiNetworkRssiInDecibelMilliwattsToSignalStrengthStringConverter}}"
@@ -594,11 +588,11 @@
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).Bssid}"
                                                                 SortMemberPath="AvailableNetwork.Bssid" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.Vendor}"
-                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).Bssid, Converter={StaticResource ResourceKey=MACAddressToVendorConverter}}"
-                                                                SortMemberPath="AvailableNetwork.Bssid" />
+                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.Vendor)}"
+                                                                SortMemberPath="Vendor" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.PhyKind}"
-                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).PhyKind, Converter={StaticResource ResourceKey=WiFiPhyKindToStringConverter}}"
-                                                                SortMemberPath="AvailableNetwork.PhyKind" />
+                                                                Binding="{Binding Path=(network:WiFiNetworkInfo.PhyKind)}"
+                                                                SortMemberPath="PhyKind" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.NetworkKind}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).NetworkKind}"
diff --git a/Website/docs/application/wifi.md b/Website/docs/application/wifi.md
index 16187154d7..a4ad0901d1 100644
--- a/Website/docs/application/wifi.md
+++ b/Website/docs/application/wifi.md
@@ -18,7 +18,7 @@ Right-click on a wireless network opens a context menu with the following option
 - **Disconnect**: Disconnect from the selected wireless network.
 - **Export...**: Opens a dialog to export the selected or all wireless network(s) to a file.
 
-In the search field, you can filter the wireless networks by `SSID`, `Security`, `Channel`, `BSSID (MAC Address)`, `Vendor` and `Phy kind`. The search is case insensitive.
+In the search field, you can filter the wireless networks by `SSID`, `Security`, `Frequency`, `Channel`, `BSSID (MAC Address)`, `Vendor` and `Phy kind`. The search is case insensitive.
 
 :::note
 
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 030e909e81..73d643cef5 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -28,6 +28,9 @@ Release date: **xx.xx.2024**
 
 ## Improvements
 
+- **WiFi**
+  - Improve search, cleanup/remove some converters to make the code more readable and faster. [#2940](https://github.com/BornToBeRoot/NETworkManager/pull/2940)
+
 ## Bugfixes
 
 - Changed the Welcome dialog from `MahApps.Metro.Controls.Dialogs` to `MahApps.Metro.SimpleChildWindow`, so the main window can be dragged and resized on the first start. [#2914](https://github.com/BornToBeRoot/NETworkManager/pull/2914)
@@ -37,6 +40,6 @@ Release date: **xx.xx.2024**
 
 ## Dependencies, Refactoring & Documentation
 
-- Code cleanup & refactoring
+- Code cleanup & refactoring [#2940](https://github.com/BornToBeRoot/NETworkManager/pull/2940)
 - Language files updated via [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration)
 - Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot)