diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
index a94603f85b..aa27d7a0cf 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
@@ -71,7 +71,7 @@
    </bean>
 
    <bean id="rmCreateModifyDestroyUnfiledRecordContainerCapability"
-      parent="declarativeCapability">
+      parent="compositeCapability">
       <property name="name" value="CreateModifyDestroyUnfiledRecordContainer"/>
       <property name="private" value="true"/>
       <property name="kinds">
@@ -79,6 +79,13 @@
             <value>UNFILED_RECORD_CONTAINER</value>
          </list>
       </property>
+      <property name="capabilities">
+         <list>
+            <ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
+            <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
+            <ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
+         </list>
+      </property>
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.filling" value="true"/>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index a03568a8c9..81658b0db5 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -33,9 +33,6 @@
             <ref bean="rmCreateRecordFolderCapability"/>
             <ref bean="rmModifyRecordFolderCapability"/>
             <ref bean="rmDeleteRecordFolderCapability"/>
-            <ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
-            <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
-            <ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
          </list>
       </property>
       <property name="group"><ref bean="folderControlGroup"/></property>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 79702d97ef..7d9365adde 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -633,11 +633,21 @@
       <property name="kinds">
          <set>
             <value>RECORD_CATEGORY</value>
+         </set>
+      </property>
+      <property name="capability" value ="CreateModifyDestroyFolders"/>
+   </bean>
+
+   <bean id="jsonConversionComponent.newUnfiledRecordsFolder"
+         parent="jsonConversionComponent.baseAction">
+      <property name="name" value="newUnfiledRecordsFolder"/>
+      <property name="kinds">
+         <set>
             <value>UNFILED_RECORD_CONTAINER</value>
             <value>UNFILED_RECORD_FOLDER</value>
          </set>
       </property>
-      <property name="capability" value ="CreateModifyDestroyFolders"/>
+      <property name="capability" value ="CreateModifyDestroyUnfiledRecordContainer"/>
    </bean>
 
    <bean id="jsonConversionComponent.import"
@@ -657,6 +667,13 @@
          parent="jsonConversionComponent.baseAction">
       <property name="name" value="export"/>
       <property name="capability" value="ViewRecords"/>
+      <property name="kinds">
+         <set>
+            <value>FILE_PLAN</value>
+            <value>RECORD_CATEGORY</value>
+            <value>RECORD_FOLDER</value>
+         </set>
+      </property>
    </bean>
 
    <bean id="jsonConversionComponent.downloadZip"