diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
index 391f08a4e1..c0ffadb07d 100644
--- a/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
+++ b/src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
@@ -374,7 +374,7 @@ public class SolrQueryHTTPClient extends AbstractSolrQueryHTTPClient implements
         boolean requiresSeparator = false;
         for(StoreRef storeRef : storeRefs)
         {
-            SolrStoreMappingWrapper storeMapping = SolrClientUtil.extractMapping(storeRef, mappingLookup, shardRegistry, useDynamicShardRegistration, beanFactory);
+            SolrStoreMappingWrapper storeMapping = SolrClientUtil.extractMapping(storeRef, mappingLookup, shardRegistry, requiresSeparator, beanFactory);
 
             if(requiresSeparator)
             {
@@ -474,7 +474,7 @@ public class SolrQueryHTTPClient extends AbstractSolrQueryHTTPClient implements
                     SolrStoreMappingWrapper storeMapping =
                             SolrClientUtil.extractMapping(storeRef, 
                                                           mappingLookup, shardRegistry, 
-                                                          useDynamicShardRegistration, beanFactory);
+                                                          requiresSeparator, beanFactory);
 
                     if(requiresSeparator)
                     {
diff --git a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java b/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
index 732c5cbb38..a11032d543 100644
--- a/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
+++ b/src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
@@ -27,7 +27,6 @@ package org.alfresco.repo.search.impl.solr;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -43,6 +42,7 @@ import org.alfresco.repo.search.impl.lucene.SolrJsonProcessor;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.search.BasicSearchParameters;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.StatsParameters;
@@ -152,7 +152,7 @@ public class SolrSQLHttpClient extends AbstractSolrQueryHTTPClient implements So
              * When sharded we pass array of shard instances otherwise we pass the local instance url which
              * is http://url:port/solr/collection_name
              */
-            if(isSharded())
+            if(mapping.isSharded())
             {
                 url.append(mapping.getShards());
             }
@@ -205,15 +205,10 @@ public class SolrSQLHttpClient extends AbstractSolrQueryHTTPClient implements So
                 return new SolrSQLJSONResultSet(json, searchParameters);
             });
         }
-        catch (ConnectException ce)
-        {
-            throw new LuceneQueryParserException("Unable to reach InsightEngine", ce);
-        }
         catch (JSONException | IOException | EncoderException e)
         {
             throw new LuceneQueryParserException("Unable to parse the solr response ", e);
         }
-        
     }
 
     protected JSONResult postSolrQuery(HttpClient httpClient, String url, JSONObject body, 
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml b/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
index 5e4632d421..db5c2519f9 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
@@ -73,9 +73,6 @@
         <property name="defaultUnshardedFacetLimit" value="${solr.defaultUnshardedFacetLimit}"/>
         <property name="defaultShardedFacetLimit" value="${solr.defaultShardedFacetLimit}"/>
         <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
-                <property name="shardRegistry">
-            <ref bean="search.SolrShardRegistry"/>
-        </property>
     </bean>
     
     <bean id="search.solrSQLQueryHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrSQLHttpClient" init-method="init">
@@ -94,9 +91,6 @@
         <property name="includeGroupsForRoleAdmin">
             <value>${solr.query.includeGroupsForRoleAdmin}</value>
         </property>
-        <property name="shardRegistry">
-            <ref bean="search.SolrShardRegistry"/>
-        </property>
         <property name="anyDenyDenies" value="${security.anyDenyDenies}"/>
         <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
     </bean>