diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
index e4969d923b154c36b50971efb6eb54c7b3bba6b2..fc8ed47c69525e9245891887cc24da1f9e59797a 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -2,10 +2,10 @@ import("Sql_lib");
 import("system.vars");
 import("Attribute_lib");
 
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
     .deleteData();
 
-var attributeId = vars.get("$field.UID");
+var attributeId = vars.get("$local.uid");
 
 var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
 
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
index f12f4d44912d1711867309fac4c4eb76bedb9633..b3012b5a5b5ff44e63a53a1dbd5c0df4b797764b 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -20,5 +20,5 @@ vars.get("$local.changed").forEach(function (field)
         fieldValues[dbField] = rowdata[field] || "";
 });
 
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$local.uid")
     .updateFields(fieldValues);
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 88b71eba2188261d1da42f59baffb15adac35cee..f7164ab6941bd0255686fb2ac2d85837af4371c1 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -34,10 +34,6 @@
           <name>70953962-9472-484b-ac95-567d2249f42e</name>
           <entityField>ATTRIBUTE_ACTIVE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>1b1cfdcb-fcab-4ca9-b0e0-b69fe88b65f0</name>
-          <entityField>SORTING</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 93360446bcf5ed3682da3749fd127d9c10002322..126ef4f9e156b768e0db9985373b11e5016c9c17 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -233,7 +233,7 @@ HasLinkedObjectTester._testForConsumer = function ()
  */
 HasLinkedObjectTester._testForCallback = function ()
 {
-    fnResult = this.callbackFn();
+    var fnResult = this.callbackFn();
     return this.failValue
         ? fnResult != this.failValue
         : fnResult;