Wrong index in organization, IDS must not be searchable globally

entity/Organisation_entity/Organisation_entity.aod

@@ -1277,10 +1277,12 @@
         <indexRecordFieldMapping>
           <name>ORGANISATIONID.value</name>
           <indexFieldType>STRING</indexFieldType>
+          <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>CONTACTID.value</name>
           <indexFieldType>STRING</indexFieldType>
+          <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>CUSTOMERCODE.value</name>
@@ -1312,7 +1314,7 @@
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>IndexCity.value</name>
+          <name>STANDARD_CITY.value</name>
           <indexFieldType>ADDRESS</indexFieldType>
           <additionalFieldNameAliases>
             <element>city</element>
@@ -1320,15 +1322,15 @@
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>IndexCommunication.value</name>
+          <name>STANDARD_EMAIL_COMMUNICATION.value</name>
           <indexFieldType>COMMUNICATION</indexFieldType>
           <additionalFieldNameAliases>
-            <element>comm</element>
+            <element>email</element>
           </additionalFieldNameAliases>
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>IndexCommPhone.value</name>
+          <name>STANDARD_PHONE_COMMUNICATION.value</name>
           <indexFieldType>TELEPHONE</indexFieldType>
           <additionalFieldNameAliases>
             <element>phone</element>

entity/Person_entity/Person_entity.aod

@@ -1423,10 +1423,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         <indexRecordFieldMapping>
           <name>CONTACTID.value</name>
           <indexFieldType>STRING</indexFieldType>
+          <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>PERSON_ID.value</name>
           <indexFieldType>STRING</indexFieldType>
+          <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>FIRSTNAME.value</name>
@@ -1445,6 +1447,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         <indexRecordFieldMapping>
           <name>ORGANISATION_ID.value</name>
           <indexFieldType>STRING</indexFieldType>
+          <isGlobalSearchField v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>ORGANISATION_NAME.value</name>