diff --git a/config/alfresco/application-context-core.xml b/config/alfresco/application-context-core.xml
index 545aa4cda5..d0ba295912 100644
--- a/config/alfresco/application-context-core.xml
+++ b/config/alfresco/application-context-core.xml
@@ -29,7 +29,6 @@
     <import resource="classpath:alfresco/ownable-services-context.xml" />
     <import resource="classpath:alfresco/template-services-context.xml" />
     <import resource="classpath:alfresco/script-services-context.xml" />
-    <import resource="classpath:alfresco/solr-facets-context.xml" />
     <import resource="classpath:alfresco/authority-services-context.xml" />
     <import resource="classpath:alfresco/authentication-services-context.xml" />
     <import resource="classpath:alfresco/usage-services-context.xml" />
diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index 59d7521033..b736cb43ad 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -113,9 +113,6 @@
         <property name="repositoryHelper">
            <ref bean="repositoryHelper"/>
         </property>
-        <property name="solrFacetHelper">
-           <ref bean="solrFacetHelper"/>
-        </property>
         <property name="storeUrl">
             <value>${spaces.store}</value>
         </property>
diff --git a/config/alfresco/solr-facets-context.xml b/config/alfresco/solr-facets-context.xml
index 0ec15f0339..7bb588883c 100644
--- a/config/alfresco/solr-facets-context.xml
+++ b/config/alfresco/solr-facets-context.xml
@@ -43,19 +43,4 @@
          <value>${solr_facets.root}</value>
       </property>
    </bean>
-   
-   <bean id="solrFacetHelper" class="org.alfresco.repo.search.impl.solr.facet.SolrFacetHelper">
-      <constructor-arg index="0" ref="ServiceRegistry" />
-      <property name="specialFacetIds">
-         <set>
-            <value>SITE</value>
-            <value>TAG</value>
-            <value>ANCESTOR</value>
-            <value>PARENT</value>
-            <value>ASPECT</value>
-            <value>TYPE</value>
-            <value>OWNER</value>
-         </set>
-      </property>
-   </bean>
 </beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index a10fda14c0..60ddcd6207 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -101,11 +101,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
     public void afterPropertiesSet() throws Exception
     {
         PropertyCheck.mandatory(this, "services", services);
-    }
-    
-    public void setSolrFacetHelper(SolrFacetHelper solrFacetHelper)
-    {
-        this.solrFacetHelper = solrFacetHelper;
+        this.solrFacetHelper = new SolrFacetHelper(services);
     }
     
     /**
diff --git a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
index bc4dd7b8a5..70bfa858a4 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
@@ -19,6 +19,7 @@
 package org.alfresco.repo.search.impl.solr.facet;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -107,14 +108,9 @@ public class SolrFacetHelper
     }
     
     /** These facet IDs are recognised by SOLR and can be used directly within facetted searches. */
-    private Set<String> specialFacetIds = Collections.emptySet();
-    {
-    }
-    
-    public void setSpecialFacetIds(Set<String> ids)
-    {
-        this.specialFacetIds = ids;
-    }
+    private final List<String> specialFacetIds = Arrays.asList(new String[] {
+                                                          "SITE", "TAG", "ANCESTOR",
+                                                          "PARENT", "ASPECT", "TYPE", "OWNER" });
     
     /** Facet value and facet query display label handlers */
     private Map<String, FacetLabelDisplayHandler> displayHandlers;