diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 1ee5811a6b9bd38b0984bd34d97b6d97f0c6ef1c..ca01adccf5513a6e2f6909f13db58640d2a560c0 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -13260,118 +13260,4 @@
       </entityGroup>
     </aliasDefDb>
   </aliasDefinitionSub>
-  <indexSearchGroups>
-    <indexSearchGroup>
-      <name>ORGANISATION</name>
-      <title>Company</title>
-      <icon>VAADIN:BUILDING</icon>
-      <idColumn>CONTACTID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query>
-      <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries>
-      <resultContextNeon>Organisation</resultContextNeon>
-      <affectedTables>
-        <element>ADDRESS</element>
-        <element>COMMUNICATION</element>
-        <element>CONTACT</element>
-        <element>ORGANISATION</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>PERSON</name>
-      <title>Contact</title>
-      <icon>VAADIN:USERS</icon>
-      <idColumn>CONTACTID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/query.js</query>
-      <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js</subQueries>
-      <resultContextNeon>Person</resultContextNeon>
-      <affectedTables>
-        <element>ADDRESS</element>
-        <element>COMMUNICATION</element>
-        <element>PERSON</element>
-        <element>CONTACT</element>
-        <element>ORGANISATION</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>OFFER</name>
-      <title>Offer</title>
-      <icon>VAADIN:CART</icon>
-      <active v="true" />
-      <idColumn>OFFERID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js</query>
-      <resultContextNeon>Offer</resultContextNeon>
-      <affectedTables>
-        <element>OFFER</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>SALESORDER</name>
-      <title>Receipt</title>
-      <icon>VAADIN:DOLLAR</icon>
-      <active v="true" />
-      <idColumn>SALESORDERID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js</query>
-      <resultContextNeon>Order</resultContextNeon>
-      <affectedTables>
-        <element>SALESORDER</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>CONTRACT</name>
-      <title>Contract</title>
-      <icon>VAADIN:FILE_TEXT</icon>
-      <active v="true" />
-      <idColumn>CONTRACTID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js</query>
-      <resultContextNeon>Contract</resultContextNeon>
-      <affectedTables>
-        <element>CONTRACT</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>PRODUCT</name>
-      <title>Product</title>
-      <icon>VAADIN:HAMMER</icon>
-      <active v="true" />
-      <idColumn>PRODUCTID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/query.js</query>
-      <resultContextNeon>Product</resultContextNeon>
-      <affectedTables>
-        <element>PRODUCT</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-    <indexSearchGroup>
-      <name>SALESPROJECT</name>
-      <title>Salesproject</title>
-      <icon>VAADIN:BOOK_DOLLAR</icon>
-      <active v="true" />
-      <idColumn>SALESPROJECTID</idColumn>
-      <titleColumn>TITLECOLUMN</titleColumn>
-      <descriptionColumn>DESCCOLUMN</descriptionColumn>
-      <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js</query>
-      <resultContextNeon>Salesproject</resultContextNeon>
-      <affectedTables>
-        <element>SALESPROJECT</element>
-      </affectedTables>
-      <affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js</affectedIds>
-    </indexSearchGroup>
-  </indexSearchGroups>
 </aliasDefinition>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js
deleted file mode 100644
index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/contract/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js b/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
deleted file mode 100644
index c80b55a38be25139beeefac4cbcbeb4b08a88cad..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/contract/query.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where CONTRACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select CONTRACTID, " 
-    + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ")
-    + " as TITLECOLUMN, " 
-    + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'", 
-            KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) 
-    + " as DESCCOLUMN, CONTRACTCODE, ORGANISATION.NAME, CUSTOMERCODE " 
-    + " from CONTRACT "
-    + " join CONTACT on CONTRACT.CONTACT_ID = CONTACTID "
-    + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
-    + queryCondition + " order by CONTRACTCODE ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js
deleted file mode 100644
index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/offer/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js b/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
deleted file mode 100644
index b2022eb648b08cd5b436a248d35430560222f5e7..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/offer/query.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.SQLTYPES");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select OFFERID, " 
-    + sqlHelper.concat([sqlHelper.cast("OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ")
-    + " as TITLECOLUMN, " 
-    + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)])  
-    + " as DESCCOLUMN, OFFERCODE, ORGANISATION.NAME, CUSTOMERCODE " 
-    + " from OFFER "
-    + " join CONTACT on OFFER.CONTACT_ID = CONTACTID "
-    + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
-    + queryCondition + " order by OFFERCODE ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
deleted file mode 100644
index 2741393ffd7c0907b067f6250129b5db6373eab4..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("IndexSearch_lib");
-import("Sql_lib");
-
-var infoContainer, onUpdFn, tableName, res;
-
-tableName = vars.get("$local.table");
-idValue = vars.get("$local.idvalue");
-infoContainer =  IndexsearchUtils.createAffectedInfoContainer(idValue, null, vars.get("$local.action")
-    ,function (){return vars.get("$local.columns")}
-    ,function (){return vars.get("$local.oldvalues")}
-    ,function (){return vars.get("$local.values")});
-
-switch (tableName)
-{
-    case "CONTACT":
-        res = [idValue];
-        break;    
-    case "ORGANISATION":
-        res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
-        break;
-    case "ADDRESS":
-        res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
-            return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
-                    [id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
-            ]]);
-        });
-        break;
-    case "COMMUNICATION":
-        res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
-            return db.array(db.COLUMN, ["select COMMUNICATION.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
-                    [id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
-            ]]);
-        });
-        break;
-}
-
-if (res) {
-    result.object(res);
-}
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
deleted file mode 100644
index bbcf88e142807d6dc584df47ee496b22912a63b8..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Communication_lib");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select CONTACT.CONTACTID "
-    + "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]) 
-    + " as TITLECOLUMN "
-    + "," + sqlHelper.concat([
-         sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-            ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
-        ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
-        ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-        ], " | ") + " as DESCCOLUMN "
-    //additional indexed fields
-    + ",ORGANISATION.NAME, COMMUNICATION.ADDR "
-    + " from ORGANISATION "
-    + " join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null "
-    + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
-    + " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
-    + (queryCondition || "") 
-    + " order by CONTACT.CONTACTID ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
deleted file mode 100644
index 17a37f0ca6aa9488c56d0bd230066e8fd35e77c2..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js
deleted file mode 100644
index 488e44a0b18fefa686a5a6640db77c4564faae81..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("IndexSearch_lib");
-import("Sql_lib");
-
-var infoContainer, onUpdFn, tableName, res;
-
-tableName = vars.get("$local.table");
-idValue = vars.get("$local.idvalue");
-infoContainer =  IndexsearchUtils.createAffectedInfoContainer(idValue, null, vars.get("$local.action")
-    ,function (){return vars.get("$local.columns")}
-    ,function (){return vars.get("$local.oldvalues")}
-    ,function (){return vars.get("$local.values")});
-
-switch (tableName)
-{
-    case "CONTACT":
-        res = [idValue];
-        break;    
-    case "PERSON":
-        res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID = '" + idValue + "'");
-        break;
-    case "ORGANISATION":
-        res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is not null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
-        break;
-    case "ADDRESS":
-        res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
-            return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
-                    [id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
-            ]]);
-        });
-        break;
-    case "COMMUNICATION":
-        res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
-            return db.array(db.COLUMN, ["select COMMUNICATION.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
-                    [id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
-            ]]);
-        });
-        break;
-}
-
-if (res) {
-    result.object(res);
-}
-    
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
deleted file mode 100644
index 719efe080e627c040b043e12f994c936dcf855c6..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Communication_lib");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select CONTACT.CONTACTID "
-    + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]) 
-    + " as TITLECOLUMN "
-    + "," + sqlHelper.concat([
-         sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-            ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
-        ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
-        ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-        ], " | ") + " as DESCCOLUMN "
-    //additional indexed fields
-    + ",ORGANISATION.NAME, COMMUNICATION.ADDR "
-    + " from PERSON "
-    + " join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID "
-    + " join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
-    + " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
-    + " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
-    + (queryCondition || "") 
-    + " order by CONTACT.CONTACTID ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js
deleted file mode 100644
index 17a37f0ca6aa9488c56d0bd230066e8fd35e77c2..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js
deleted file mode 100644
index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/product/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/product/query.js b/aliasDefinition/Data_alias/indexsearchgroups/product/query.js
deleted file mode 100644
index 9f8b8240c20e0a74ef734bcc01787ba192206ffa..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/product/query.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where PRODUCTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select PRODUCTID, " 
-    + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ")
-    + " as TITLECOLUMN, " 
-    + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID")
-    + " as DESCCOLUMN, PRODUCTCODE " 
-    + " from PRODUCT "
-    + queryCondition + " order by PRODUCTCODE ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js
deleted file mode 100644
index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
deleted file mode 100644
index 2ffeb89a270aad2faa93e843109cfcd93defb5e9..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import("system.SQLTYPES");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where SALESORDERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?) ----> use SqlCondition Lib
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select SALESORDERID, " 
-    + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
-    + " as TITLECOLUMN, " 
-    + sqlHelper.concat(["ORGANISATION.NAME"], " | ") 
-    + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
-    + " from SALESORDER "
-    + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
-    + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
-    + queryCondition + " order by SALESORDERCODE ";
-result.string(sqlQuery);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js
deleted file mode 100644
index 548f327a66b7b08252086a013c0152cd52f8da20..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/affectedIds.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.object([vars.getString("$local.idvalue")]);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
deleted file mode 100644
index 079117e9028cc73670823798d0325902cc451055..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesproject/query.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Keyword_lib");
-import("Sql_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where SALESPROJECTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select SALESPROJECTID, PROJECTTITLE as TITLECOLUMN, " 
-    + sqlHelper.concat([
-        "'" + translate.text("Status") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
-        "'| " + translate.text("Phase") + ":'",  KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
-      ]) 
-    + " as DESCCOLUMN, PROJECTCODE " 
-    + " from SALESPROJECT "
-    + queryCondition + " order by PROJECTCODE ";
-result.string(sqlQuery);
\ No newline at end of file