diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
index 49e5a051a5..2cd18c83a7 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
@@ -483,7 +483,7 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
                 nested.addAll(rangefacets);
             }
 
-            GenericBucket buck = new GenericBucket(value, field+":"+value, null, metrics, nested);
+            GenericBucket buck = new GenericBucket(value, field+":\""+value+"\"", null, metrics, nested);
             List<GenericBucket> listBucks = pivotBuckets.containsKey(field)?pivotBuckets.get(field):new ArrayList<>();
             listBucks.add(buck);
             pivotBuckets.put(field, listBucks);
diff --git a/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java b/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
index 7f04422424..fb870e819b 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/RangeResultMapper.java
@@ -137,8 +137,9 @@ public class RangeResultMapper
         facet.remove(GenericFacetResponse.LABEL);
         filterQ.append(facetField).append(":")
             .append(startFilterQuery)
-            .append(start).append(" TO ")
-            .append(end)
+            .append("\"").append(start).append("\"")
+            .append(" TO ")
+            .append("\"").append(end).append("\"")
             .append(endFilterQuery);
         
         Set<Metric> metrics = new HashSet<Metric>(