diff --git a/DeFRaG_Helper/ViewModels/MapViewModel.cs b/DeFRaG_Helper/ViewModels/MapViewModel.cs
index ad8c318..f54f22e 100644
--- a/DeFRaG_Helper/ViewModels/MapViewModel.cs
+++ b/DeFRaG_Helper/ViewModels/MapViewModel.cs
@@ -139,7 +139,10 @@ private async void ApplyFilters()
             await Task.Run(() =>
             {
                 var filteredMaps = Maps.Where(map =>
-                    (string.IsNullOrEmpty(SearchText) || map.Name.Contains(SearchText, StringComparison.OrdinalIgnoreCase)) &&
+                    (string.IsNullOrEmpty(SearchText) ||
+                     map.Name.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ||
+                     map.Mapname.Contains(SearchText, StringComparison.OrdinalIgnoreCase) ||
+                     map.Filename.Contains(SearchText, StringComparison.OrdinalIgnoreCase)) &&
                     (!ShowFavorites || map.IsFavorite == 1) &&
                     (!ShowInstalled || map.IsInstalled == 1) &&
                     (!ShowDownloaded || map.IsDownloaded == 1))
@@ -156,6 +159,7 @@ await Task.Run(() =>
         }
 
 
+
         public void LoadDisplayedMapsSubset(List<Map> sourceMaps, int startIndex, int count)
         {
             for (int i = startIndex; i < Math.Min(startIndex + count, sourceMaps.Count); i++)