diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
index be7f12f03d..2aff927c18 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/query/rm-common-SqlMap.xml
@@ -9,7 +9,6 @@
     </parameterMap>
 
    <parameterMap id="parameter_folderPatchPaging" type="map">
-      <parameter property="dispositionQnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <parameter property="processed" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <parameter property="folderQnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <parameter property="start" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -42,15 +41,10 @@
       select alfn.id , alfs.protocol, alfs.identifier, alfn.uuid
       from alf_node alfn,
       alf_store alfs
-      where alfn.id in (
-         select node_id
-         from alf_node_properties
-         where qname_id = ?
-         and boolean_value = true
-         and node_id not in (
+      where alfn.id not in (
             select node_id
             from alf_node_aspects
-            where qname_id = ? ))
+            where qname_id = ? )
       and type_qname_id = ?
       and alfn.store_id = alfs.id
       and alfn.id between ? and ?
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
index 1293ddf911..372e2aede4 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
@@ -109,8 +109,6 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO,
     public List<NodeRef> getRecordFoldersWithSchedules(Long start, Long end)
     {
         Map<String, Object> params = new HashMap<String, Object>(2);
-        params.put("dispositionQnameId", qnameDAO.getQName(PROP_RS_HAS_DISPOITION_SCHEDULE)
-            .getFirst());
         params.put("processed", qnameDAO.getQName(ASPECT_DISPOSITION_PROCESSED)
             .getFirst());
         params.put("folderQnameId",qnameDAO.getQName(TYPE_RECORD_FOLDER).getFirst());
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
index 2eee54ef37..86213aff12 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
@@ -96,7 +96,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
     private static final String SUCCESS_STATUS = "success";    
     private static final String MODEL_STATUS = "responsestatus";
     private static final String MODEL_MESSAGE = "message";
-    private static final String MESSAGE_ALL_TEMPLATE = "Updated {0} records with updated disposition instructions.";
+    private static final String MESSAGE_ALL_TEMPLATE = "Updated {0} records from {1} folders with updated disposition instructions.";
     private static final String MESSAGE_FOLDER_TEMPLATE = "Updated records in folder {0} with updated disposition instructions.";
 
     /** services */
@@ -204,7 +204,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
             		break;
             	}
             }
-            message = MessageFormat.format(MESSAGE_ALL_TEMPLATE, processedRecords);
+            message = MessageFormat.format(MESSAGE_ALL_TEMPLATE, processedRecords, processedRecordFolders);
         }
 
         model.put(MODEL_STATUS, SUCCESS_STATUS);
@@ -374,7 +374,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
                         {
                             DispositionSchedule schedule = dispositionService.getDispositionSchedule(recordFolder);
                             int innerRecordCount = 0;
-                            if (schedule.isRecordLevelDisposition())
+                            if (schedule != null && schedule.isRecordLevelDisposition())
                             {
 
                                 List<NodeRef> records = recordService.getRecords(recordFolder);
@@ -382,14 +382,17 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
                                 {
                                     if (!nodeService.hasAspect(record, ASPECT_DISPOSITION_LIFECYCLE))
                                     {
-                                        if (logger.isDebugEnabled())
+                                        if (recordFolder.equals(nodeService.getPrimaryParent(record).getParentRef()))
                                         {
-                                            logger.info("updating record: " + record);
+                                            if (logger.isDebugEnabled())
+                                            {
+                                                logger.info("updating record: " + record);
+                                            }
+                                            behaviourFilter.disableBehaviour(record);
+                                            dispositionService.updateNextDispositionAction(record, schedule);
+                                            innerRecordCount++;
+                                            behaviourFilter.enableBehaviour(record);
                                         }
-                                        behaviourFilter.disableBehaviour(record);
-                                        dispositionService.updateNextDispositionAction(record, schedule);
-                                        innerRecordCount++;
-                                        behaviourFilter.enableBehaviour(record);
 
                                     }
                                 }