diff --git a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
index 15809830cdbfdbde45d385a7d3a2d3973853ac42..13a13f792646bb62bb722a063c30b000e618f983 100644
--- a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
@@ -16,6 +16,7 @@ logging.log("querySelectFields -> " + querySelectFields);
 let queryPersonFieldData = "select " + querySelectFields + " from CONTACT"
                             + " join PERSON on PERSONID = PERSON_ID"
                             + " left join ADDRESS on ADDRESS.CONTACT_ID = CONTACT.CONTACTID";
+                            //+ " join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID";
 
 logging.log("Löschen von PERSON Dubletten -> ");
 DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 8de67abe4e7eb2ad23a8795bfa6da93edc9c4dbe..51be866e59e6471f45cad7844a234408c13bf683 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,10 +23,6 @@
           <name>c021711c-9f3e-454d-964c-1339e3463329</name>
           <entityField>ENTITY_TO_SCAN_NAME</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>e8236833-ddb7-45a0-be51-cb56013f7b4b</name>
-          <entityField>EXTERNAL_SERVICE_USAGE_ALLOWED</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
@@ -39,10 +35,5 @@
       <entityField>ScannerIndexConfigs_Consumer</entityField>
       <view>DuplicateScannerIndexConfigEdit_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>88257173-a722-45a4-88be-790c9ce575cd</name>
-      <entityField>ScannerResultFieldsConfig_Consumer</entityField>
-      <view>DuplicateScannerResultFieldConfigEdit_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
index fcfd2a13c41cc053944e4f73350b2161530ff121..6aa1ceac2a084b26b24f3ad5ba521e625bdbfe4e 100644
--- a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
+++ b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
@@ -25,10 +25,6 @@
           <name>8615259b-de5b-493a-9c9d-2ff934ae1b8c</name>
           <entityField>ENTITY_TO_SCAN_NAME</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>d43d6a6d-738a-4543-9a66-2e09114e212c</name>
-          <entityField>EXTERNAL_SERVICE_USAGE_ALLOWED</entityField>
-        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 8ac974b8686b42f197f390747a8a3fefd51f75bc..908a03614a15c966afb3dca7995ef98ad9f294a7 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -1203,7 +1203,7 @@ _DuplicateScannerUtils._insertValuesInFilterTemplate = function(pJsonRootNode, p
             if(fieldValue == null)
             {
                 logging.show("Duplicate Scan: Requested value for field " + fieldName + " not present in the provided valueslist");
-                return pJsonRootNode;
+                continue;
             }
 
             if(_DuplicateScannerUtils._isNotNullAndANumber(pCountCharsOfValueToUse)