diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat-context.xml
index bdae2bc7aa..ddae414f88 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat-context.xml
@@ -17,8 +17,8 @@
 
    <bean id="caveatDAOFromJSON" class="org.alfresco.module.org_alfresco_module_rm.caveat.dao.CaveatDAOFromJSON">
       <property name="configLocation" value="${rm.caveat.configFile}" />
-       <property name="namespaceService" ref="namespaceService" />
-       <property name="dictionaryService" ref="dictionaryService" />
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="dictionaryService" ref="dictionaryService" />
    </bean>
 
    <bean id="caveatDAO" class="org.alfresco.module.org_alfresco_module_rm.caveat.dao.CaveatDAOCache">
@@ -32,7 +32,7 @@
       <constructor-arg ref="attributeService"/>
       <constructor-arg ref="caveatDAO"/>
    </bean>
-   
+
    <bean id="caveatSchemeService"
          class="org.alfresco.module.org_alfresco_module_rm.caveat.scheme.CaveatSchemeServiceImpl"
          parent="baseService">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
index 388ce2405f..db9d2069fd 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/caveat/rm-caveats.json
@@ -6,7 +6,7 @@
       "type"         : "HIERARCHICAL",
       "model" :
       {
-        "property" : "clf:classification"
+         "property" : "clf:currentClassification"
       },
       "marks" :
       [