diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 7837d4d9d1..77bf507775 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -126,8 +126,7 @@
    </bean>
    
    <bean id="rmDeleteLinksCapability"
-      parent="rmBaseCapability"
-      class="org.alfresco.module.org_alfresco_module_rm.capability.impl.DeleteLinksCapability">
+         parent="declarativeCapability">
       <property name="name" value="DeleteLinks"/>
       <property name="permission" value="DeleteLinks"/>
       <property name="kinds">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index 1b19e6e9df..f75f4a4ca8 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -848,7 +848,7 @@
    <!--  Unlink Record -->
    
    <bean id="unlinkFrom_proxy" parent="rmProxyAction">
-      <property name="target" ref="linkTo"/>
+      <property name="target" ref="unlinkFrom"/>
         <property name="interceptorNames">
             <list>
                <idref bean="unlinkFrom_security"/>
@@ -867,7 +867,6 @@
    </bean>
 
    <bean id="unlinkFrom" class="org.alfresco.module.org_alfresco_module_rm.action.impl.UnlinkFromAction" parent="rmAction">
-      <property name="publicAction" value="false"/>
    </bean>
 
     <!-- RequestInfo action -->
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 6598830591..9611d55654 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
@@ -363,6 +363,17 @@
       <property name="capability" value="LinkToRecords" />
    </bean>
 
+   <bean id="jsonConversionComponent.unlinkFromAction"
+         parent="jsonConversionComponent.baseAction">
+      <property name="name" value="unlinkFrom"/>
+      <property name="kinds">
+         <set>
+            <value>RECORD</value>
+         </set>
+      </property>
+      <property name="capability" value="DeleteLinks" />
+   </bean>
+
    <bean id="jsonConversionComponent.fileToAction"
          parent="jsonConversionComponent.baseAction">
       <property name="name" value="fileTo"/>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
index 474a6137fe..862335a0c0 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
@@ -384,6 +384,13 @@ public class JSONConversionComponent extends    org.alfresco.repo.jscript.app.JS
         FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
         rmNodeValues.put("kind", kind.toString());
         
+        // set the primary parent node reference
+        ChildAssociationRef assoc = nodeService.getPrimaryParent(nodeRef);
+        if (assoc != null)
+        {
+            rmNodeValues.put("primaryParentNodeRef", assoc.getParentRef().toString());
+        }
+        
         Map<String, Object> values = AuthenticationUtil.runAsSystem(new RunAsWork<Map<String, Object>>()
         {
             public Map<String, Object> doWork() throws Exception
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
index 5eb1211921..a3c3ca8d29 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/MultiParentEvaluator.java
@@ -32,27 +32,34 @@ import org.alfresco.service.namespace.RegexQNamePattern;
  * Determines whether a node has multiple parents within a file plan
  *
  * @author Roy Wetherall
+ * @since 2.0
  */
 public class MultiParentEvaluator extends BaseEvaluator
 {
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.jscript.app.BaseEvaluator#evaluateImpl(org.alfresco.service.cmr.repository.NodeRef)
+     */
     @Override
     protected boolean evaluateImpl(final NodeRef nodeRef)
     {
         return AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>()
         {
-            @Override
             public Boolean doWork()
             {
+               
+                // get parent associations
                 List<ChildAssociationRef> parents = nodeService.getParentAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
                 int count = 0;
                 for (ChildAssociationRef parent : parents)
                 {
+                    // count file plan component parents
                     if (nodeService.hasAspect(parent.getParentRef(), ASPECT_FILE_PLAN_COMPONENT))
                     {
                         count++;
                     }
                 }
 
+                // return true if more than one
                 return (count > 1);
             }
         });