diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
index 97cb62710..d24ad8981 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
@@ -19,9 +19,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
                 return DirectorySearch(new EnumerationOptions
                 {
                     RecurseSubdirectories = true
-                }, query, search, criteria, token);
+                }, search, criteria, token);
 
-            return DirectorySearch(new EnumerationOptions(), query, search, criteria,
+            return DirectorySearch(new EnumerationOptions(), search, criteria,
                 token); // null will be passed as default
         }
 
@@ -44,7 +44,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
             return incompleteName;
         }
 
-        private static IEnumerable<SearchResult> DirectorySearch(EnumerationOptions enumerationOption, Query query, string search,
+        private static IEnumerable<SearchResult> DirectorySearch(EnumerationOptions enumerationOption, string search,
             string searchCriteria, CancellationToken token)
         {
             var results = new List<SearchResult>();
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index d9beea456..9ede33fe3 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -172,14 +172,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
 
             var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath);
 
-            if (retrievedDirectoryPath.EndsWith(":\\"))
-            {
-                results.Add(ResultManager.CreateDriveSpaceDisplayResult(retrievedDirectoryPath, useIndexSearch));
-            }
-            else
-            {
-                results.Add(ResultManager.CreateOpenCurrentFolderResult(retrievedDirectoryPath, useIndexSearch));
-            }
+            results.Add(retrievedDirectoryPath.EndsWith(":\\") 
+                ? ResultManager.CreateDriveSpaceDisplayResult(retrievedDirectoryPath, useIndexSearch)
+                : ResultManager.CreateOpenCurrentFolderResult(retrievedDirectoryPath, useIndexSearch));
 
             if (token.IsCancellationRequested)
                 return new List<Result>();
@@ -188,7 +183,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
 
             var recursiveIndicatorIndex = query.Search.IndexOf('>');
 
-            if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.Direct)
+            if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.DirectEnumeration)
             {
                 directoryResult =
                     await Settings.PathEnumerator.EnumerateAsync(
@@ -228,15 +223,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
         {
             var pathToDirectory = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath);
 
-            if (!Settings.UseWindowsIndexForDirectorySearch)
-                return false;
-
-            if (Settings.IndexSearchExcludedSubdirectoryPaths
-                .Any(x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory)
-                    .StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)))
-                return false;
-
-            return WindowsIndex.WindowsIndex.PathIsIndexed(pathToDirectory);
+            return !Settings.IndexSearchExcludedSubdirectoryPaths.Any(
+                x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory).StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)) 
+                   && WindowsIndex.WindowsIndex.PathIsIndexed(pathToDirectory);
         }
     }
 }