diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index b482ea116c6ff83d01c30c95fb1b81b0702e49e1..86bd4e1e2ebceafd76535360dd990a9796b96cb1 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -16,7 +16,6 @@
     </entityProvider>
     <entityField>
       <name>UID</name>
-      <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>SOURCE_RELATION_TITLE</name>
diff --git a/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js
deleted file mode 100644
index 86ef789e064a4016f2d12c432498dc23474807aa..0000000000000000000000000000000000000000
--- a/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
index fa718b256d326e078327b8ca1c5fd71e2028c8b2..0a43729a3200d42a2c08fedf8febcc34f902dfb3 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
@@ -5,6 +5,7 @@ import("system.vars");
 import("system.db");
 import("system.util");
 
+var rowData = vars.get("$local.rowdata");
 var newRelationType = util.getNewUUID();
 
 db.insertData("AB_OBJECTRELATIONTYPE", [
@@ -16,17 +17,17 @@ db.insertData("AB_OBJECTRELATIONTYPE", [
     "HIERARCHY",
     "ICON"
 ], null, [
-    util.getNewUUID(),
-    vars.get("$field.SOURCE_OBJECT_TYPE"),
-    vars.get("$field.SOURCE_RELATION_TITLE"),
+    rowData["UID.value"],
+    rowData["SOURCE_OBJECT_TYPE.value"],
+    rowData["SOURCE_RELATION_TITLE.value"],
     newRelationType,
     1,
-    vars.get("$field.HIERARCHY"),
-    vars.get("$field.ICON") // Icon is only savid in type1
+    rowData["HIERARCHY.value"],
+    rowData["ICON.value"] // Icon is only savid in type1
 ]);
 
-if (vars.getString("$field.Type2Enabled_proxy") == "1" 
-    && vars.get("$field.SOURCE_RELATION_TITLE") != vars.get("$field.DEST_RELATION_TITLE"))
+if (rowData["Type2Enabled_proxy.value"] == "1" 
+    && rowData["SOURCE_RELATION_TITLE.value"] != rowData["DEST_RELATION_TITLE.value"])
 {
     db.insertData("AB_OBJECTRELATIONTYPE", [
         "AB_OBJECTRELATIONTYPEID",
@@ -37,11 +38,11 @@ if (vars.getString("$field.Type2Enabled_proxy") == "1"
         "HIERARCHY"
     ], null, [
         util.getNewUUID(),
-        vars.get("$field.DEST_OBJECT_TYPE"),
-        vars.get("$field.DEST_RELATION_TITLE"),
+        rowData["DEST_OBJECT_TYPE.value"],
+        rowData["DEST_RELATION_TITLE.value"],
         newRelationType,
         2,
-        vars.get("$field.HIERARCHY")
+        rowData["HIERARCHY.value"]
     ]);
 }
 
diff --git a/entity/Order_entity/recordcontainers/db/conditionProcess.js b/entity/Order_entity/recordcontainers/db/conditionProcess.js
index 8cf25e0b6012c7604600258d1df63e614e87528f..d799cf12382ac030ddeeb35b7e61e891c2a07f6e 100644
--- a/entity/Order_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Order_entity/recordcontainers/db/conditionProcess.js
@@ -9,7 +9,7 @@ if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
     cond.andIfSet("SALESORDER.CONTACT_ID", "$param.ContactId_param");
 else {
     cond.andIfSet("SALESORDER.OBJECT_ROWID", "$param.ObjectRowId_param")
-        .andIfSet("SALESORDEER.OBJECT_TYPE", "$param.ObjectType_param");
+        .andIfSet("SALESORDER.OBJECT_TYPE", "$param.ObjectType_param");
 }
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(cond.toString());
\ No newline at end of file
diff --git a/neonView/WorkflowInstancePreview_view/WorkflowInstancePreview_view.aod b/neonView/WorkflowInstancePreview_view/WorkflowInstancePreview_view.aod
index a7b70d875b8d0571467270cb4a880b98a3fc450d..be12d2db268118ee84c245482c86e5029e0934d6 100644
--- a/neonView/WorkflowInstancePreview_view/WorkflowInstancePreview_view.aod
+++ b/neonView/WorkflowInstancePreview_view/WorkflowInstancePreview_view.aod
@@ -37,10 +37,6 @@
           <name>5a2ac432-6901-485b-ad84-8fbefa04217b</name>
           <entityField>PROCESSDEFINITION_VERSION</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>7eaa1915-e378-4e7f-9df8-28bbc43930d2</name>
-          <entityField>PROCESSVARIABLES</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>