diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
index 5ee8c31eb0b2..7fe1133494d6 100644
--- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -74,7 +74,6 @@
 import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.events.TransferEvent;
 import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -429,29 +428,27 @@ private boolean loadIndexingContext2(final RepositoryInfo info) throws IOExcepti
             }
         }
 
-        int oldMax = BooleanQuery.getMaxClauseCount();
+        int oldMax = IndexSearcher.getMaxClauseCount();
         try {
             int max = oldMax;
             while (true) {
                 IteratorSearchResponse response;
                 try {
-                    BooleanQuery.setMaxClauseCount(max);
+                    IndexSearcher.setMaxClauseCount(max);
                     response = searcher.searchIteratorPaged(isr, contexts);
                     LOGGER.log(Level.FINE, "passed on {0} clauses processing {1} with {2} hits", new Object[] {max, q, response.getTotalHitsCount()});
                     return response;
-                } catch (BooleanQuery.TooManyClauses exc) {
+                } catch (IndexSearcher.TooManyClauses exc) {
                     LOGGER.log(Level.FINE, "TooManyClauses on {0} clauses processing {1}", new Object[] {max, q});
                     max *= 2;
                     if (max > MAX_MAX_CLAUSE) {
                         LOGGER.log(Level.WARNING, "Encountered more than {0} clauses processing {1}", new Object[] {MAX_MAX_CLAUSE, q});
                         return null;
-                    } else {
-                        continue;
                     }
                 }
             }
         } finally {
-            BooleanQuery.setMaxClauseCount(oldMax);
+            IndexSearcher.setMaxClauseCount(oldMax);
         }
     }
 
diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
index 2918b07175d4..7fac8f39ea87 100644
--- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
+++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
@@ -227,9 +227,9 @@ public List<RepositoryInfo> getRepositoryInfos() {
         final Settings settings = embedder2.getSettings();
         for (Mirror mirror : settings.getMirrors()) {
             String mirrorOf = mirror.getMirrorOf();
-            selectorWithGroups.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirrorOf, mirror.getMirrorOfLayouts());
+            selectorWithGroups.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, false, mirrorOf, mirror.getMirrorOfLayouts());
             if (!mirrorOf.contains("*")) {
-                selectorWithoutGroups.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirrorOf, mirror.getMirrorOfLayouts());
+                selectorWithoutGroups.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, false, mirrorOf, mirror.getMirrorOfLayouts());
             }
         }