1063319 only use standard address location in Organisation index

entity/Organisation_entity/Organisation_entity.aod

@@ -1355,7 +1355,11 @@
       <indexFieldMappings>
         <indexRecordFieldMapping>
           <name>#LOCATION</name>
-          <systemField>LOCATION</systemField>
+          <indexFieldType>LOCATION</indexFieldType>
+          <additionalFieldNameAliases>
+            <element>location</element>
+          </additionalFieldNameAliases>
+          <isGlobalSearchField v="false" />
           <isFilterable v="false" />
           <isLookupFilter v="false" />
         </indexRecordFieldMapping>

entity/Organisation_entity/recordcontainers/index/query.js

@@ -24,7 +24,7 @@ var querySelect = newSelect([
             sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
             sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
         ], " | "),
-        sqlHelper.concat([sqlHelper.cast("ADDRESS.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("ADDRESS.LON", SQLTYPES.VARCHAR, 16)], ","),
+        sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
         //additional indexed fields
         "ORGANISATION.NAME",
         "ORGANISATION.ORGANISATIONID",