Integration - ZIP, CITY and ADDRESS

entity/Person_entity/Person_entity.aod

@@ -1076,15 +1076,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
-      <name>STANDRAD_ZIP</name>
+      <name>STANDARD_ZIP</name>
       <title>ZIP</title>
     </entityField>
     <entityField>
-      <name>STANDRAD_ADDRESS</name>
+      <name>STANDARD_ADDRESS</name>
       <title>Address</title>
     </entityField>
     <entityField>
-      <name>STANDRAD_CITY</name>
+      <name>STANDARD_CITY</name>
       <title>City</title>
     </entityField>
   </entityFields>
@@ -1427,12 +1427,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           </additionalFieldNameAliases>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>STANDRAD_ADDRESS.value</name>
-          <indexFieldType>ADDRESS</indexFieldType>
-          <additionalFieldNameAliases>
-            <element>address</element>
-          </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <name>STANDARD_ADDRESS.displayValue</name>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_COUNTRY.value</name>
@@ -1443,20 +1438,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>STANDRAD_ZIP.value</name>
-          <indexFieldType>ADDRESS</indexFieldType>
-          <additionalFieldNameAliases>
-            <element>zip</element>
-          </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <name>STANDARD_ZIP.value</name>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>STANDRAD_CITY.value</name>
-          <indexFieldType>ADDRESS</indexFieldType>
-          <additionalFieldNameAliases>
-            <element>city</element>
-          </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <name>STANDARD_CITY.value</name>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.value</name>