diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
index a9971811a54d5b707ba3b11b10f93682ff0ca93a..b3b5019620eeb8f41f7fdf43f8769f9c275b2888 100644
--- a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
+++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
@@ -1,18 +1,9 @@
+import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-var resultValue;
-if(vars.get("$param.CampaignId_param") != null && vars.get("$param.CampaignId_param") != "")
-{
-    resultValue = "CAMPAIGN_ID = '" + vars.get("$param.CampaignId_param") + "'";
-    
-    if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-        resultValue += " AND CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-    
-    result.string(resultValue);
-}
-else if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-    {
-        resultValue = "CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-        result.string(resultValue);
-    }
\ No newline at end of file
+var condition = newWhere()
+    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", "$param.CampaignId_param")
+    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param");
+
+result.string(condition.toString());
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index 48e7a6cbbddcac3d8fe7def09dcc51fc47240d78..5f3455bc5b51c66cf6a7cd0ed14899bc09356fd9 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -7,5 +7,5 @@ import("system.vars");
 if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-    result.string("CAMPAIGN.EMPLOYEE_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");
+    result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
 }
\ No newline at end of file
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
index a1bd70f1174309288cfb62611a5c91d0695572d8..b40df37b5c21d8eb1dbf1f28efe0e857fc33f8a6 100644
--- a/entity/Contract_entity/conditionProcess.js
+++ b/entity/Contract_entity/conditionProcess.js
@@ -1,7 +1,9 @@
+import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
-    result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");  
-else
-    result.string("1 = 1");  
\ No newline at end of file
+var condition = newWhere();
+if (vars.exists("$param.ContactId_param"))
+    condition.andIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
+
+result.string(condition.toString("1=1"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
index 09f2397fdf9818efae79ef28201915ffc52639c3..43719039395d018a0dda9921ed8a1090e4e38c88 100644
--- a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERINDEXCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
index 09f2397fdf9818efae79ef28201915ffc52639c3..84dac3bb3370942bb035ed8293bd2d6c9ee9a8d8 100644
--- a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERPREFILTERCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
index 09f2397fdf9818efae79ef28201915ffc52639c3..b9bff609c91222abb6c3b0292492600907585487 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERRESULTFIELDCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 9a1f8379fafb6fd199248432ce6e445b8b1f93d7..8c47a3907128b96a4d4f509baff05c3c92026de0 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -220,7 +220,7 @@ StandardObject.prototype._setContactStandardAddress = function (pAddressID, pCon
         ["ADDRESS_ID"], 
         db.getColumnTypes("CONTACT", ["ADDRESS_ID"]), 
         [pAddressID], 
-        newWhere("CONTACT.CONTACTID", pContactID));
+        newWhere("CONTACT.CONTACTID", pContactID).build());
 }
 
 /**
@@ -289,7 +289,7 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
         ["ISSTANDARD"], 
         db.getColumnTypes("COMMUNICATION", ["ISSTANDARD"]), 
         [pValue], 
-        newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID));
+        newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID).build());
 }
 
 /**