diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0d46bf7b97d26c3887302b467074d26dc7c070c9..639b4c5d8ced671dc4da5e1ca4f3c9330963d0ca 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1275,13 +1275,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 7e2f3776198f36560ce47649f0b4e064ee1eb483..b2f912bf7c81c3b289cdd338daa1346f6328e90d 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1105,15 +1105,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>