diff --git a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
index b774ea19ba..000d221671 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
@@ -37,6 +37,7 @@ import java.util.TreeSet;
 
 import org.alfresco.repo.i18n.StaticMessageLookup;
 import org.alfresco.repo.search.impl.solr.facet.SolrFacetService.SyntheticPropertyDefinition;
+import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.FacetablePropertyFTLComparator;
 import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.SpecialFacetablePropertyFTL;
 import org.alfresco.repo.web.scripts.facet.FacetablePropertyFTL.StandardFacetablePropertyFTL;
@@ -130,7 +131,7 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
         
         // Always add some hard-coded facetable "properties"
         facetableProperties.add(new SpecialFacetablePropertyFTL("TAG", "Tag"));
-        facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site"));
+        facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site", SiteModel.TYPE_SITE));
         
         // The webscript allows for some further filtering of results:
         List<ResultFilter> filters = new ArrayList<>();
diff --git a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
index ce254c18e5..7f9bc8a4fa 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
@@ -280,6 +280,8 @@ public abstract class FacetablePropertyFTL<T> implements Comparable<T>
         
         private final String displayName;
         
+        private final QName qName;
+        
         /**
          * @param localisedTitle        The localised title of this synthetic property e.g. "taille".
          */
@@ -288,17 +290,25 @@ public abstract class FacetablePropertyFTL<T> implements Comparable<T>
             super(localisedTitle);
             this.name = name;
             this.displayName = localisedTitle;
+            this.qName = null;
+        }
+        public SpecialFacetablePropertyFTL(String name, String localisedTitle, QName qName)
+        {
+            super(localisedTitle);
+            this.name = name;
+            this.displayName = localisedTitle;
+            this.qName = qName;
         }
         
         @Override public String getShortQname()        { return name; }
         
-        @Override public QName getQname()              { return null; }
+        @Override public QName getQname()              { return qName; }
         
         @Override public QName getDataType()           { return null; }
         
         @Override public QName getContainerClassType() { return null; }
         
-        @Override public QName getModelQname()         { return null; }
+        @Override public QName getModelQname()         { return qName; }
         
         @Override public String getDisplayName()       { return displayName; }