diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index cd5e8d25404030d24b855cda5f097933f732c879..b282b32ce6d64ca1e0b1a408362dc31226710a28 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -316,9 +316,8 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <indexFieldMappings>
         <indexRecordFieldMapping>
           <name>ADDR.value</name>
-          <indexFieldType>COMM</indexFieldType>
+          <indexFieldType>COMMUNICATION</indexFieldType>
           <isMultiValued v="true" />
-          <dbColumn>ADDR</dbColumn>
         </indexRecordFieldMapping>
       </indexFieldMappings>
     </indexRecordContainer>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 0cf77c609790fe9d16176466e157d5e20de16d34..b6e7883a6b4d38d3067bd334425ee84fde61b196 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1091,7 +1091,7 @@
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.value</name>
-          <indexFieldType>COMM</indexFieldType>
+          <indexFieldType>EMAIL</indexFieldType>
           <additionalFieldNameAliases>
             <element>addr</element>
           </additionalFieldNameAliases>
@@ -1099,7 +1099,7 @@
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
-          <indexFieldType>COMM</indexFieldType>
+          <indexFieldType>TELEPHONE</indexFieldType>
           <additionalFieldNameAliases>
             <element>addr</element>
           </additionalFieldNameAliases>
@@ -1110,7 +1110,7 @@
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>CUSTOMERCODE.value</name>
-          <indexFieldType>TEXT_NOSTOPWORDS</indexFieldType>
+          <indexFieldType>TEXT_PLAIN</indexFieldType>
           <additionalFieldNameAliases />
         </indexRecordFieldMapping>
       </indexFieldMappings>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5223cda84ae7740269831d0328df2e7a57cfaf9f..431f0aa75908bf318db844cb218bcb83182f170e 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1163,21 +1163,21 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <indexFieldMappings>
         <indexRecordFieldMapping>
           <name>FIRSTNAME.value</name>
-          <indexFieldType>PERS_NAME</indexFieldType>
+          <indexFieldType>PHONETIC_NAME</indexFieldType>
           <isKeyword v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>LASTNAME.value</name>
-          <indexFieldType>PERS_NAME</indexFieldType>
+          <indexFieldType>PHONETIC_NAME</indexFieldType>
           <isKeyword v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>SALUTATION.value</name>
-          <indexFieldType>PERS_NAME</indexFieldType>
+          <indexFieldType>PHONETIC_NAME</indexFieldType>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>TITLE.value</name>
-          <indexFieldType>PERS_NAME</indexFieldType>
+          <indexFieldType>PHONETIC_NAME</indexFieldType>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>ORGANISATION_ID.value</name>
@@ -1197,7 +1197,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.value</name>
-          <indexFieldType>COMM</indexFieldType>
+          <indexFieldType>EMAIL</indexFieldType>
           <additionalFieldNameAliases>
             <element>addr</element>
           </additionalFieldNameAliases>
@@ -1205,7 +1205,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
-          <indexFieldType>COMM</indexFieldType>
+          <indexFieldType>TELEPHONE</indexFieldType>
           <additionalFieldNameAliases>
             <element>addr</element>
           </additionalFieldNameAliases>