diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index a0bf446ea4..086e420e9d 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -446,6 +446,16 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
             {
                 this.numberFound = numberFound;
             }
+
+            @Override
+            public boolean hasMore()
+            {
+                return getNumberFound() >= (returnedObject.getResultSetMetaData()
+                    .getSearchParameters()
+                    .getSkipCount() + returnedObject.getResultSetMetaData()
+                    .getSearchParameters()
+                    .getMaxItems());
+            }
         }
 
         BitSet inclusionMask = new BitSet(returnedObject.length());
@@ -485,6 +495,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
+                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
             else
@@ -498,6 +509,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
+                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
         }