diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index f1a45c9a9b36e685e783cdf9277f77224a3831ac..9b143fe1e1a0d957a48705e44b631f8a1f040590 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1265,13 +1265,13 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+          <recordfield>CONTACT.CONTACTID</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
+          <recordfield>CONTACT.CONTACTID</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 1b022481dbdc49732ce49dd4f5dc1e8b2bbaf766..77dd8ff2c26eb16daa2822359fcfcdabc10d397f 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1099,15 +1099,13 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
+          <recordfield>CONTACT.CONTACTID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
+          <recordfield>CONTACT.CONTACTID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.displayValue</name>