diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
index 3da76c3d49..d423ddbd19 100644
--- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -638,7 +638,7 @@ public class SearchMapper
             {
                 for (RangeParameters aRange:ranges)
                 {
-                    if (aRange.getTags().contains(aPivot.getKey()))
+                    if (aPivot.getKey().equals(aRange.getLabel()))
                     {
                         pivotKey = aPivot.getKey();
                         if (pivotKeys.isEmpty())
diff --git a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
index 9acfb887ae..5ace2dae64 100644
--- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -947,7 +947,7 @@ public class SearchMapperTests
         facets.add(new FacetField("king",null,null,null,null,null,null,null,null,null,null));
         facets.add(new FacetField("kong",null,null,null,null,null,null,null,null,null,null));
         ff = new FacetFields(facets);
-        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,Arrays.asList("hope"),null));
+        rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,null,null,"hope",null));
         searchMapper.fromPivot(searchParameters, Arrays.asList(bobf), ff, rangeParams,
                     Arrays.asList(new Pivot("king", Arrays.asList(new Pivot("bob", null))), new Pivot("kong", Arrays.asList(new Pivot("hope", null)))), searchRequestContext);
         assertEquals(2 ,searchParameters.getPivots().size());