diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_unrelatedDuplicates.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_unrelatedDuplicates.xml
index aff186e25ca6ac6f8457c6413c0afa77faf1b133..639ac544c43b3ce396d0411aef69ef7efa80931b 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_unrelatedDuplicates.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_unrelatedDuplicates.xml
@@ -11,9 +11,7 @@
             <column name="UNRELATEDDUPLICATEID" type="CHAR(36)" >
                 <constraints nullable="false"/>
             </column>
-            <column name="CLUSTERID" type="CHAR(36)" >
-                <constraints nullable="false"/>
-            </column>
+            <column name="CLUSTERID" type="CHAR(36)" />
         </createTable>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 6e10377791b9529a11d9450b76adac9e5f8d6fcf..2ea26a9c2263c31d164ab52c6eae9aa4277e421d 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -752,7 +752,7 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
         }
         
         let valuelength = fieldConfig.length; 
-        logging.log(valuelength)
+
         if ( valuelength )
             entityFieldValue = entityFieldValue.substr(0, parseInt(valuelength)) + "*";
         
@@ -789,22 +789,18 @@ DuplicateScannerUtils.GetUnrelatedRelationsForDuplicate = function(pDuplicateId)
                 .where("UNRELATEDDUPLICATES.SOURCEDUPLICATEID", pDuplicateId)
                 .or("UNRELATEDDUPLICATES.UNRELATEDDUPLICATEID", pDuplicateId)
                 .table();
-    
     let sourceDuplicateId = "";
     let unrelatedDuplicateId = "";
     for (let i = 0; i < duplicateIds.length; i++) 
     {
-        sourceDuplicateId = duplicateIds[0];
-        unrelatedDuplicateId = duplicateIds[1];
-        
-        if(sourceDuplicateId == pDuplicateId || unrelatedDuplicateId == pDuplicateId)
-            continue;
+        sourceDuplicateId = duplicateIds[i][0];
+        unrelatedDuplicateId = duplicateIds[i][1];
         
-        if(sourceDuplicateId != null && sourceDuplicateId != "")
+        if(sourceDuplicateId != null && sourceDuplicateId != "" && sourceDuplicateId != pDuplicateId)
         {
             unrelatedIds.push(sourceDuplicateId);
         }
-        else if(unrelatedDuplicateId != null && unrelatedDuplicateId != "")
+        else if(unrelatedDuplicateId != null && unrelatedDuplicateId != "" && unrelatedDuplicateId != pDuplicateId)
         {
             unrelatedIds.push(unrelatedDuplicateId);
         }