diff --git a/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js b/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
index a7272d7517ab1f7844d452f5aeada2e3d9330ef5..96cb00f646f963b3229bdf35495aec1fed6ecf63 100644
--- a/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
+++ b/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
@@ -1,11 +1,7 @@
 import("system.logging");
 import("DuplicateScanner_lib");
 
-//var filterName = "PersonenDubletten";
-//var targetEntity = "Person_entity";
-//var values = {FIRSTNAME: "Anja", LASTNAME: "Lindner", GENDER: "f", CONTACTID: ""};
-//var resultFields = ["PERSONID", "LASTNAME", "FIRSTNAME"];
-//var duplicates = DuplicateScannerUtils.ScanForDuplicates(filterName, targetEntity, values, resultFields);
+
 
 var filterName = "PersonDuplicates";
 var targetEntity = "Person_entity";
@@ -14,7 +10,31 @@ var queryPersonContactIds = "select CONTACTID, FIRSTNAME, LASTNAME, GENDER from
                             + " join PERSON on PERSONID = PERSON_ID";
 var tmpFieldsInFilterRay = ["CONTACTID", "FIRSTNAME", "LASTNAME", "GENDER"];
 
-logging.log("in der action -> ");
+logging.log("Löschen von PERSON Dubletten -> ");
+DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity("Person_entity");
 
+logging.log("Neu berechnen von PERSON Dubletten -> ");
 DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
-tmpFieldsInFilterRay, resultFieldsIdFieldName);
\ No newline at end of file
+tmpFieldsInFilterRay, resultFieldsIdFieldName);
+
+DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+
+//##############################################################################
+
+filterName = "OrganisationDuplicates";
+targetEntity = "Organisation_entity";
+resultFieldsIdFieldName = "CONTACTID";
+queryPersonContactIds = "select CONTACTID, ORGANISATION.\"NAME\" from ORGANISATION"
+                            + " join CONTACT on CONTACT.CONTACTID = ORGANISATION.ORGANISATIONID"
+                            + " where CONTACTID != '0'";
+tmpFieldsInFilterRay = ["CONTACTID", "NAME"];
+
+
+logging.log("Löschen von ORGANISATION Dubletten -> ");
+DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity)
+
+logging.log("Neu berechnen von ORGANISATION Dubletten -> ");
+DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
+tmpFieldsInFilterRay, resultFieldsIdFieldName);
+
+DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
\ No newline at end of file
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index e2deb7a14a46da302fe7f01fb63c6f88caf53fda..955b9f2e5e07e5a7d3658b79ff895ba88d8da4cf 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -85,7 +85,6 @@ DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity = function(pTargetEn
  * Afterwards, all records which contain a nonexistend clusterId are being deleted
  * 
  * @param {String} pTargetEntity Name of Entity whose duplicates should be updated
- * 
  */
 DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations = function(pTargetEntity)
 {
@@ -102,11 +101,12 @@ DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations = function(pTargetEntit
             
     let newIdOldIdRay = db.table(query);
     let updateStatements = [];
-    
+
+    //Build update statements to set new clusterIds
     for (let i = 0; i < newIdOldIdRay.length; i++) 
     {
-        let newClusterId = newIdOldIdRay[INDEX_NEW_CLUSTERID];
-        let oldClusterId = newIdOldIdRay[INDEX_OLD_CLUSTERID];
+        let newClusterId = newIdOldIdRay[i][INDEX_NEW_CLUSTERID];
+        let oldClusterId = newIdOldIdRay[i][INDEX_OLD_CLUSTERID];
         let updateColumns = ["CLUSTERID"];
         let condition = "UNRELATEDDUPLICATES.CLUSTERID = '" + oldClusterId + "'";
         
@@ -114,16 +114,14 @@ DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations = function(pTargetEntit
         
         updateStatements.push(updateStatement);
     }
-    
     db.updates(updateStatements);
     
     /* 
      * All unrelated duplicate ids that still exist in a cluster, have been updated with the new cluster id.
      * All records with a nonexistend clusterid can now be deleted because they haven't been detected as a duplicate any more.
      */
-    let deleteCondition = "CLUSTERID not in (select dc1.CLUSTERID from DUPLICATECLUSTERS dc1 where dc1.TARGET_ENTITY = '" + pTargetEntity + "')";
+    let deleteCondition = "CLUSTERID not in (select dc1.CLUSTERID from DUPLICATECLUSTERS dc1)";
     db.deleteData("UNRELATEDDUPLICATES", deleteCondition);
-
 }
 
 DuplicateScannerUtils.CreateUnrelatedDuplicateRelation = function(pSourceContactId, pUnrelatedContactId, pClusterId)