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 000d221671..cc5c3977bb 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertiesGet.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.repo.web.scripts.facet;
 
@@ -37,7 +37,6 @@ 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,8 +129,9 @@ public class FacetablePropertiesGet extends AbstractSolrFacetConfigAdminWebScrip
         }
         
         // Always add some hard-coded facetable "properties"
+        // Note: TAG and SITE are Solr specials and don’t have namespaces
         facetableProperties.add(new SpecialFacetablePropertyFTL("TAG", "Tag"));
-        facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "Site", SiteModel.TYPE_SITE));
+        facetableProperties.add(new SpecialFacetablePropertyFTL("SITE", "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 7f9bc8a4fa..981b1722d0 100644
--- a/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/FacetablePropertyFTL.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.repo.web.scripts.facet;
 
@@ -279,8 +279,7 @@ public abstract class FacetablePropertyFTL<T> implements Comparable<T>
         private final String name;
         
         private final String displayName;
-        
-        private final QName qName;
+
         
         /**
          * @param localisedTitle        The localised title of this synthetic property e.g. "taille".
@@ -290,25 +289,17 @@ 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 qName; }
+        @Override public QName getQname()              { return null; }
         
         @Override public QName getDataType()           { return null; }
         
         @Override public QName getContainerClassType() { return null; }
         
-        @Override public QName getModelQname()         { return qName; }
+        @Override public QName getModelQname()         { return null; }
         
         @Override public String getDisplayName()       { return displayName; }