diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
index 07ccfd896b68a5db39cad11acfbd3a07dc471cf2..3c29c7e6c1790f6f53dd7fbb272a21d62f24667d 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
@@ -2,6 +2,7 @@ import("Sql_lib");
 import("system.neon");
 import("system.vars");
 
-var entity = vars.get("$field.ENTITY_TO_SCAN_NAME");
-newWhere("DUPLICATESCANNER.ID", vars.get("$field.UID"))
-.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + entity + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
+var rowdata = vars.get("$local.rowdata");
+
+newWhere("DUPLICATESCANNER.ID", rowdata["DUPLICATESCANNER.ID"])
+.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + rowdata["DUPLICATESCANNER.ENTITY_TO_SCAN_NAME"] + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
index f7c88a0b022be7edf268cfb973c88a238e6f1666..c8e53ac00d768ffab9c7f50553de8b2f3d327bed 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -1,6 +1,8 @@
 import("system.vars");
 
-let scanPattern = JSON.parse(vars.get("$field.SCAN_PATTERN"));
+var rowdata = vars.get("$local.rowdata");
+
+let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
 if (scanPattern.provider == undefined) 
 { 
     scanPattern.provider = "indexP";