diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/classified-content-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/classified-content-context.xml
index 19a684a701..22e25be2d7 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/classified-content-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/classified-content-context.xml
@@ -110,34 +110,26 @@
       class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.CollectionPostMethodInvocationProcessor">
    </bean>
 
-   <!-- FIXME: Causes issues for the integration tests -->
-   <!--
-   <bean id="setPostMethodInvocationProcessor"
-      parent="collectionPostMethodInvocationProcessor"
-      class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.SetPostMethodInvocationProcessor">
-   </bean>
-   -->
-
-   <bean id="listPostMethodInvocationProcessor"
-      parent="collectionPostMethodInvocationProcessor"
-      class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.ListPostMethodInvocationProcessor">
-   </bean>
-
    <!-- FIXME: Implementation needs to be changed -->
    <!--
    <bean id="resultSetPostMethodInvocationProcessor"
-      parent="collectionPostMethodInvocationProcessor"
+      parent="basePostMethodInvocationProcessor"
       class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.ResultSetPostMethodInvocationProcessor">
    </bean>
    -->
 
+   <bean id="queryEngineResultsPostMethodInvocationProcessor"
+      parent="basePostMethodInvocationProcessor"
+      class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.QueryEngineResultsPostMethodInvocationProcessor">
+   </bean>
+
    <bean id="pagingResultsPostMethodInvocationProcessor"
-      parent="abstractPostMethodInvocationProcessor"
+      parent="basePostMethodInvocationProcessor"
       class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.PagingResultsPostMethodInvocationProcessor">
    </bean>
 
    <bean id="arrayPostMethodInvocationProcessor"
-      parent="abstractPostMethodInvocationProcessor"
+      parent="basePostMethodInvocationProcessor"
       class="org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.ArrayPostMethodInvocationProcessor">
    </bean>
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/CollectionPostMethodInvocationProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/CollectionPostMethodInvocationProcessor.java
index 109c86cc38..e23ce5ab6e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/CollectionPostMethodInvocationProcessor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/CollectionPostMethodInvocationProcessor.java
@@ -29,7 +29,19 @@ import java.util.Iterator;
  */
 public class CollectionPostMethodInvocationProcessor extends BasePostMethodInvocationProcessor
 {
-    @SuppressWarnings({ "rawtypes" })
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.BasePostMethodInvocationProcessor#getClassName()
+     */
+    @Override
+    protected Class<?> getClassName()
+    {
+        return Collection.class;
+    }
+
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.BasePostMethodInvocationProcessor#process(java.lang.Object)
+     */
+    @SuppressWarnings("rawtypes")
     @Override
     public <T> T process(T object)
     {
@@ -54,10 +66,4 @@ public class CollectionPostMethodInvocationProcessor extends BasePostMethodInvoc
 
         return result;
     }
-
-    @Override
-    protected Class<?> getClassName()
-    {
-        return Collection.class;
-    }
 }