diff --git a/source/java/org/alfresco/repo/forms/processor/NodeHandler.java b/source/java/org/alfresco/repo/forms/processor/NodeHandler.java
index 37e844accb..68bf0b263b 100644
--- a/source/java/org/alfresco/repo/forms/processor/NodeHandler.java
+++ b/source/java/org/alfresco/repo/forms/processor/NodeHandler.java
@@ -262,22 +262,22 @@ public class NodeHandler extends AbstractHandler
                 else
                 {
                     // look for association defined for the type
-                    AssociationDefinition assocDef = assocDefs.get(fullQName);
-                    if (assocDef != null)
+                    ChildAssociationDefinition childAssocDef = childAssocDefs.get(fullQName);
+                    if (childAssocDef != null)
                     {
                         // generate the association field
-                        generateAssociationField(assocDef, 
-                                    this.nodeService.getTargetAssocs(nodeRef, fullQName), form);
+                        // TODO: see if we can get just the specific child assoc data
+                        generateAssociationField(childAssocDef, 
+                                    this.nodeService.getChildAssocs(nodeRef), form);
                     }
                     else
                     {
-                        ChildAssociationDefinition childAssocDef = childAssocDefs.get(fullQName);
-                        if (childAssocDef != null)
+                        AssociationDefinition assocDef = assocDefs.get(fullQName);
+                        if (assocDef != null)
                         {
                             // generate the association field
-                            // TODO: see if we can get just the specific child assoc data
-                            generateAssociationField(childAssocDef, 
-                                        this.nodeService.getChildAssocs(nodeRef), form);
+                            generateAssociationField(assocDef, 
+                                        this.nodeService.getTargetAssocs(nodeRef, fullQName), form);
                         }
                         else
                         {
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 8a4883d352..d82a426472 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -307,7 +307,15 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
     {
         return getQNameType().toString();
     }
-    
+
+    /**
+     * @return Returns the type in short format.
+     */
+    public String getTypeShort()
+    {
+        return this.getShortQName(getQNameType());
+    }
+
     /**
      * @return Helper to return the 'name' property for the node
      */
diff --git a/source/java/org/alfresco/repo/template/TemplateNode.java b/source/java/org/alfresco/repo/template/TemplateNode.java
index a11aaa9b9b..40244a491e 100644
--- a/source/java/org/alfresco/repo/template/TemplateNode.java
+++ b/source/java/org/alfresco/repo/template/TemplateNode.java
@@ -176,7 +176,15 @@ public class TemplateNode extends BasePermissionsNode implements NamespacePrefix
         
         return type;
     }
-    
+
+    /**
+     * @return Returns the type in short format.
+     */
+    public String getTypeShort()
+    {
+        return this.getType().toPrefixString(this.services.getNamespaceService());
+    }
+
     /**
      * @return The display name for the node
      */