diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
index 4e31aaa51935..46801a635838 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
@@ -380,7 +380,7 @@ public final class JavaFunctionalExpressionSearcher extends QueryExecutorBase<Ps
 
     @NotNull
     private Set<VirtualFile> getMostLikelyFiles(@NotNull GlobalSearchScope searchScope) {
-      Set<VirtualFile> files = ContainerUtil.newConcurrentSet();
+      Set<VirtualFile> files = new LinkedHashSet<>();
       dumbService.runReadActionInSmartMode(() -> {
         if (!samClass.isValid()) return;
 
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index 3345746c2a76..5cb8c73da017 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -1213,7 +1213,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
     private final Set<Integer> myTrigrams;
     @Nullable
     private final Short myContext;
-    private boolean myUseOnlyWeakHashToSearch;
+    private final boolean myUseOnlyWeakHashToSearch;
 
     private TextIndexQuery(@NotNull Set<IdIndexEntry> idIndexEntries,
                            @NotNull Set<Integer> trigrams,