ORG: pretty index format

aliasDefinition/Data_alias/indexsearchgroups/org/query.js

@@ -13,9 +13,12 @@ if (vars.exists("$local.idvalue")) {
 }
 sqlHelper = new LegacySqlUtils();
 sqlQuery = "select RELATION.RELATIONID "
-    + "," + sqlHelper.concat(["ORG.NAME", "ORG.CUSTOMERCODE", "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]) 
+    + "," + sqlHelper.concat(["ORG.NAME", "ORG.CUSTOMERCODE"]) 
     + " as TITLECOLUMN "
-    + ", " + sqlHelper.concat(["ADDRESS","BUILDINGNO","'-'", "COUNTRY", "ZIP", "CITY"], " ")
+    + "," + sqlHelper.concat([
+         sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
+        ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
+        ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
     //additional indexed fields
     + ",ORG.NAME, COMM.ADDR "
     + " from ORG "