diff --git a/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js b/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js
index 2a79f06cc091b3495d090a95dc7ee1b8e8d354f4..5980f8724ae055ff9b1e15047fce68b05e283849 100644
--- a/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js
+++ b/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js
@@ -3,8 +3,9 @@ import("system.vars");
 import("Sql_lib");
 import("system.db");
 
-var contactId = db.cell(SqlCondition.begin()
-    .andPrepare("CONTACT.PERSON_ID", vars.get("$field.LEAD_PERSON"))
-    .buildSql("select CONTACTID from CONTACT", "1=2"));
+var contactId = newSelect("CONTACTID")
+                    .from("CONTACT")
+                    .whereIfSet("CONTACT.PERSON_ID", "$field.LEAD_PERSON")
+                    .cell(true);
 
 result.string(contactId);
\ No newline at end of file
diff --git a/entity/Lead_entity/entityfields/lead_perscontact/valueProcess.js b/entity/Lead_entity/entityfields/lead_perscontact/valueProcess.js
index 1453e3ed2138f14b45a750097ad96261382eb8f2..50a4a282384bbde9bae11f01213878aacf3011d3 100644
--- a/entity/Lead_entity/entityfields/lead_perscontact/valueProcess.js
+++ b/entity/Lead_entity/entityfields/lead_perscontact/valueProcess.js
@@ -6,13 +6,14 @@ import("system.db");
 var contactId = "";
 
 if(vars.get("$field.LEAD_PERSON"))
-    contactId = db.cell(SqlCondition.begin()
-        .andPrepare("CONTACT.PERSON_ID", vars.get("$field.LEAD_PERSON"))
-        .buildSql("select CONTACTID from CONTACT", "1=2"));
-
+    contactId = newSelect("CONTACTID")
+                    .from("CONTACT")
+                    .whereIfSet("CONTACT.PERSON_ID", "$field.LEAD_PERSON")
+                    .cell(true);
 else
-    contactId = db.cell(SqlCondition.begin()
-        .andPrepare("CONTACT.ORGANISATION_ID", vars.get("$field.LEAD_ORGANISATIONID"))
-        .buildSql("select CONTACTID from CONTACT", "1=2"));
-
+    contactId = newSelect("CONTACTID")
+                    .from("CONTACT")
+                    .whereIfSet("CONTACT.ORGANISATION_ID", "$field.LEAD_ORGANISATIONID")
+                    .cell(true);
+    
 result.string(contactId);
\ No newline at end of file