diff --git a/config/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties b/config/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
index d52949e180..8c419defae 100644
--- a/config/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
+++ b/config/alfresco/subsystems/Search/solr/facet/solr-facets-config.properties
@@ -15,18 +15,6 @@ default.cm\:content.mimetype.scope=ALL
 default.cm\:content.mimetype.scopedSites=
 default.cm\:content.mimetype.isEnabled=true
 
-# Field-Facet-Qname => cm:description
-default.cm\:description.filterID=filter_description
-default.cm\:description.displayName=faceted-search.facet-menu.facet.description
-default.cm\:description.displayControl=alfresco/search/FacetFilters
-default.cm\:description.maxFilters=5
-default.cm\:description.hitThreshold=1
-default.cm\:description.minFilterValueLength=4
-default.cm\:description.sortBy=DESCENDING
-default.cm\:description.scope=ALL
-default.cm\:description.scopedSites=
-default.cm\:description.isEnabled=false
-
 # Field-Facet-Qname => cm:creator
 default.cm\:creator.filterID=filter_creator
 default.cm\:creator.displayName=faceted-search.facet-menu.facet.creator
diff --git a/source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java b/source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
index b0910d79e5..a107556af6 100644
--- a/source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
+++ b/source/test-java/org/alfresco/repo/search/impl/solr/facet/SolrFacetConfigTest.java
@@ -119,17 +119,17 @@ public class SolrFacetConfigTest
         assertTrue(Boolean.valueOf(customValue));
 
         // loaded from /facets/extension/facets-config-custom-sample.properties
-        SolrFacetProperties descFP = defaultProps.get("test_filter_description");
-        assertEquals("Incorrect QNAME", "{http://www.alfresco.org/model/content/1.0}description", descFP.getFacetQName().toString());
-        assertEquals("faceted-search.facet-menu.facet.description", descFP.getDisplayName());
-        assertEquals("alfresco/search/FacetFilters", descFP.getDisplayControl());
-        assertEquals(3, descFP.getMaxFilters());
-        assertEquals(1, descFP.getHitThreshold());
-        assertEquals(2, descFP.getMinFilterValueLength());
-        assertEquals("DESCENDING", descFP.getSortBy());
-        assertEquals("SCOPED_SITES", descFP.getScope());
-        assertEquals(0, descFP.getScopedSites().size());
-        assertEquals(true, descFP.isEnabled());
+        SolrFacetProperties mimeTypeFP = defaultProps.get("test_filter_mimetype");
+        assertEquals("Incorrect QNAME", "{http://www.alfresco.org/model/content/1.0}content.mimetype", mimeTypeFP.getFacetQName().toString());
+        assertEquals("faceted-search.facet-menu.facet.formats", mimeTypeFP.getDisplayName());
+        assertEquals("alfresco/search/FacetFilters", mimeTypeFP.getDisplayControl());
+        assertEquals(5, mimeTypeFP.getMaxFilters());
+        assertEquals(1, mimeTypeFP.getHitThreshold());
+        assertEquals(4, mimeTypeFP.getMinFilterValueLength());
+        assertEquals("DESCENDING", mimeTypeFP.getSortBy());
+        assertEquals("ALL", mimeTypeFP.getScope());
+        assertEquals(0, mimeTypeFP.getScopedSites().size());
+        assertEquals(true, mimeTypeFP.isEnabled());
 
         // See if the overrides worked
         SolrFacetProperties creatorFP = defaultProps.get("test_filter_creator");
diff --git a/source/test-resources/facets/extension/facets-config-custom-sample.properties b/source/test-resources/facets/extension/facets-config-custom-sample.properties
index 58dd18beba..54a8db47b2 100644
--- a/source/test-resources/facets/extension/facets-config-custom-sample.properties
+++ b/source/test-resources/facets/extension/facets-config-custom-sample.properties
@@ -8,19 +8,17 @@ custom.cm\:creator.minFilterValueLength=14
 custom.cm\:creator.sortBy=ALPHABETICALLY
 custom.cm\:creator.scope=ALL
 custom.cm\:creator.scopedSites=site1
-custom.cm\:creator.index=0
 custom.cm\:creator.isEnabled=true
 
 # Add a new Filter
-# Field-Facet-Qname => cm:description.__
-custom.cm\:description.filterID=test_filter_description
-custom.cm\:description.displayName=faceted-search.facet-menu.facet.description
-custom.cm\:description.displayControl=alfresco/search/FacetFilters
-custom.cm\:description.maxFilters=3
-custom.cm\:description.hitThreshold=1
-custom.cm\:description.minFilterValueLength=2
-custom.cm\:description.sortBy=DESCENDING
-custom.cm\:description.scope=SCOPED_SITES
-custom.cm\:description.scopedSites=
-custom.cm\:description.index=4
-custom.cm\:description.isEnabled=true
\ No newline at end of file
+# Field-Facet-Qname => cm:content.mimetype
+custom.cm\:content.mimetype.filterID=test_filter_mimetype
+custom.cm\:content.mimetype.displayName=faceted-search.facet-menu.facet.formats
+custom.cm\:content.mimetype.displayControl=alfresco/search/FacetFilters
+custom.cm\:content.mimetype.maxFilters=5
+custom.cm\:content.mimetype.hitThreshold=1
+custom.cm\:content.mimetype.minFilterValueLength=4
+custom.cm\:content.mimetype.sortBy=DESCENDING
+custom.cm\:content.mimetype.scope=ALL
+custom.cm\:content.mimetype.scopedSites=
+custom.cm\:content.mimetype.isEnabled=true
\ No newline at end of file