diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 50179f32f4ec950b7bc03bce5d690a4aeb46fbb9..83b3cbdbb82b0dbf871cdfd4ba7a291afefdbbb3 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -49,18 +49,18 @@
     <entityField>
       <name>CONTRACTSTATUS</name>
       <title>${CONTRACT_STATUS}</title>
-      <possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>ContractStates</consumer>
     </entityField>
     <entityField>
       <name>CONTRACTTYPE</name>
       <title>Type of contract</title>
-      <possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>ContractTypes</consumer>
     </entityField>
     <entityField>
       <name>PAYMENT</name>
       <title>Payment method</title>
+      <consumer>ContractPayments</consumer>
       <mandatory v="true" />
-      <possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityField>
       <name>RELATION_ID</name>
@@ -202,6 +202,51 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>ContractPayments</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContractStates</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>ContractTypes</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -301,6 +346,18 @@
           <name>PERS_LASTNAME.value</name>
           <recordfield>PERS.LASTNAME</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PAYMENT.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTSTATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTRACTTYPE.displayValue</name>
+          <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..c34418d5c88c764b87cfb79b99689ff1006e5fca
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ContractPayment");
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..11ada9125d8a16eb253124748f409276a7aa4d1a
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ContractStatus");
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js b/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js
deleted file mode 100644
index 44b0166cc251507c840449209de9662874437dcb..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("CONTRACT.CONTRACTSTATUS");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js b/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js
deleted file mode 100644
index cbd3cf1b207cd97a7dfb866d6c6eeca863279c09..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("CONTRACT.CONTRACTTYPE");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7495149c8a411397718c797ce6d9044af176c38
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("ContractType");
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js b/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js
deleted file mode 100644
index f10c981a91db03bd543598fc403be7ef48234862..0000000000000000000000000000000000000000
--- a/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("CONTRACT.PAYMENT");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..07c629a28ad80b2151cadfb09f2db4b8eb80c203
--- /dev/null
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("ContractStatus", "CONTRACT.CONTRACTSTATUS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b436148a9b20344a734c0ff72cc38f39154576b1
--- /dev/null
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACT.CONTRACTTYPE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..48711d1d4a9a2606c540c64d858a4d488ae5a790
--- /dev/null
+++ b/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("ContractPayment", "CONTRACT.PAYMENT");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Keyword_entity/Keyword_entity.aod b/entity/Keyword_entity/Keyword_entity.aod
index 10c9b3d07b3dde21c8edcaca7c0b2c5964f3407d..1ae2d1416a350294cb6d66dc2e9df3aff99b1464 100644
--- a/entity/Keyword_entity/Keyword_entity.aod
+++ b/entity/Keyword_entity/Keyword_entity.aod
@@ -82,6 +82,42 @@
           <fieldName>KeywordDirections</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractPayments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractStates</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
+          <entityName>Order_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
+          <entityName>Productprice_entity</entityName>
+          <fieldName>KeywordCurrencies</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Keyword_entity/documentation.adoc b/entity/Keyword_entity/documentation.adoc
index 85315315fa2f284f66f942747594cef62fb842b6..89dede6975ebf1f4bd1a0b480fd5c01d646338ef 100644
--- a/entity/Keyword_entity/documentation.adoc
+++ b/entity/Keyword_entity/documentation.adoc
@@ -50,14 +50,14 @@ Take a look at the following table. Beware that these are not the acutal db-colu
 .simplified, abstract representation how keywords are acutllay stored
 [options="header", cols="m,m,d,d"]
 |=======
-|UID |key-ID |tile | category
+|UID |key-ID |tile | container
 |{set:cellbgcolor:#90b678}
- unique key 1|1-key-value A|one|category 1
-|unique key 2|2-key-value A|two|category 1
-|unique key 3|3-key-value A|three|category 1
+ unique key 1|1-key-value A|one|container 1
+|unique key 2|2-key-value A|two|container 1
+|unique key 3|3-key-value A|three|container 1
 |{set:cellbgcolor:#b69e78 }
- unique key 4|1-key-value B|I|category 2
-|unique key 5|2-key-value B|II|category 2
+ unique key 4|1-key-value B|I|container 2
+|unique key 5|2-key-value B|II|container 2
 |=======
 
 And, to clarify an example:
@@ -66,7 +66,7 @@ And, to clarify an example:
 [options="header", cols="m,m,d,d"]
 |=======
 |{set:cellbgcolor:! }
- UID |key-ID |tile | category
+ UID |key-ID |tile | container
 |{set:cellbgcolor:#90b678}db1792cd|de-DE|German (Germany)|Language
 |62df7f0ba|en-GB|English (United Kingdom)|Language
 |126229d9|fr-FR|French (France)|Language
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index ad7e3eb2cd1d887efc6db5e1281e89ca900019f3..70a044a91811971a5f54eb3034f7ba37f3b10e02 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -14,7 +14,7 @@
     <entityField>
       <name>CURRENCY</name>
       <title>Currency</title>
-      <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>KeywordCurrencies</consumer>
     </entityField>
     <entityField>
       <name>OFFERCODE</name>
@@ -317,6 +317,21 @@
         <element>MASK</element>
       </onValueChangeTypes>
     </entityField>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -425,6 +440,10 @@
           <name>ADDRESS.value</name>
           <recordfield>OFFER.ADDRESS</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js b/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js
deleted file mode 100644
index 184c5606ba9149640015de4685cd9a37b2907ecd..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("CURRENCY");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..84063b8ce392d2e1b57ed338c6208d83a5f25c34
--- /dev/null
+++ b/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("Currency");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c677c3247fd856a058346946bb46efec4bd184bc
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "OFFER.CURRENCY");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index c8ab0c83bcf5c2d86f2c230a3ff6ffb705c585e3..272dd7ab4c1d38910f6403aee019b991c9a77d75 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -14,7 +14,7 @@
     <entityField>
       <name>CURRENCY</name>
       <title>Currency</title>
-      <possibleItemsProcess>%aditoprj%/entity/Order_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
+      <consumer>KeywordCurrencies</consumer>
     </entityField>
     <entityField>
       <name>SALESORDERCODE</name>
@@ -278,6 +278,21 @@
     <entityField>
       <name>ADDRESS</name>
     </entityField>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -382,6 +397,10 @@
           <name>ADDRESS.value</name>
           <recordfield>SALESORDER.ADDRESS</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Order_entity/entityfields/currency/possibleItemsProcess.js b/entity/Order_entity/entityfields/currency/possibleItemsProcess.js
deleted file mode 100644
index 184c5606ba9149640015de4685cd9a37b2907ecd..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/currency/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("CURRENCY");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..84063b8ce392d2e1b57ed338c6208d83a5f25c34
--- /dev/null
+++ b/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("Currency");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..202e23136909132e9a4c48ff298894265bd0453b
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "SALESORDER.CURRENCY");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index cebf225ae1cd18856e31c686d3716ed20f8c2c64..69f593b0ca4ebb5d84a33294118836df02a4e158 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -16,8 +16,8 @@
     <entityField>
       <name>CURRENCY</name>
       <title>Currency</title>
+      <consumer>KeywordCurrencies</consumer>
       <mandatory v="true" />
-      <possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
     <entityField>
       <name>FROMQUANTITY</name>
@@ -122,6 +122,7 @@
     <entityProvider>
       <name>Productprices</name>
       <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
           <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
@@ -143,6 +144,21 @@
         </entityDependency>
       </dependencies>
     </entityProvider>
+    <entityConsumer>
+      <name>KeywordCurrencies</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Keyword_entity</entityName>
+        <fieldName>generic_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>containerName_param</name>
+          <code>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -204,6 +220,10 @@
           <name>VAT.value</name>
           <recordfield>PRODUCTPRICE.VAT</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CURRENCY.displayValue</name>
+          <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js b/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js
deleted file mode 100644
index bf738952489c6e5ea3c14ec8a51928135cbb7b87..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items = KeywordUtils.getStandardArray("CURRENCY");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..84063b8ce392d2e1b57ed338c6208d83a5f25c34
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("Currency");
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..065362abed27f8a1065e211c2004a77e746ca657
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "PRODUCTPRICE.CURRENCY");
+result.string(sql);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ab1d0a6e88c3dcffb5830c165e60dbebbb9f9e41..9b9dcbec6035f9943b4ecb3e3b741f639d812c7f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -963,9 +963,6 @@
     <entry>
       <key>#,##0.00</key>
     </entry>
-    <entry>
-      <key>jDitoRC</key>
-    </entry>
     <entry>
       <key>Latin Name</key>
     </entry>
@@ -1533,6 +1530,21 @@
     <entry>
       <key>Sorting</key>
     </entry>
+    <entry>
+      <key>Canadian dollar</key>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+    </entry>
+    <entry>
+      <key>Euro</key>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 69a1c029028b47d3e5f234f71de5e407da8a9018..fd2b887d878f9521046bc9322adf3e0ab235d3ca 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1496,10 +1496,6 @@
     <entry>
       <key>#,##0.00</key>
     </entry>
-    <entry>
-      <key>jDitoRC</key>
-      <value>jDito Record Container</value>
-    </entry>
     <entry>
       <key>Latin Name</key>
     </entry>
@@ -1941,6 +1937,24 @@
       <key>Sorting</key>
       <value>Sortierung</value>
     </entry>
+    <entry>
+      <key>Canadian dollar</key>
+      <value>Kanadischer Dollar</value>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+      <value>United States Dollar</value>
+    </entry>
+    <entry>
+      <key>Euro</key>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+      <value>Schweizer Franken</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 1c112c9978d82f432c69225a78f378a8105971af..790970ceab633da12987f3b9d24a0752643c60f4 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -977,9 +977,6 @@
     <entry>
       <key>#,##0.00</key>
     </entry>
-    <entry>
-      <key>jDitoRC</key>
-    </entry>
     <entry>
       <key>Latin Name</key>
     </entry>
@@ -1563,6 +1560,21 @@
     <entry>
       <key>Sorting</key>
     </entry>
+    <entry>
+      <key>Canadian dollar</key>
+    </entry>
+    <entry>
+      <key>United States dollar</key>
+    </entry>
+    <entry>
+      <key>Euro</key>
+    </entry>
+    <entry>
+      <key>jdito</key>
+    </entry>
+    <entry>
+      <key>Swiss franc</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
index fee4f65bb688f607a1436be192a6f851c7b1f99e..0a45f8bd45611adff5a7c0495eea6817938ba822 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
@@ -1,5 +1,27 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_relationStatus.xml"/>
-    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_activityDirection.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_RelationStatus.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityDirection.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractPayment.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractStatus.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractType.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_Currency.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_OfferitemGroupcode.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_OfferStatus.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_OrganisationType.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_PersonGender.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ProductPricelist.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_QuantityUnit.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectEstimation.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectPhase.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectPricePolitics.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectRole.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectSource.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectState.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectStrength.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectWeakness.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectWonLost.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_StockWarehouse.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskStatus.xml"/>
+    <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
 </databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f0832d87bce545c5419a4982d06c8ce302387d78
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="03a1e5b6-64d3-47fd-8085-08b9b95bab19"/>
+      <column name="KEYID" value="25faee74-d340-41f2-97f9-ed34c4f8ff42"/>
+      <column name="TITLE" value="Annually"/>
+      <column name="CONTAINER" value="ContractPayment"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="539a4ed0-d3f1-4e2f-b3ff-339276045269"/>
+      <column name="KEYID" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+      <column name="TITLE" value="Semiannually"/>
+      <column name="CONTAINER" value="ContractPayment"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6bfb93b6-7940-4713-a053-16e17d875032"/>
+      <column name="KEYID" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="TITLE" value="Quarterly"/>
+      <column name="CONTAINER" value="ContractPayment"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="03a1e5b6-64d3-47fd-8085-08b9b95bab19"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="539a4ed0-d3f1-4e2f-b3ff-339276045269"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6bfb93b6-7940-4713-a053-16e17d875032"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40355683a58a28c6b4677c0b93a483eb3174cb3c
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
@@ -0,0 +1,82 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="c1c736a7-95af-417d-8993-3c6cbf065059"/>
+      <column name="KEYID" value="e12d37e9-3429-40b5-973b-c1569843ca46"/>
+      <column name="TITLE" value="Valid, unlimited"/>
+      <column name="CONTAINER" value="ContractStatus"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="41b15842-0d31-4023-b0b9-fa97f25bc444"/>
+      <column name="KEYID" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
+      <column name="TITLE" value="Valid, limited"/>
+      <column name="CONTAINER" value="ContractStatus"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="1bebbb3c-f412-4031-b533-f1e38c86eb17"/>
+      <column name="KEYID" value="4c63c82d-0276-4c12-9937-13fd361ad786"/>
+      <column name="TITLE" value="Not signed yet"/>
+      <column name="CONTAINER" value="ContractStatus"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="03f62e1e-0b9a-4e7e-a895-2d10bf57712f"/>
+      <column name="KEYID" value="bd809b1c-f6ef-42c0-8659-4800393f7280"/>
+      <column name="TITLE" value="None, individual count"/>
+      <column name="CONTAINER" value="ContractStatus"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="4959d607-b218-4e45-9c4b-b28f3ae6b0ff"/>
+      <column name="KEYID" value="56ad22dd-4bca-4e5a-b1a4-1db2376d7ed9"/>
+      <column name="TITLE" value="Resigned"/>
+      <column name="CONTAINER" value="ContractStatus"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="c1c736a7-95af-417d-8993-3c6cbf065059"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="41b15842-0d31-4023-b0b9-fa97f25bc444"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="1bebbb3c-f412-4031-b533-f1e38c86eb17"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="03f62e1e-0b9a-4e7e-a895-2d10bf57712f"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="4959d607-b218-4e45-9c4b-b28f3ae6b0ff"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6673489e474bf021d22b3e1901f3a627668cb2a
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="2c440f87-292d-4ec3-8eb2-74821e251365"/>
+      <column name="KEYID" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+      <column name="TITLE" value="Framework contract"/>
+      <column name="CONTAINER" value="ContractType"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="8dc775f2-05e1-47b5-b372-54c261f1f9d8"/>
+      <column name="KEYID" value="5117d48e-d6cb-4402-9f87-590c68625cb7"/>
+      <column name="TITLE" value="Service contract"/>
+      <column name="CONTAINER" value="ContractType"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="9c2a1b76-b9c4-486d-a1d2-d12970f20bd0"/>
+      <column name="KEYID" value="ee4c5e6e-b802-4c1c-8aed-a031a2a8126f"/>
+      <column name="TITLE" value="Maintenance contract"/>
+      <column name="CONTAINER" value="ContractType"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="2c440f87-292d-4ec3-8eb2-74821e251365"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="8dc775f2-05e1-47b5-b372-54c261f1f9d8"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="9c2a1b76-b9c4-486d-a1d2-d12970f20bd0"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..063cb0560dff632420b71725caa43d2fe8ec99bc
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ccc54161-e5b5-48ad-9577-d4314b4cc232"/>
+      <column name="KEYID" value="EUR"/>
+      <column name="TITLE" value="Euro"/>
+      <column name="CONTAINER" value="Currency"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="67d6c3b0-d04e-4133-8ffb-4cb462277245"/>
+      <column name="KEYID" value="USD"/>
+      <column name="TITLE" value="United States dollar"/>
+      <column name="CONTAINER" value="Currency"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="95e2032c-fa20-4a38-8b0e-6d86db1ba097"/>
+      <column name="KEYID" value="CAD"/>
+      <column name="TITLE" value="Canadian dollar"/>
+      <column name="CONTAINER" value="Currency"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="cc329284-adf4-45f8-8e6f-6f8609536ca0"/>
+      <column name="KEYID" value="CHF"/>
+      <column name="TITLE" value="Swiss franc"/>
+      <column name="CONTAINER" value="Currency"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ccc54161-e5b5-48ad-9577-d4314b4cc232"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="67d6c3b0-d04e-4133-8ffb-4cb462277245"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="95e2032c-fa20-4a38-8b0e-6d86db1ba097"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="cc329284-adf4-45f8-8e6f-6f8609536ca0"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5714d7f2722b9bcf4e3d69db73962ff271e0ff3d
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="87bd1a28-d364-47ee-9a01-33714f6998ba"/>
+      <column name="KEYID" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+      <column name="TITLE" value="Checked"/>
+      <column name="CONTAINER" value="OfferStatus"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="9912dcc6-edf1-4a68-b605-925a31b7f9a4"/>
+      <column name="KEYID" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+      <column name="TITLE" value="Sent"/>
+      <column name="CONTAINER" value="OfferStatus"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="d3bd6272-d1d9-4a5c-9f5c-772f0ee2551e"/>
+      <column name="KEYID" value="b3538091-4714-4ed3-93fe-19a0862dd7a3"/>
+      <column name="TITLE" value="Won"/>
+      <column name="CONTAINER" value="OfferStatus"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="0cba2fe7-97c3-4eb4-9999-1fc4e8e93a7a"/>
+      <column name="KEYID" value="a5682630-01ae-4769-8f03-47dc1db44da4"/>
+      <column name="TITLE" value="Lost"/>
+      <column name="CONTAINER" value="OfferStatus"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="87bd1a28-d364-47ee-9a01-33714f6998ba"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="9912dcc6-edf1-4a68-b605-925a31b7f9a4"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="d3bd6272-d1d9-4a5c-9f5c-772f0ee2551e"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="0cba2fe7-97c3-4eb4-9999-1fc4e8e93a7a"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferitemGroupcode.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferitemGroupcode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..248033e03be87d037bb83d4cab148bcce0f656b1
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferitemGroupcode.xml
@@ -0,0 +1,97 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b6079a56-594f-463d-8b85-67db622cf522"/>
+      <column name="KEYID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="TITLE" value="Commodity group 1"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7c666a94-ef9a-42e9-83c8-de3a97123bce"/>
+      <column name="KEYID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="TITLE" value="Commodity group 2"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="72ffaa0b-9982-4614-93be-31ae76f91d19"/>
+      <column name="KEYID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="TITLE" value="Commodity group 3"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="688b91d3-3c5b-4704-9220-e11b4532c05c"/>
+      <column name="KEYID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="TITLE" value="Discount"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="5f5a0927-5827-4948-bfe7-32e83d8cf3aa"/>
+      <column name="KEYID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="TITLE" value="Spare parts"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="611cd178-c0fc-4d2a-a9ba-af747d571755"/>
+      <column name="KEYID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="TITLE" value="Service"/>
+      <column name="CONTAINER" value="OfferitemGroupcode"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b6079a56-594f-463d-8b85-67db622cf522"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7c666a94-ef9a-42e9-83c8-de3a97123bce"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="72ffaa0b-9982-4614-93be-31ae76f91d19"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="688b91d3-3c5b-4704-9220-e11b4532c05c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="5f5a0927-5827-4948-bfe7-32e83d8cf3aa"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="611cd178-c0fc-4d2a-a9ba-af747d571755"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..57971e3f4877fcd8c95c6ab255ca546b0baf3b14
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b25309f8-d923-4b9e-9689-b14c3463c9e0"/>
+      <column name="KEYID" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TITLE" value="Customer"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="17ef91a4-5af5-4ae1-86cd-49568a88a2a2"/>
+      <column name="KEYID" value="6fccd085-1200-4d98-aacb-e5ea8c9dcb2b"/>
+      <column name="TITLE" value="Prospect"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="3ba58828-f27e-4342-b3e5-78d562756322"/>
+      <column name="KEYID" value="4dd007ac-d547-49db-b431-681f867f054e"/>
+      <column name="TITLE" value="Supplier"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="0e3b1e24-af88-4058-bd7c-23aba5d36e06"/>
+      <column name="KEYID" value="cf1d1fd8-4cee-481c-9da0-6d4e82826fe0"/>
+      <column name="TITLE" value="${ORGTYPE_OTHER}"/>
+      <column name="CONTAINER" value="OrganisationType"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b25309f8-d923-4b9e-9689-b14c3463c9e0"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="17ef91a4-5af5-4ae1-86cd-49568a88a2a2"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="3ba58828-f27e-4342-b3e5-78d562756322"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="0e3b1e24-af88-4058-bd7c-23aba5d36e06"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b42b3e2631a849fcdb285bd37ab28f4efa7a1ec4
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="a6b639c5-41f7-41fb-8856-059f5ea1a629"/>
+      <column name="KEYID" value="cb8cfc30-0826-4a7f-bd07-b981c70efe24"/>
+      <column name="TITLE" value="Female"/>
+      <column name="CONTAINER" value="PersonGender"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7177a6a6-6a71-43a5-a2ba-fe2f80054fef"/>
+      <column name="KEYID" value="e682b767-2549-4414-9470-8d05f59b492b"/>
+      <column name="TITLE" value="Male"/>
+      <column name="CONTAINER" value="PersonGender"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f5466bc3-77b8-45f4-817a-79b16946f680"/>
+      <column name="KEYID" value="1d48171d-d581-4491-becf-9293c953c174"/>
+      <column name="TITLE" value="${GENDER_OTHER}"/>
+      <column name="CONTAINER" value="PersonGender"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="a6b639c5-41f7-41fb-8856-059f5ea1a629"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7177a6a6-6a71-43a5-a2ba-fe2f80054fef"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f5466bc3-77b8-45f4-817a-79b16946f680"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
new file mode 100644
index 0000000000000000000000000000000000000000..df02982b63eca4bf9d53f84311a05df810f7fd65
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="d0f5c21d-14ff-414b-9d51-2a2c5f49b50d"/>
+      <column name="KEYID" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="TITLE" value="${PRICELIST_DEFAULT}"/>
+      <column name="CONTAINER" value="ProductPricelist"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="a581bf7c-1cb7-4821-96f5-6eed9a0de58c"/>
+      <column name="KEYID" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
+      <column name="TITLE" value="Key account"/>
+      <column name="CONTAINER" value="ProductPricelist"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b47478a1-1fac-4e74-921f-b47c146e034d"/>
+      <column name="KEYID" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+      <column name="TITLE" value="Special price list1"/>
+      <column name="CONTAINER" value="ProductPricelist"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="932057b5-a2e1-4f0b-83be-28692d9e9e44"/>
+      <column name="KEYID" value="8dc9e27e-4fc3-43e2-b5cb-3b553df64990"/>
+      <column name="TITLE" value="${PRICELIST_SERVICE}"/>
+      <column name="CONTAINER" value="ProductPricelist"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="d0f5c21d-14ff-414b-9d51-2a2c5f49b50d"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="a581bf7c-1cb7-4821-96f5-6eed9a0de58c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b47478a1-1fac-4e74-921f-b47c146e034d"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="932057b5-a2e1-4f0b-83be-28692d9e9e44"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95225d336c6991ca6ce9443c042d8bb862769f83
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="392ee66d-f777-43ab-b8d5-344fd75e5454"/>
+      <column name="KEYID" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="TITLE" value="Pieces"/>
+      <column name="CONTAINER" value="QuantityUnit"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="a58987b7-a5f9-4f4a-8c1f-2553ff7bad60"/>
+      <column name="KEYID" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+      <column name="TITLE" value="Kgs"/>
+      <column name="CONTAINER" value="QuantityUnit"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="74531aeb-7e01-4595-a5df-0ba3cad09071"/>
+      <column name="KEYID" value="f26f799d-9fcc-4b9e-a52f-78c1030bc9f1"/>
+      <column name="TITLE" value="Liter"/>
+      <column name="CONTAINER" value="QuantityUnit"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="a47f5661-6b71-43a5-a14f-42aff04fe8e4"/>
+      <column name="KEYID" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="TITLE" value="Hours"/>
+      <column name="CONTAINER" value="QuantityUnit"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="392ee66d-f777-43ab-b8d5-344fd75e5454"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="a58987b7-a5f9-4f4a-8c1f-2553ff7bad60"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="74531aeb-7e01-4595-a5df-0ba3cad09071"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="a47f5661-6b71-43a5-a14f-42aff04fe8e4"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_relationStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_relationStatus.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c30ffc5a4ef0533af0da8bb1571154bcebd4cc12
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml
@@ -0,0 +1,172 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="8a850f25-e307-4522-a914-b693e453871c"/>
+      <column name="KEYID" value="ee0451ac-ca9b-421f-aadc-23232d1477ff"/>
+      <column name="TITLE" value="Project_volume sufficient"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="e7dd35cc-f150-43ae-9b08-d055eff6bf11"/>
+      <column name="KEYID" value="145cb6f1-06c2-492b-8508-4cb4c3cb1ca6"/>
+      <column name="TITLE" value="Project_budget available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ed300490-73df-48a4-9e07-402982d5dadc"/>
+      <column name="KEYID" value="10991ded-f4bc-4d73-aee3-1c06c058d8fc"/>
+      <column name="TITLE" value="Project_specifications available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="e0118080-13f4-4ce6-bb23-44db2bb32976"/>
+      <column name="KEYID" value="7639b53d-e8f6-4188-aa69-d85ae672d55a"/>
+      <column name="TITLE" value="Project_timeframe critical"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="180addff-a67d-4a13-8b07-e18a51756282"/>
+      <column name="KEYID" value="be6e7c8f-8e9a-4de2-be13-f4cd015a77fa"/>
+      <column name="TITLE" value="Project_payment default/penalty critical"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="cd70d44d-4a70-4176-b62c-45caec4c1a76"/>
+      <column name="KEYID" value="b6555f52-2503-4f0b-896b-dd7263f66ac0"/>
+      <column name="TITLE" value="Project_references available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="1d2ebc23-5737-4794-830d-c0f1cf00c9ea"/>
+      <column name="KEYID" value="89f8be66-4219-4750-87ce-2a893e17159d"/>
+      <column name="TITLE" value="Product_requirements suitable"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="6"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="956eb587-0291-4eae-b091-2b20cc32feb2"/>
+      <column name="KEYID" value="36894c4c-72de-4c0b-b269-195f451dd3dc"/>
+      <column name="TITLE" value="Product_philosophy fitting"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="7"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="1c7658a7-9dc0-4c71-bfe1-8ab14020a51e"/>
+      <column name="KEYID" value="a607a17a-b0c8-4542-b60a-2f0e4c07bb21"/>
+      <column name="TITLE" value="Product_industry template available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="8"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f1c4a607-dec3-432f-bed6-624be294c025"/>
+      <column name="KEYID" value="c1fd6a58-50ec-4680-9446-5e5b7830d25e"/>
+      <column name="TITLE" value="Other_sympathy available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="9"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ff2e3e22-9104-4b76-bcc1-8db1bb1481ba"/>
+      <column name="KEYID" value="42034c24-1d27-4243-ab78-d993425633d5"/>
+      <column name="TITLE" value="Other_advocate available"/>
+      <column name="CONTAINER" value="SalesprojectEstimation"/>
+      <column name="SORTING" valueNumeric="10"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="8a850f25-e307-4522-a914-b693e453871c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="e7dd35cc-f150-43ae-9b08-d055eff6bf11"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ed300490-73df-48a4-9e07-402982d5dadc"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="e0118080-13f4-4ce6-bb23-44db2bb32976"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="180addff-a67d-4a13-8b07-e18a51756282"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="cd70d44d-4a70-4176-b62c-45caec4c1a76"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="1d2ebc23-5737-4794-830d-c0f1cf00c9ea"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="956eb587-0291-4eae-b091-2b20cc32feb2"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="1c7658a7-9dc0-4c71-bfe1-8ab14020a51e"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f1c4a607-dec3-432f-bed6-624be294c025"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ff2e3e22-9104-4b76-bcc1-8db1bb1481ba"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml
new file mode 100644
index 0000000000000000000000000000000000000000..19efe9bd26a42b3b96e3413d9bbe97cdfa5d9743
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml
@@ -0,0 +1,142 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ce8555bc-240a-43f6-a3f8-848a7eac39a3"/>
+      <column name="KEYID" value="a4dac73a-19f4-4e0b-9866-12e04d387160"/>
+      <column name="TITLE" value="Lead"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f8ad8ba2-0122-4d8a-a131-23041a56038a"/>
+      <column name="KEYID" value="c3208dab-5ae9-4c4f-8e79-6bad630b24fb"/>
+      <column name="TITLE" value="Waiting for requirements"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="e11e0484-6f9b-4e9a-ad2c-c852c7485e6e"/>
+      <column name="KEYID" value="c2d1e9b1-e2ac-49af-8e6a-ce1b4b6a2d50"/>
+      <column name="TITLE" value="Specifications in progress"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="abed0f11-2b8a-47bf-918c-b3eb77be513f"/>
+      <column name="KEYID" value="df4655a0-cc0e-49c2-b418-ec34baa24693"/>
+      <column name="TITLE" value="Deliver opinion"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="95ba863d-cf4c-429c-90e7-aa99457595d2"/>
+      <column name="KEYID" value="40cc9816-d4c8-4309-9b5c-01a96450c2fd"/>
+      <column name="TITLE" value="Presentation preparation"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="56a27bea-a283-459e-ab08-de28120287b3"/>
+      <column name="KEYID" value="2e2477a7-aa91-407e-9338-cfc6ab376543"/>
+      <column name="TITLE" value="Presentation follow-up"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="991a53e9-c740-4a9c-b522-921e564f31e2"/>
+      <column name="KEYID" value="39009ecf-0d3b-4f06-8927-37d7c6ef509d"/>
+      <column name="TITLE" value="Workshop"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="6"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ffdeb522-4fe1-48db-ae0e-a2317aa4a6f1"/>
+      <column name="KEYID" value="a7edc75b-83c3-40af-bd96-c74a085c6d29"/>
+      <column name="TITLE" value="Negotiation"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="7"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="66fd1f76-dbcc-413d-9391-96a0a61c3286"/>
+      <column name="KEYID" value="ff4d15bb-9dc3-4e90-b5b0-70c3e5b3cdff"/>
+      <column name="TITLE" value="Project decision"/>
+      <column name="CONTAINER" value="SalesprojectPhase"/>
+      <column name="SORTING" valueNumeric="8"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ce8555bc-240a-43f6-a3f8-848a7eac39a3"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f8ad8ba2-0122-4d8a-a131-23041a56038a"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="e11e0484-6f9b-4e9a-ad2c-c852c7485e6e"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="abed0f11-2b8a-47bf-918c-b3eb77be513f"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="95ba863d-cf4c-429c-90e7-aa99457595d2"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="56a27bea-a283-459e-ab08-de28120287b3"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="991a53e9-c740-4a9c-b522-921e564f31e2"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ffdeb522-4fe1-48db-ae0e-a2317aa4a6f1"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="66fd1f76-dbcc-413d-9391-96a0a61c3286"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d87bf321316e24712b24b2759910783b10b66796
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="c899faa1-6b89-4616-8640-cd2c8011d123"/>
+      <column name="KEYID" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+      <column name="TITLE" value="Abomodel"/>
+      <column name="CONTAINER" value="SalesprojectPricePolitics"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="4d97f540-79cc-41d7-8bf3-e45b3dfd3683"/>
+      <column name="KEYID" value="85cf976b-7356-4513-b7fe-a009e629248c"/>
+      <column name="TITLE" value="High price strategy"/>
+      <column name="CONTAINER" value="SalesprojectPricePolitics"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="cbaeb1dc-493c-4811-b8bc-6654559c3ca6"/>
+      <column name="KEYID" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="TITLE" value="Low price strategy"/>
+      <column name="CONTAINER" value="SalesprojectPricePolitics"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="c899faa1-6b89-4616-8640-cd2c8011d123"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="4d97f540-79cc-41d7-8bf3-e45b3dfd3683"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="cbaeb1dc-493c-4811-b8bc-6654559c3ca6"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0a6f75a04d88823ec6fdce54af1378b7ccbbbdea
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml
@@ -0,0 +1,97 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
+      <column name="KEYID" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+      <column name="TITLE" value="Project manager"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
+      <column name="KEYID" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
+      <column name="TITLE" value="Project assistant"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
+      <column name="KEYID" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+      <column name="TITLE" value="Adviser"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
+      <column name="KEYID" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
+      <column name="TITLE" value="Decision maker"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
+      <column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
+      <column name="TITLE" value="External sales manager"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
+      <column name="KEYID" value="67baabb5-abd0-43bd-aea1-cf7e606814a6"/>
+      <column name="TITLE" value="Internal sales manager"/>
+      <column name="CONTAINER" value="SalesprojectRole"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f6b027ab266e2d838215a95688b6e38e74c15e1
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
+      <column name="KEYID" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+      <column name="TITLE" value="Own website"/>
+      <column name="CONTAINER" value="SalesprojectSource"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="1a197ade-0c61-4643-8287-159719d519b4"/>
+      <column name="KEYID" value="70f8bfe6-3b0c-4ac9-96ed-dd20684f391d"/>
+      <column name="TITLE" value="Customer recommendation"/>
+      <column name="CONTAINER" value="SalesprojectSource"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
+      <column name="KEYID" value="fb73eece-bde3-4817-9c9c-bca6a398586a"/>
+      <column name="TITLE" value="Address purchase"/>
+      <column name="CONTAINER" value="SalesprojectSource"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
+      <column name="KEYID" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+      <column name="TITLE" value="Fair"/>
+      <column name="CONTAINER" value="SalesprojectSource"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="1a197ade-0c61-4643-8287-159719d519b4"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8139008635a4d8ecf56196e48a1651772b05d598
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="8d9b0416-fee2-44d0-9334-1864ff78a824"/>
+      <column name="KEYID" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="TITLE" value="Checked"/>
+      <column name="CONTAINER" value="SalesprojectState"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6f5c01ad-f9d9-43b9-834b-139974a75115"/>
+      <column name="KEYID" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="TITLE" value="Sent"/>
+      <column name="CONTAINER" value="SalesprojectState"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="8bac5a6d-7810-469b-8fdb-0d3a0bf8e122"/>
+      <column name="KEYID" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="TITLE" value="Won"/>
+      <column name="CONTAINER" value="SalesprojectState"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="f54b3c0b-bd80-4bc5-8a5c-55be2fd57017"/>
+      <column name="KEYID" value="5527bf9b-2cf8-49ea-bd1e-91a36f4f78e1"/>
+      <column name="TITLE" value="Lost"/>
+      <column name="CONTAINER" value="SalesprojectState"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="8d9b0416-fee2-44d0-9334-1864ff78a824"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6f5c01ad-f9d9-43b9-834b-139974a75115"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="8bac5a6d-7810-469b-8fdb-0d3a0bf8e122"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="f54b3c0b-bd80-4bc5-8a5c-55be2fd57017"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2affd4fe66bcabc30dd28a204f0f175331887b1c
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7963d4ed-f7a7-4a9f-aa86-fea42167145f"/>
+      <column name="KEYID" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+      <column name="TITLE" value="Strength 1"/>
+      <column name="CONTAINER" value="SalesprojectStrength"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="2cacfe09-7dcd-454a-b263-46aee796bc21"/>
+      <column name="KEYID" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+      <column name="TITLE" value="Strength 2"/>
+      <column name="CONTAINER" value="SalesprojectStrength"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="919cffee-5943-4105-a5bc-a14bd33b9f67"/>
+      <column name="KEYID" value="2eda4875-53e6-4359-b367-464d006cf9b3"/>
+      <column name="TITLE" value="Strength 3"/>
+      <column name="CONTAINER" value="SalesprojectStrength"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7963d4ed-f7a7-4a9f-aa86-fea42167145f"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="2cacfe09-7dcd-454a-b263-46aee796bc21"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="919cffee-5943-4105-a5bc-a14bd33b9f67"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ff5daf237f602b4bf8ec03c453eb304766850ce
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="fd012937-8fe7-418e-8e55-80b3b5db331c"/>
+      <column name="KEYID" value="c85b5e9a-d27f-4ef4-b13c-3ab0a1fcc5dd"/>
+      <column name="TITLE" value="Weakness 1"/>
+      <column name="CONTAINER" value="SalesprojectWeakness"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b62e1a05-af41-4d2d-978c-6c2950b202d8"/>
+      <column name="KEYID" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="TITLE" value="Weakness 2"/>
+      <column name="CONTAINER" value="SalesprojectWeakness"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="294db00d-6237-4db8-b7b6-41c5dc79a1e4"/>
+      <column name="KEYID" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+      <column name="TITLE" value="Weakness 3"/>
+      <column name="CONTAINER" value="SalesprojectWeakness"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="fd012937-8fe7-418e-8e55-80b3b5db331c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b62e1a05-af41-4d2d-978c-6c2950b202d8"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="294db00d-6237-4db8-b7b6-41c5dc79a1e4"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fbfd60a74586914e3497d2959cb79b10b1224aa7
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
@@ -0,0 +1,217 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="84574d45-8227-42dd-aea0-de2203517a2c"/>
+      <column name="KEYID" value="a9d71e3f-284a-4240-8cb4-77451105025a"/>
+      <column name="TITLE" value="Project_volume"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="018a3bb8-5536-461f-8400-25e91550e51f"/>
+      <column name="KEYID" value="437ff0eb-4472-44e1-b019-e50404c4a253"/>
+      <column name="TITLE" value="Project_duration"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b4562d6b-9ff1-4884-8694-3339e760ddf1"/>
+      <column name="KEYID" value="8955b130-63a3-43da-a34b-4a97e205434a"/>
+      <column name="TITLE" value="Project_reference"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="cda9c073-25e4-4a90-b5b7-fe6514355d31"/>
+      <column name="KEYID" value="5fee1f8b-19ee-4bbd-845f-da1b9504cdf2"/>
+      <column name="TITLE" value="Product_technic"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="e84b0059-2140-4911-bb3c-73e6f3875022"/>
+      <column name="KEYID" value="874a18d8-5f06-4d07-aa8c-7c250f5df0b8"/>
+      <column name="TITLE" value="Product_flexibility"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="b9216c02-7abd-43aa-a02e-89fa7d428e0c"/>
+      <column name="KEYID" value="b45bd85c-b945-4740-9971-934edb1ebd26"/>
+      <column name="TITLE" value="Product_GUI"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6efbc578-4b80-463f-9c4f-16db99a8a9d6"/>
+      <column name="KEYID" value="bf5bc111-f2eb-4daa-945d-028cc39aa0b3"/>
+      <column name="TITLE" value="Product_functionality"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="6"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ad252ede-1e46-46ad-8ce1-6788b9103c92"/>
+      <column name="KEYID" value="c0455c55-ab02-4c54-8f02-73a2604d25f4"/>
+      <column name="TITLE" value="Product_industry knowhow"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="7"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="9fe99387-ea27-4f13-923c-f631486f7bcb"/>
+      <column name="KEYID" value="e7683eaa-befb-44be-9fb9-8b16b805a061"/>
+      <column name="TITLE" value="Product_mobile use"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="8"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="d1987d3a-fc7f-4882-8292-36e9699f6368"/>
+      <column name="KEYID" value="2a7f092a-94c9-46ff-8818-b2835c3ff5a1"/>
+      <column name="TITLE" value="Company_size"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="9"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="d62db634-94ca-49e5-970a-67696d013ed6"/>
+      <column name="KEYID" value="d49e1af6-b7c0-49c1-b2cc-5d4842122c10"/>
+      <column name="TITLE" value="Company_internationality"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="10"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="148176ea-14ed-4a74-8290-e5dffcd71eaa"/>
+      <column name="KEYID" value="2effb3eb-715e-4aea-9f22-1c93c89d785c"/>
+      <column name="TITLE" value="Company_industry knowhow"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="11"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="d5827700-2ef1-43a1-a7f1-46a4de1ec6ec"/>
+      <column name="KEYID" value="ffe690be-b345-4f25-b513-398b555600ba"/>
+      <column name="TITLE" value="Other_existing Customer"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="12"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="1a0ae403-90c0-424c-a13a-8b1c4cfd314d"/>
+      <column name="KEYID" value="562669db-cfb8-4e02-b69b-9fa64ab4b8f5"/>
+      <column name="TITLE" value="Other_unknown"/>
+      <column name="CONTAINER" value="SalesprojectWonLost"/>
+      <column name="SORTING" valueNumeric="13"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="84574d45-8227-42dd-aea0-de2203517a2c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="018a3bb8-5536-461f-8400-25e91550e51f"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b4562d6b-9ff1-4884-8694-3339e760ddf1"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="cda9c073-25e4-4a90-b5b7-fe6514355d31"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="e84b0059-2140-4911-bb3c-73e6f3875022"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="b9216c02-7abd-43aa-a02e-89fa7d428e0c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6efbc578-4b80-463f-9c4f-16db99a8a9d6"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ad252ede-1e46-46ad-8ce1-6788b9103c92"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="9fe99387-ea27-4f13-923c-f631486f7bcb"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="d1987d3a-fc7f-4882-8292-36e9699f6368"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="d62db634-94ca-49e5-970a-67696d013ed6"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="148176ea-14ed-4a74-8290-e5dffcd71eaa"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="d5827700-2ef1-43a1-a7f1-46a4de1ec6ec"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="1a0ae403-90c0-424c-a13a-8b1c4cfd314d"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d66784db8352e5c9fb2ab02cffea0a698619de48
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
@@ -0,0 +1,52 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="2613a00e-7c2d-4513-bb37-c375e3e26959"/>
+      <column name="KEYID" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
+      <column name="TITLE" value="Warehouse 1"/>
+      <column name="CONTAINER" value="StockWarehouse"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="9f20dcb7-6068-43d5-8aac-a29dcbba8fb2"/>
+      <column name="KEYID" value="6a2443cb-2d5c-42db-862c-a4e1a0bbdd72"/>
+      <column name="TITLE" value="Warehouse 2"/>
+      <column name="CONTAINER" value="StockWarehouse"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="4224ea44-ab84-4215-a1c3-6750ab07af03"/>
+      <column name="KEYID" value="dd3d51bb-ef7c-49e4-b2d4-b58151b38a83"/>
+      <column name="TITLE" value="Warehouse 3"/>
+      <column name="CONTAINER" value="StockWarehouse"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="2613a00e-7c2d-4513-bb37-c375e3e26959"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="9f20dcb7-6068-43d5-8aac-a29dcbba8fb2"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="4224ea44-ab84-4215-a1c3-6750ab07af03"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1dfeec8913fa1e9d97b5e8a91c544a703da33752
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
+      <column name="KEYID" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="TITLE" value="new"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
+      <column name="KEYID" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="TITLE" value="in process"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
+      <column name="KEYID" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
+      <column name="TITLE" value="waiting"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
+      <column name="KEYID" value="7c9d6681-6cf5-4395-b276-3941b6fd0d57"/>
+      <column name="TITLE" value="ended"/>
+      <column name="CONTAINER" value="TaskStatus"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef615b0b6c5dcbd6c33130fc6f389dfd0874e819
--- /dev/null
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
+      <column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
+      <column name="TITLE" value="Visit"/>
+      <column name="CONTAINER" value="TaskType"/>
+      <column name="SORTING" valueNumeric="0"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
+      <column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
+      <column name="TITLE" value="E-Mail"/>
+      <column name="CONTAINER" value="TaskType"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
+      <column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
+      <column name="TITLE" value="Phone"/>
+      <column name="CONTAINER" value="TaskType"/>
+      <column name="SORTING" valueNumeric="2"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+      <column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
+      <column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
+      <column name="TITLE" value="Online-Meeting"/>
+      <column name="CONTAINER" value="TaskType"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="ISACTIVE" valueNumeric="1"/>
+      <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <rollback>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="54231fc1-050e-4f00-91e1-4968387a6370"/>
+        </whereParams>
+      </delete>
+      <delete tableName="AB_KEYWORD_ENTRY">
+        <where>AB_KEYWORD_ENTRYID = ?</where>
+        <whereParams>
+          <param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
+        </whereParams>
+      </delete>
+    </rollback>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
index 721d3a82f3ca2ee98fcdc52649d30cf5e4a0ff71..93d3ffebda9f28338ed51e694c26d70ee4138238 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154311.xml
@@ -5,9 +5,9 @@
             <column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
             <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
             <column name="CONTRACTCODE" value="42154311"/>
-            <column name="PAYMENT" valueNumeric="2"/>
-            <column name="CONTRACTTYPE" valueNumeric="0"/>
-            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+            <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+            <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
             <column name="CONTRACTEND" valueDate="2019-09-30T00:00:00"/>
             <column name="CONTRACTSTART" valueDate="2018-10-01T00:00:00"/>
             <column name="CONTRACTDUE" valueDate="2019-01-01T00:00:00"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
index 48cfbfed05a0904eae31c4dea4c9352ba85bb923..4f12cf293647a1f2e84b62f12606f767a5652436 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154312.xml
@@ -5,9 +5,9 @@
             <column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
             <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
             <column name="CONTRACTCODE" value="42154312"/>
-            <column name="PAYMENT" valueNumeric="2"/>
-            <column name="CONTRACTTYPE" valueNumeric="0"/>
-            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+            <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+            <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
             <column name="CONTRACTEND" valueDate="2018-09-15T00:00:00"/>
             <column name="CONTRACTSTART" valueDate="2017-05-01T00:00:00"/>
             <column name="CONTRACTDUE" valueDate="2018-01-01T00:00:00"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
index 361fcffb9e5872e3638df720b51060215b7001f3..56baa8ffd1e02ada612cc4e969f68eddead56471 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154313.xml
@@ -5,9 +5,9 @@
             <column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
             <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
             <column name="CONTRACTCODE" value="42154313"/>
-            <column name="PAYMENT" valueNumeric="2"/>
-            <column name="CONTRACTTYPE" valueNumeric="0"/>
-            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+            <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+            <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
             <column name="CONTRACTEND" valueDate="2020-09-15T00:00:00"/>
             <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
             <column name="CONTRACTDUE" valueDate="2020-01-01T00:00:00"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
index 72521d0d1104ea03bbf2439f973427943b97bd8c..34767f8fb5bc530b10e328946b1fe3cad4144c3a 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154314.xml
@@ -5,9 +5,9 @@
             <column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
             <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
             <column name="CONTRACTCODE" value="42154314"/>
-            <column name="PAYMENT" valueNumeric="2"/>
-            <column name="CONTRACTTYPE" valueNumeric="0"/>
-            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+            <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+            <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
             <column name="CONTRACTEND" valueDate="2021-09-15T00:00:00"/>
             <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
             <column name="CONTRACTDUE" valueDate="2021-01-01T00:00:00"/>
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
index 1ed6dd6e2ccf95b81ea521aeaf6fb21f0b9210fe..45579902d5b8fd099b7bcac9b3bac0da504c2fa5 100644
--- a/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
+++ b/others/db_changes/data_alias/data/example_contract/CONTRACT_42154315.xml
@@ -5,9 +5,9 @@
             <column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
             <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
             <column name="CONTRACTCODE" value="42154315"/>
-            <column name="PAYMENT" valueNumeric="2"/>
-            <column name="CONTRACTTYPE" valueNumeric="0"/>
-            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+            <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+            <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
             <column name="CONTRACTEND" valueDate="2022-09-15T00:00:00"/>
             <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
             <column name="CONTRACTDUE" valueDate="2022-01-01T00:00:00"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
index 516d5f1e718ea0e0fdd0fc552f1bf3e024eedc72..b9dd17e3148b73c37479ddf3aaf659016d0c62cf 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
@@ -12,7 +12,7 @@
             <column name="PROBABILITY" valueNumeric="5"/>
             <column name="NET" valueNumeric="210.00"/>
             <column name="VAT" valueNumeric="39.90"/>
-            <column name="CURRENCY" valueNumeric="0"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
index d9233b85c040c7cefd9d6c3e830f75e3636e8357..b630a245d32abc8151b6a6c04c510f997a0add5f 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
@@ -12,7 +12,7 @@
             <column name="PROBABILITY" valueNumeric="3"/>
             <column name="NET" valueNumeric="420.00"/>
             <column name="VAT" valueNumeric="79.80"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
index ff80e4c6d56ed900bef03f07a69b15f3dbdae099..a393f41c3fc90db71106f3ece1ae85ee15aee2c0 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
@@ -12,7 +12,7 @@
             <column name="PROBABILITY" valueNumeric="4"/>
             <column name="NET" valueNumeric="630.00"/>
             <column name="VAT" valueNumeric="119.70"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
index 8168bff1a510a044da0d96510d38c2e8fb9752ab..a426f2e88bd139c5bf87f89d66f50959b2a7f025 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
@@ -12,7 +12,7 @@
             <column name="PROBABILITY" valueNumeric="1"/>
             <column name="NET" valueNumeric="420.00"/>
             <column name="VAT" valueNumeric="79.80"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
index 2647115b915c9c45be6c5ec311fb7ee546ff5053..fa800dad48614f488b8a8df11f0cfc0404d9bf21 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
@@ -12,7 +12,7 @@
             <column name="PROBABILITY" valueNumeric="3"/>
             <column name="NET" valueNumeric="840.00"/>
             <column name="VAT" valueNumeric="159.60"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml b/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
index 87692aa1c7f276713456b08ce5fcf49a4634eb26..61c0eb8736c9410c23e6a9bc6cd828a726a1cf4e 100644
--- a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
+++ b/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
@@ -137,7 +137,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="1.00"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="PRICELIST" valueNumeric="1"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
@@ -149,7 +149,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="50.00"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="PRICELIST" valueNumeric="1"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
@@ -161,7 +161,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="1.00"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="PRICELIST" valueNumeric="1"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
@@ -173,7 +173,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="1.00"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="PRICELIST" valueNumeric="2"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
@@ -185,7 +185,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="50.00"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="PRICELIST" valueNumeric="2"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
@@ -197,7 +197,7 @@
             <column name="VAT" valueNumeric="19.00"/>
             <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
             <column name="FROMQUANTITY" valueNumeric="50.00"/>
-            <column name="CURRENCY" valueNumeric="2"/>
+            <column name="CURRENCY" value="USD"/>
             <column name="PRICELIST" valueNumeric="1"/>
             <column name="BUYSELL" value="SP"/>
         </insert>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
index ca6d3c7444bc869b6cbcc1efbd04ebd2dd7e0ed0..941ce71fca3fd7849e0aecc90ebfd28f2b2c1b41 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
@@ -11,7 +11,7 @@
             <column name="STATUS" valueNumeric="2"/>
             <column name="NET" valueNumeric="210.00"/>
             <column name="VAT" valueNumeric="39.90"/>
-            <column name="CURRENCY" valueNumeric="0"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
index e797ac4e439741a6ea8e11830166f8a5fb329673..a11562d308f57ecdafa9a0127d6412dbbb6a7237 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
@@ -11,7 +11,7 @@
             <column name="STATUS" valueNumeric="2"/>
             <column name="NET" valueNumeric="420.00"/>
             <column name="VAT" valueNumeric="79.80"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
index 7bce1688a19a73f0f7147e0e912c38e14e7415ea..c15939abb4f50b6675ac4514591e4b85502dcc0c 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
@@ -11,7 +11,7 @@
             <column name="STATUS" valueNumeric="2"/>
             <column name="NET" valueNumeric="630.00"/>
             <column name="VAT" valueNumeric="119.70"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
index c5be540c5d820ad318839f646d1c02e6bb2a9940..5a127bc9bf7abdb8240538dcc9b8b3cdc22519b3 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
@@ -11,7 +11,7 @@
             <column name="STATUS" valueNumeric="1"/>
             <column name="NET" valueNumeric="420.00"/>
             <column name="VAT" valueNumeric="79.80"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
index 6c23b5706db4d29ec46a036d3d1668c9138a19e0..6611d451b80916e15f9622945451c517af0e037b 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
@@ -11,7 +11,7 @@
             <column name="STATUS" valueNumeric="1"/>
             <column name="NET" valueNumeric="840.00"/>
             <column name="VAT" valueNumeric="159.60"/>
-            <column name="CURRENCY" valueNumeric="1"/>
+            <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="de-DE"/>
         </insert>
         
diff --git a/others/db_changes/data_alias/struct/create_contract.xml b/others/db_changes/data_alias/struct/create_contract.xml
index 0a4bc1919caef2d8ed458b45467344cb996f7ee5..8eb051c57289053731196cefa39ef093fe045bc5 100644
--- a/others/db_changes/data_alias/struct/create_contract.xml
+++ b/others/db_changes/data_alias/struct/create_contract.xml
@@ -11,11 +11,11 @@
             <column name="CONTRACTID" type="CHAR(36)">
                 <constraints primaryKey="true" primaryKeyName="PK_CONTRACT_CONTRACTID"/>
             </column>
-            <column name="CONTRACTSTATUS" type="INTEGER"/>
-            <column name="CONTRACTTYPE" type="INTEGER"/>
-            <column name="PAYMENT" type="INTEGER"/>
+            <column name="CONTRACTSTATUS" type="CHAR(36)"/>
+            <column name="CONTRACTTYPE" type="CHAR(36)"/>
+            <column name="PAYMENT" type="CHAR(36)"/>
             <column name="REMARK" type="NCLOB"/>
             <column name="RELATION_ID" type="CHAR(36)"/>
         </createTable>
     </changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/struct/create_offer.xml b/others/db_changes/data_alias/struct/create_offer.xml
index 1fd46c9217c084c6e7ca399b6b117b1cdb7fb83c..3159a27e76d1cb1107cc2c76b9b8f8b333529862 100644
--- a/others/db_changes/data_alias/struct/create_offer.xml
+++ b/others/db_changes/data_alias/struct/create_offer.xml
@@ -20,7 +20,7 @@
                 <column name="PROBABILITY" type="INTEGER"/>
                 <column name="NET" type="NUMERIC(14,2)"/>
                 <column name="VAT" type="NUMERIC(14,2)"/>
-                <column name="CURRENCY" type="INTEGER"/>
+                <column name="CURRENCY" type="CHAR(36)"/>
                 <column name="ADDRESS" type="NCLOB"/>
 	</createTable>      
 </changeSet>
diff --git a/others/db_changes/data_alias/struct/create_productprice.xml b/others/db_changes/data_alias/struct/create_productprice.xml
index 2c1983bc11852a791f546394dabecb0f9cbb20c6..a0aa03824b2b9910be731b9637c50ca02f04744e 100644
--- a/others/db_changes/data_alias/struct/create_productprice.xml
+++ b/others/db_changes/data_alias/struct/create_productprice.xml
@@ -15,7 +15,7 @@
                     <constraints nullable="false" foreignKeyName="FK_PRODUCTPRICE_PRODUCT_ID" references="PRODUCT(PRODUCTID)"/>
                 </column>
                 <column name="FROMQUANTITY" type="NUMERIC(14,2)"/>
-                <column name="CURRENCY" type="INTEGER">
+                <column name="CURRENCY" type="CHAR(36)">
                     <constraints nullable="false"/>
                 </column>
                 <column name="PRICELIST" type="INTEGER"/>
diff --git a/others/db_changes/data_alias/struct/create_salesorder.xml b/others/db_changes/data_alias/struct/create_salesorder.xml
index 1da224f42a444d272c6bdaab02bebef46df56839..8e02e12b7236d3c426337a5e533fa9631729a437 100644
--- a/others/db_changes/data_alias/struct/create_salesorder.xml
+++ b/others/db_changes/data_alias/struct/create_salesorder.xml
@@ -19,7 +19,7 @@
                 <column name="STATUS" type="INTEGER"/>
                 <column name="NET" type="NUMERIC(14,2)"/>
                 <column name="VAT" type="NUMERIC(14,2)"/>
-                <column name="CURRENCY" type="INTEGER"/>
+                <column name="CURRENCY" type="CHAR(36)"/>
                 <column name="ADDRESS" type="NCLOB"/>
 	</createTable>      
 </changeSet>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 849ffb60d7a0ce072111e75be21d856c8e5e48f1..0ecd409a5e232302f5d940c27b9631f963d5547b 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -1,3 +1,4 @@
+import("system.vars");
 import("system.SQLTYPES");
 import("system.db");
 import("system.translate");
@@ -10,8 +11,16 @@ import("Sql_lib");
  */
 function KeywordUtils(){}
 
-//TODO: add comment
-KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pLanguage)
+/**
+* resolves KEYIDs of a keywordentry into the specific title
+* 
+* @param {String} pContainerName name of the keyword container that shall be resolved
+* @param {String} pDbFieldName name fo the database field where the KEYID-value is stored
+* @param {String} [pLocale=current client language] specifies the locale for translating the title
+* 
+* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title
+*/
+KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pLocale)
 {
     var cond = SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName);
     var keyData = db.table(cond.buildSql(("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY")));
@@ -22,7 +31,7 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
     var colTypeTitle = SQLTYPES.NVARCHAR;
     for (var i = 0, l = keyData.length; i < l; i++) 
     {
-        var translatedTitle = (pLanguage == undefined) ? translate.text(keyData[i][1]) : translate.text(keyData[i][1], pLanguage);
+        var translatedTitle = (pLocale == undefined) ? translate.text(keyData[i][1]) : translate.text(keyData[i][1], pLocale);
         resSql += " when " + pDbFieldName + " = ? then ? "
         preparedValues.push([keyData[i][0], colTypeKeyId]);
         preparedValues.push([translatedTitle, colTypeTitle]);
@@ -97,6 +106,7 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
     /**
      * creates an object with methods for interacting with an specific keyword
      * @param {String} keywordType specifies the type of the keyword and therefore the list elements; e.g. "COUNTRY"
+     * @param {String} translationLocale locale (like e.g. "de_DE") for translation of the keywordtitle
      * @return {Object} object with the following methods:
      * <br/>- toArray
      * <br/>- get
@@ -104,339 +114,349 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
      * <br/>- getPropsForKey
      * <br/>- filter
      */
-    KeywordUtils.createKeyword = function(keywordType){//TODO: rename ot createKeywordObj?
+    KeywordUtils.createKeyword = function(keywordType, translationLocale){
         var valueContainer, _toArrayFn, _getPropForKeyFn, _getPropsForKeyFn;
+        
+        var locale;
+        if (translationLocale)
+            locale = translationLocale;
+        else
+        {
+            var lang = vars.get("$sys.clientlanguage");//e.g. "de"
+            var country = vars.get("$sys.clientcountry");//e.g. "DE"
+            locale =  country ? lang + "_" + country : lang;
+        }
 
         switch (keywordType){
-//            case "RELATION.STATUS":
-//                valueContainer = _createKeywordEntriesContainer([
-//                     _createKeywordEntry("0", translate.text("Inactive"))
-//                    ,_createKeywordEntry("1", translate.text("Active"))
-//                    ,_createKeywordEntry("2", translate.text("In review"))
-//                ]);
-//                break;
+            case "RELATION.STATUS":
+                valueContainer = _createKeywordEntriesContainer([
+                     _createKeywordEntry("0", translate.text("Inactive", locale))
+                    ,_createKeywordEntry("1", translate.text("Active", locale))
+                    ,_createKeywordEntry("2", translate.text("In review", locale))
+                ]);
+                break;
             case "COUNTRY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("DE", translate.text("Germany"))
-                    ,_createKeywordEntry("AT", translate.text("Austria"))
-                    ,_createKeywordEntry("CH", translate.text("Switzerland"))
-                    ,_createKeywordEntry("GB", translate.text("United Kingdom"))
-                    ,_createKeywordEntry("NO", translate.text("Norway"))
+                     _createKeywordEntry("DE", translate.text("Germany", locale))
+                    ,_createKeywordEntry("AT", translate.text("Austria", locale))
+                    ,_createKeywordEntry("CH", translate.text("Switzerland", locale))
+                    ,_createKeywordEntry("GB", translate.text("United Kingdom", locale))
+                    ,_createKeywordEntry("NO", translate.text("Norway", locale))
                 ]);
                 break;
             case "LANGUAGE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("de", translate.text("German"))
-                    ,_createKeywordEntry("de-DE", translate.text("German (Germany)"))
-                    ,_createKeywordEntry("de-AT", translate.text("German (Austria)"))
-                    ,_createKeywordEntry("en", translate.text("English"))
-                    ,_createKeywordEntry("en-GB", translate.text("English (United Kingdom)"))
-                    ,_createKeywordEntry("no-NO", translate.text("Norwegian"))
+                     _createKeywordEntry("de", translate.text("German", locale))
+                    ,_createKeywordEntry("de-DE", translate.text("German (Germany)", locale))
+                    ,_createKeywordEntry("de-AT", translate.text("German (Austria)", locale))
+                    ,_createKeywordEntry("en", translate.text("English", locale))
+                    ,_createKeywordEntry("en-GB", translate.text("English (United Kingdom)", locale))
+                    ,_createKeywordEntry("no-NO", translate.text("Norwegian", locale))
                 ]);
                 break;
             case "ACTIVITY.DIRECTION":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("i", translate.text("Incoming"))
-                    ,_createKeywordEntry("o", translate.text("Outgoing"))
-                    ,_createKeywordEntry("p", translate.text("Internal"))
+                     _createKeywordEntry("i", translate.text("Incoming", locale))
+                    ,_createKeywordEntry("o", translate.text("Outgoing", locale))
+                    ,_createKeywordEntry("p", translate.text("Internal", locale))
                 ]);
                 break;
             case "ACTIVITY.CATEGORY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Visit"), null, {defaultAvatarRepresentation: "VAADIN:TRAIN"})
-                    ,_createKeywordEntry("1", translate.text("E-Mail"), null, {defaultAvatarRepresentation: "VAADIN:AT"})
-                    ,_createKeywordEntry("2", translate.text("Phone"), null, {defaultAvatarRepresentation: "VAADIN:PHONE"})
-                    ,_createKeywordEntry("3", translate.text("Online-Meeting"), null, {defaultAvatarRepresentation: "VAADIN:GLOBE_WIRE"})
+                     _createKeywordEntry("0", translate.text("Visit", locale), null, {defaultAvatarRepresentation: "VAADIN:TRAIN"})
+                    ,_createKeywordEntry("1", translate.text("E-Mail", locale), null, {defaultAvatarRepresentation: "VAADIN:AT"})
+                    ,_createKeywordEntry("2", translate.text("Phone", locale), null, {defaultAvatarRepresentation: "VAADIN:PHONE"})
+                    ,_createKeywordEntry("3", translate.text("Online-Meeting", locale), null, {defaultAvatarRepresentation: "VAADIN:GLOBE_WIRE"})
                 ]);
                 break;
             case "COMM.MEDIUM":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Mobile"), null, {category: "PHONE", contentType: "TELEPHONE"})
-                    ,_createKeywordEntry("1", translate.text("E-Mail"), null, {category: "EMAIL", contentType: "EMAIL"})
-                    ,_createKeywordEntry("2", translate.text("Phone"), null, {category: "PHONE", contentType: "TELEPHONE"})
-                    ,_createKeywordEntry("3", translate.text("Internet"), null, {category: "OTHER", contentType: "LINK"})
+                     _createKeywordEntry("0", translate.text("Mobile", locale), null, {category: "PHONE", contentType: "TELEPHONE"})
+                    ,_createKeywordEntry("1", translate.text("E-Mail", locale), null, {category: "EMAIL", contentType: "EMAIL"})
+                    ,_createKeywordEntry("2", translate.text("Phone", locale), null, {category: "PHONE", contentType: "TELEPHONE"})
+                    ,_createKeywordEntry("3", translate.text("Internet", locale), null, {category: "OTHER", contentType: "LINK"})
                 ]);
                 break;
             case "ADDRESS.TYPE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Office address"), null, {org: true, pers: false})
-                    ,_createKeywordEntry("2", translate.text("Home address"), null, {org: false, pers: true})
-                    ,_createKeywordEntry("3", translate.text("Delivery address"), null, {org: true, pers: true})
-                    ,_createKeywordEntry("4", translate.text("Post office box"), null, {org: true, pers: true})
+                     _createKeywordEntry("1", translate.text("Office address", locale), null, {org: true, pers: false})
+                    ,_createKeywordEntry("2", translate.text("Home address", locale), null, {org: false, pers: true})
+                    ,_createKeywordEntry("3", translate.text("Delivery address", locale), null, {org: true, pers: true})
+                    ,_createKeywordEntry("4", translate.text("Post office box", locale), null, {org: true, pers: true})
                 ]);
                 break;
             case "ORG.TYPE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Customer"))
-                    ,_createKeywordEntry("1", translate.text("Prospect"))
-                    ,_createKeywordEntry("2", translate.text("Supplier"))
-                    ,_createKeywordEntry("3", translate.text("${ORGTYPE_OTHER}"))
+                     _createKeywordEntry("0", translate.text("Customer", locale))
+                    ,_createKeywordEntry("1", translate.text("Prospect", locale))
+                    ,_createKeywordEntry("2", translate.text("Supplier", locale))
+                    ,_createKeywordEntry("3", translate.text("${ORGTYPE_OTHER}", locale))
                 ]);
                 break;
             case "PERS.GENDER":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("f", translate.text("Female"))
-                    ,_createKeywordEntry("m", translate.text("Male"))
-                    ,_createKeywordEntry("o", translate.text("${GENDER_OTHER}"))
+                     _createKeywordEntry("f", translate.text("Female", locale))
+                    ,_createKeywordEntry("m", translate.text("Male", locale))
+                    ,_createKeywordEntry("o", translate.text("${GENDER_OTHER}", locale))
                 ]);
                 break;
             case "CONTRACT.CONTRACTTYPE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Framework contract"))
-                    ,_createKeywordEntry("1", translate.text("Service contract"))
-                    ,_createKeywordEntry("2", translate.text("Maintenance contract"))
+                     _createKeywordEntry("0", translate.text("Framework contract", locale))
+                    ,_createKeywordEntry("1", translate.text("Service contract", locale))
+                    ,_createKeywordEntry("2", translate.text("Maintenance contract", locale))
                 ]);
                 break;
             case "CONTRACT.CONTRACTSTATUS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Valid, unlimited"))
-                    ,_createKeywordEntry("1", translate.text("Valid, limited"))
-                    ,_createKeywordEntry("2", translate.text("Not signed yet"))
-                    ,_createKeywordEntry("3", translate.text("None, individual count"))
-                    ,_createKeywordEntry("4", translate.text("Resigned"))
+                     _createKeywordEntry("0", translate.text("Valid, unlimited", locale))
+                    ,_createKeywordEntry("1", translate.text("Valid, limited", locale))
+                    ,_createKeywordEntry("2", translate.text("Not signed yet", locale))
+                    ,_createKeywordEntry("3", translate.text("None, individual count", locale))
+                    ,_createKeywordEntry("4", translate.text("Resigned", locale))
                 ]);
                 break;
             case "CONTRACT.PAYMENT":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Annually"))
-                    ,_createKeywordEntry("1", translate.text("Semiannually"))
-                    ,_createKeywordEntry("2", translate.text("Quarterly"))
+                     _createKeywordEntry("0", translate.text("Annually", locale))
+                    ,_createKeywordEntry("1", translate.text("Semiannually", locale))
+                    ,_createKeywordEntry("2", translate.text("Quarterly", locale))
                 ]);
                 break;
             case "GROUPCODE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Commodity group 1"))
-                    ,_createKeywordEntry("2", translate.text("Commodity group 2"))
-                    ,_createKeywordEntry("3", translate.text("Commodity group 3"))
-                    ,_createKeywordEntry("4", translate.text("Discount"))
-                    ,_createKeywordEntry("5", translate.text("Spare parts"))
-                    ,_createKeywordEntry("6", translate.text("Service"))
+                     _createKeywordEntry("1", translate.text("Commodity group 1", locale))
+                    ,_createKeywordEntry("2", translate.text("Commodity group 2", locale))
+                    ,_createKeywordEntry("3", translate.text("Commodity group 3", locale))
+                    ,_createKeywordEntry("4", translate.text("Discount", locale))
+                    ,_createKeywordEntry("5", translate.text("Spare parts", locale))
+                    ,_createKeywordEntry("6", translate.text("Service", locale))
                 ]);
                 break;
             case "UNIT":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Pieces"))
-                    ,_createKeywordEntry("2", translate.text("Kgs"))
-                    ,_createKeywordEntry("3", translate.text("Liter"))
-                    ,_createKeywordEntry("4", translate.text("Hours"))
+                     _createKeywordEntry("1", translate.text("Pieces", locale))
+                    ,_createKeywordEntry("2", translate.text("Kgs", locale))
+                    ,_createKeywordEntry("3", translate.text("Liter", locale))
+                    ,_createKeywordEntry("4", translate.text("Hours", locale))
                 ]);
                 break;
             case "PRICELIST":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("${PRICELIST_DEFAULT}"))
-                    ,_createKeywordEntry("2", translate.text("Key account"))
-                    ,_createKeywordEntry("3", translate.text("Special price list1"))
-                    ,_createKeywordEntry("4", translate.text("${PRICELIST_SERVICE}"))
+                     _createKeywordEntry("1", translate.text("${PRICELIST_DEFAULT}", locale))
+                    ,_createKeywordEntry("2", translate.text("Key account", locale))
+                    ,_createKeywordEntry("3", translate.text("Special price list1", locale))
+                    ,_createKeywordEntry("4", translate.text("${PRICELIST_SERVICE}", locale))
                 ]);
                 break;
             case "CURRENCY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("EUR"))
-                    ,_createKeywordEntry("2", translate.text("USD"))
-                    ,_createKeywordEntry("3", translate.text("CND"))
-                    ,_createKeywordEntry("4", translate.text("CHF"))
+                     _createKeywordEntry("1", translate.text("EUR", locale))
+                    ,_createKeywordEntry("2", translate.text("USD", locale))
+                    ,_createKeywordEntry("3", translate.text("CND", locale))
+                    ,_createKeywordEntry("4", translate.text("CHF", locale))
                 ]);
                 break;
             case "STOCK.WAREHOUSE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Warehouse 1"))
-                    ,_createKeywordEntry("2", translate.text("Warehouse 2"))
-                    ,_createKeywordEntry("3", translate.text("Warehouse 3"))
+                     _createKeywordEntry("1", translate.text("Warehouse 1", locale))
+                    ,_createKeywordEntry("2", translate.text("Warehouse 2", locale))
+                    ,_createKeywordEntry("3", translate.text("Warehouse 3", locale))
                 ]);
                 break;
             case "SALESPROJECT.PRICE_POLITICS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Abomodel"))
-                    ,_createKeywordEntry("2", translate.text("High price strategy"))
-                    ,_createKeywordEntry("3", translate.text("Low price strategy"))
+                     _createKeywordEntry("1", translate.text("Abomodel", locale))
+                    ,_createKeywordEntry("2", translate.text("High price strategy", locale))
+                    ,_createKeywordEntry("3", translate.text("Low price strategy", locale))
                 ]);                
                 break;
             case "SALESPROJECT.STRENGTH":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Strength 1"))
-                    ,_createKeywordEntry("2", translate.text("Strength 2"))
-                    ,_createKeywordEntry("3", translate.text("Strength 3"))
+                     _createKeywordEntry("1", translate.text("Strength 1", locale))
+                    ,_createKeywordEntry("2", translate.text("Strength 2", locale))
+                    ,_createKeywordEntry("3", translate.text("Strength 3", locale))
                 ]);                
                 break;
             case "SALESPROJECT.WEAKNESS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Weakness 1"))
-                    ,_createKeywordEntry("2", translate.text("Weakness 2"))
-                    ,_createKeywordEntry("3", translate.text("Weakness 3"))
+                     _createKeywordEntry("1", translate.text("Weakness 1", locale))
+                    ,_createKeywordEntry("2", translate.text("Weakness 2", locale))
+                    ,_createKeywordEntry("3", translate.text("Weakness 3", locale))
                 ]);                
                 break;
             case "SALESPROJECT.ESTIMATION":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Project_volume sufficient"))
-                    ,_createKeywordEntry("2", translate.text("Project_budget available"))
-                    ,_createKeywordEntry("3", translate.text("Project_specifications available"))
-                    ,_createKeywordEntry("4", translate.text("Project_timeframe critical"))
-                    ,_createKeywordEntry("5", translate.text("Project_payment default/penalty critical"))
-                    ,_createKeywordEntry("6", translate.text("Project_references available"))
-                    ,_createKeywordEntry("7", translate.text("Product_requirements suitable"))
-                    ,_createKeywordEntry("8", translate.text("Product_philosophy fitting"))
-                    ,_createKeywordEntry("9", translate.text("Product_industry template available"))
-                    ,_createKeywordEntry("10", translate.text("Other_sympathy available"))
-                    ,_createKeywordEntry("11", translate.text("Other_advocate available"))
+                     _createKeywordEntry("1", translate.text("Project_volume sufficient", locale))
+                    ,_createKeywordEntry("2", translate.text("Project_budget available", locale))
+                    ,_createKeywordEntry("3", translate.text("Project_specifications available", locale))
+                    ,_createKeywordEntry("4", translate.text("Project_timeframe critical", locale))
+                    ,_createKeywordEntry("5", translate.text("Project_payment default/penalty critical", locale))
+                    ,_createKeywordEntry("6", translate.text("Project_references available", locale))
+                    ,_createKeywordEntry("7", translate.text("Product_requirements suitable", locale))
+                    ,_createKeywordEntry("8", translate.text("Product_philosophy fitting", locale))
+                    ,_createKeywordEntry("9", translate.text("Product_industry template available", locale))
+                    ,_createKeywordEntry("10", translate.text("Other_sympathy available", locale))
+                    ,_createKeywordEntry("11", translate.text("Other_advocate available", locale))
                 ]);                
                 break;
             case "SALESPROJECT.SOURCE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Own website"))
-                    ,_createKeywordEntry("2", translate.text("Customer recommendation"))
-                    ,_createKeywordEntry("3", translate.text("Address purchase"))
-                    ,_createKeywordEntry("4", translate.text("Fair"))
+                     _createKeywordEntry("1", translate.text("Own website", locale))
+                    ,_createKeywordEntry("2", translate.text("Customer recommendation", locale))
+                    ,_createKeywordEntry("3", translate.text("Address purchase", locale))
+                    ,_createKeywordEntry("4", translate.text("Fair", locale))
                 ]);                
                 break;
             case "SALESPROJECT.STATE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Open"))
-                    ,_createKeywordEntry("2", translate.text("Postponed"))
-                    ,_createKeywordEntry("3", translate.text("Aborted"))
-                    ,_createKeywordEntry("4", translate.text("Partial order"))
-                    ,_createKeywordEntry("5", translate.text("Order"))
-                    ,_createKeywordEntry("6", translate.text("Lost"))
+                     _createKeywordEntry("1", translate.text("Open", locale))
+                    ,_createKeywordEntry("2", translate.text("Postponed", locale))
+                    ,_createKeywordEntry("3", translate.text("Aborted", locale))
+                    ,_createKeywordEntry("4", translate.text("Partial order", locale))
+                    ,_createKeywordEntry("5", translate.text("Order", locale))
+                    ,_createKeywordEntry("6", translate.text("Lost", locale))
                 ]);                
                 break;
             case "SALESPROJECT.PHASE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("9", translate.text("Project decision"))
-                    ,_createKeywordEntry("8", translate.text("Negotiation"))
-                    ,_createKeywordEntry("7", translate.text("Workshop"))
-                    ,_createKeywordEntry("6", translate.text("Presentation follow-up"))
-                    ,_createKeywordEntry("5", translate.text("Presentation preparation"))
-                    ,_createKeywordEntry("4", translate.text("Deliver opinion"))
-                    ,_createKeywordEntry("3", translate.text("Specifications in progress"))
-                    ,_createKeywordEntry("2", translate.text("Waiting for requirements"))
-                    ,_createKeywordEntry("1", translate.text("Lead"))
+                     _createKeywordEntry("9", translate.text("Project decision", locale))
+                    ,_createKeywordEntry("8", translate.text("Negotiation", locale))
+                    ,_createKeywordEntry("7", translate.text("Workshop", locale))
+                    ,_createKeywordEntry("6", translate.text("Presentation follow-up", locale))
+                    ,_createKeywordEntry("5", translate.text("Presentation preparation", locale))
+                    ,_createKeywordEntry("4", translate.text("Deliver opinion", locale))
+                    ,_createKeywordEntry("3", translate.text("Specifications in progress", locale))
+                    ,_createKeywordEntry("2", translate.text("Waiting for requirements", locale))
+                    ,_createKeywordEntry("1", translate.text("Lead", locale))
                 ]);
                 break;
             case "SALESPROJECT.WONLOST":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Project_volume"))
-                    ,_createKeywordEntry("2", translate.text("Project_duration"))
-                    ,_createKeywordEntry("3", translate.text("Project_reference"))
-                    ,_createKeywordEntry("4", translate.text("Product_technic"))
-                    ,_createKeywordEntry("5", translate.text("Product_flexibility"))
-                    ,_createKeywordEntry("6", translate.text("Product_GUI"))
-                    ,_createKeywordEntry("7", translate.text("Product_functionality"))
-                    ,_createKeywordEntry("8", translate.text("Product_industry knowhow"))
-                    ,_createKeywordEntry("9", translate.text("Product_mobile use"))
-                    ,_createKeywordEntry("10", translate.text("Company_size"))
-                    ,_createKeywordEntry("11", translate.text("Company_internationality"))
-                    ,_createKeywordEntry("12", translate.text("Company_industry knowhow"))
-                    ,_createKeywordEntry("13", translate.text("Other_existing Customer"))
-                    ,_createKeywordEntry("14", translate.text("Other_unknown"))
+                     _createKeywordEntry("1", translate.text("Project_volume", locale))
+                    ,_createKeywordEntry("2", translate.text("Project_duration", locale))
+                    ,_createKeywordEntry("3", translate.text("Project_reference", locale))
+                    ,_createKeywordEntry("4", translate.text("Product_technic", locale))
+                    ,_createKeywordEntry("5", translate.text("Product_flexibility", locale))
+                    ,_createKeywordEntry("6", translate.text("Product_GUI", locale))
+                    ,_createKeywordEntry("7", translate.text("Product_functionality", locale))
+                    ,_createKeywordEntry("8", translate.text("Product_industry knowhow", locale))
+                    ,_createKeywordEntry("9", translate.text("Product_mobile use", locale))
+                    ,_createKeywordEntry("10", translate.text("Company_size", locale))
+                    ,_createKeywordEntry("11", translate.text("Company_internationality", locale))
+                    ,_createKeywordEntry("12", translate.text("Company_industry knowhow", locale))
+                    ,_createKeywordEntry("13", translate.text("Other_existing Customer", locale))
+                    ,_createKeywordEntry("14", translate.text("Other_unknown", locale))
                 ]);
                 break;
             case "SALESPROJECT.ROLE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Project manager"))
-                    ,_createKeywordEntry("2", translate.text("Project assistant"))
-                    ,_createKeywordEntry("3", translate.text("Adviser"))
-                    ,_createKeywordEntry("4", translate.text("Decision maker"))
-                    ,_createKeywordEntry("5", translate.text("External sales manager"))
-                    ,_createKeywordEntry("6", translate.text("Internal sales manager"))
+                     _createKeywordEntry("1", translate.text("Project manager", locale))
+                    ,_createKeywordEntry("2", translate.text("Project assistant", locale))
+                    ,_createKeywordEntry("3", translate.text("Adviser", locale))
+                    ,_createKeywordEntry("4", translate.text("Decision maker", locale))
+                    ,_createKeywordEntry("5", translate.text("External sales manager", locale))
+                    ,_createKeywordEntry("6", translate.text("Internal sales manager", locale))
                 ]);
                 break;
             case "SALESPROJECT.CYCLE.TYPE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Phase"), null, {keyword: "SALESPROJECT.PHASE"})
-                    ,_createKeywordEntry("2", translate.text("State"), null, {keyword: "SALESPROJECT.STATE"})
+                     _createKeywordEntry("1", translate.text("Phase", locale), null, {keyword: "SALESPROJECT.PHASE"})
+                    ,_createKeywordEntry("2", translate.text("State", locale), null, {keyword: "SALESPROJECT.STATE"})
                 ]);
                 break;
             case "SALESPROJECT.CLASS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Class A"), null, {
+                     _createKeywordEntry("1", translate.text("Class A", locale), null, {
                          keywords: 
-                            [["CLASS.BRANCHE", translate.text("Industry")],
-                             ["CLASS.BASED", translate.text("Base")]]
+                            [["CLASS.BRANCHE", translate.text("Industry", locale)],
+                             ["CLASS.BASED", translate.text("Base", locale)]]
                     })
-                    ,_createKeywordEntry("2", translate.text("Class B"), null, {
+                    ,_createKeywordEntry("2", translate.text("Class B", locale), null, {
                          keywords: 
-                            [["CLASS.BUDGET", translate.text("Budget (Project)")],
-                             ["CLASS.STANDARD", translate.text("Standard / Individual")]]
+                            [["CLASS.BUDGET", translate.text("Budget (Project)", locale)],
+                             ["CLASS.STANDARD", translate.text("Standard / Individual", locale)]]
                      })
-                    ,_createKeywordEntry("3", translate.text("Class C"), null, {
+                    ,_createKeywordEntry("3", translate.text("Class C", locale), null, {
                          keywords: 
-                            [["CLASS.PROJSTART", translate.text("Projectstart")]]
+                            [["CLASS.PROJSTART", translate.text("Projectstart", locale)]]
                      })
                 ]);
                 break;
             case "SALESPROJECT.PROBABILITY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("0 %"), null, {percentValue: 0})
-                    ,_createKeywordEntry("2", translate.text("25 %"), null, {percentValue: 25})
-                    ,_createKeywordEntry("3", translate.text("50 %"), null, {percentValue: 50})
-                    ,_createKeywordEntry("4", translate.text("75 %"), null, {percentValue: 75})
-                    ,_createKeywordEntry("5", translate.text("100 %"), null, {percentValue: 100})
+                     _createKeywordEntry("1", translate.text("0 %", locale), null, {percentValue: 0})
+                    ,_createKeywordEntry("2", translate.text("25 %", locale), null, {percentValue: 25})
+                    ,_createKeywordEntry("3", translate.text("50 %", locale), null, {percentValue: 50})
+                    ,_createKeywordEntry("4", translate.text("75 %", locale), null, {percentValue: 75})
+                    ,_createKeywordEntry("5", translate.text("100 %", locale), null, {percentValue: 100})
                 ]);
                 break;
             case "CLASS.BRANCHE":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Industry 1"), null, {points: 50})
-                    ,_createKeywordEntry("2", translate.text("Industry 2"), null, {points: 16.6})
-                    ,_createKeywordEntry("3", translate.text("Industry 3"), null, {points: 50})
+                     _createKeywordEntry("1", translate.text("Industry 1", locale), null, {points: 50})
+                    ,_createKeywordEntry("2", translate.text("Industry 2", locale), null, {points: 16.6})
+                    ,_createKeywordEntry("3", translate.text("Industry 3", locale), null, {points: 50})
                 ]);
                 break;
             case "CLASS.BASED":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Germany"), null, {points: 20})
-                    ,_createKeywordEntry("2", translate.text("Austria"), null, {points: 7.5})
-                    ,_createKeywordEntry("3", translate.text("Other"), null, {points: 0})
+                     _createKeywordEntry("1", translate.text("Germany", locale), null, {points: 20})
+                    ,_createKeywordEntry("2", translate.text("Austria", locale), null, {points: 7.5})
+                    ,_createKeywordEntry("3", translate.text("Other", locale), null, {points: 0})
                 ]);
                 break;
             case "CLASS.BUDGET":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("From") + "350T\u20ac", null, {points: 50})
-                    ,_createKeywordEntry("2", "200" + translate.text("to") + "349T\u20ac", null, {points: 30})
-                    ,_createKeywordEntry("3", "0" + translate.text("to") + "3199T\u20ac", null, {points: 0})
+                     _createKeywordEntry("1", translate.text("From", locale) + "350T\u20ac", null, {points: 50})
+                    ,_createKeywordEntry("2", "200" + translate.text("to", locale) + "349T\u20ac", null, {points: 30})
+                    ,_createKeywordEntry("3", "0" + translate.text("to", locale) + "3199T\u20ac", null, {points: 0})
                 ]);
                 break;
             case "CLASS.STANDARD":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Individual"), null, {points: 25})
-                    ,_createKeywordEntry("2", translate.text("Standard"), null, {points: 12.5})
+                     _createKeywordEntry("1", translate.text("Individual", locale), null, {points: 25})
+                    ,_createKeywordEntry("2", translate.text("Standard", locale), null, {points: 12.5})
                 ]);
                 break;
             case "CLASS.PROJSTART":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("in 6 Months"), null, {points: 30})
-                    ,_createKeywordEntry("2", translate.text("in 12 Months"), null, {points: 20})
-                    ,_createKeywordEntry("3", translate.text("no Project planned"), null, {points: 0})
+                     _createKeywordEntry("1", translate.text("in 6 Months", locale), null, {points: 30})
+                    ,_createKeywordEntry("2", translate.text("in 12 Months", locale), null, {points: 20})
+                    ,_createKeywordEntry("3", translate.text("no Project planned", locale), null, {points: 0})
                 ]);
                 break;
             case "OFFER.PROBABILITY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("0 %"), null, {percentValue: 0})
-                    ,_createKeywordEntry("2", translate.text("25 %"), null, {percentValue: 25})
-                    ,_createKeywordEntry("3", translate.text("50 %"), null, {percentValue: 50})
-                    ,_createKeywordEntry("4", translate.text("75 %"), null, {percentValue: 75})
-                    ,_createKeywordEntry("5", translate.text("100 %"), null, {percentValue: 100})
+                     _createKeywordEntry("1", translate.text("0 %", locale), null, {percentValue: 0})
+                    ,_createKeywordEntry("2", translate.text("25 %", locale), null, {percentValue: 25})
+                    ,_createKeywordEntry("3", translate.text("50 %", locale), null, {percentValue: 50})
+                    ,_createKeywordEntry("4", translate.text("75 %", locale), null, {percentValue: 75})
+                    ,_createKeywordEntry("5", translate.text("100 %", locale), null, {percentValue: 100})
                 ]);
                 break;
             case "OFFER.STATUS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Checked"))
-                    ,_createKeywordEntry("2", translate.text("Sent"))
-                    ,_createKeywordEntry("3", translate.text("Won"))
-                    ,_createKeywordEntry("4", translate.text("Lost"))
+                     _createKeywordEntry("1", translate.text("Checked", locale))
+                    ,_createKeywordEntry("2", translate.text("Sent", locale))
+                    ,_createKeywordEntry("3", translate.text("Won", locale))
+                    ,_createKeywordEntry("4", translate.text("Lost", locale))
                 ]);
                 break;
             case "SALESORDER.STATUS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Checked"))
-                    ,_createKeywordEntry("2", translate.text("Sent"))
-                    ,_createKeywordEntry("3", translate.text("Won"))
-                    ,_createKeywordEntry("4", translate.text("Lost"))
+                     _createKeywordEntry("1", translate.text("Checked", locale))
+                    ,_createKeywordEntry("2", translate.text("Sent", locale))
+                    ,_createKeywordEntry("3", translate.text("Won", locale))
+                    ,_createKeywordEntry("4", translate.text("Lost", locale))
                 ]);
                 break;
             case "TASK.PRIORITY":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("{$TASK_PRIORITY_NONE}"), null, {defaultAvatarRepresentation: null})
-                    ,_createKeywordEntry("1", translate.text("{$TASK_PRIORITY_LOW}"), null, {defaultAvatarRepresentation: "VAADIN:ARROW_DOWN"})
-                    ,_createKeywordEntry("2", translate.text("{$TASK_PRIORITY_NORMAL}"), null, {defaultAvatarRepresentation: null})
-                    ,_createKeywordEntry("3", translate.text("{$TASK_PRIORITY_HIGH}"), null, {defaultAvatarRepresentation: "VAADIN:EXCLAMATION"})
+                     _createKeywordEntry("0", translate.text("{$TASK_PRIORITY_NONE}", locale), null, {defaultAvatarRepresentation: null})
+                    ,_createKeywordEntry("1", translate.text("{$TASK_PRIORITY_LOW}", locale), null, {defaultAvatarRepresentation: "VAADIN:ARROW_DOWN"})
+                    ,_createKeywordEntry("2", translate.text("{$TASK_PRIORITY_NORMAL}", locale), null, {defaultAvatarRepresentation: null})
+                    ,_createKeywordEntry("3", translate.text("{$TASK_PRIORITY_HIGH}", locale), null, {defaultAvatarRepresentation: "VAADIN:EXCLAMATION"})
                     ]);
                 break;
             case "TASK.TYPE":
@@ -444,18 +464,18 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
                 //these are *not* categories since task-categories are reservated for future implementation
                 //the TASK.TYPE is more like an type of source for example
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("Visit"))
-                    ,_createKeywordEntry("1", translate.text("E-Mail"))
-                    ,_createKeywordEntry("2", translate.text("Phone"))
-                    ,_createKeywordEntry("3", translate.text("Online-Meeting"))
+                     _createKeywordEntry("0", translate.text("Visit", locale))
+                    ,_createKeywordEntry("1", translate.text("E-Mail", locale))
+                    ,_createKeywordEntry("2", translate.text("Phone", locale))
+                    ,_createKeywordEntry("3", translate.text("Online-Meeting", locale))
                 ]);
                 break;
             case "TASK.STATUS":
                 valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("0", translate.text("new"))
-                    ,_createKeywordEntry("1", translate.text("in process"))
-                    ,_createKeywordEntry("2", translate.text("waiting"))
-                    ,_createKeywordEntry("3", translate.text("ended"))
+                     _createKeywordEntry("0", translate.text("new", locale))
+                    ,_createKeywordEntry("1", translate.text("in process", locale))
+                    ,_createKeywordEntry("2", translate.text("waiting", locale))
+                    ,_createKeywordEntry("3", translate.text("ended", locale))
                     ]);
                 break;
             default: 
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 787e301de578910b6aded79ae24c6ce331a261e3..8553f17c2b3334fe7427222777aedec9cb55435e 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -332,17 +332,9 @@ SqlCondition.prototype._prepare = function(field, value, cond, fieldType) {
     
     var type;
     
-    // only if fieldType is undefined, cache the column-Type for next use on same Column
-    if (fieldType == undefined) {
-        if (this._cachedTypes[field] != undefined) {
-            fieldType = this._cachedTypes[field];
-        } else {
-            fieldType = SqlUtils.getSingleColumnType(field, undefined, this.alias);
-            this._cachedTypes[field] = type;
-        }
-    }
-    
-    
+    if (fieldType == undefined)
+        fieldType = SqlUtils.getSingleColumnType(field, undefined, this.alias);
+
     //this function looks more complex (and slower) than it actually is
     /* the following regex looks like this after javascript-escaping of the backslash: (?<!\\)((?:\\\\)*)#
     the regexp searches for the unescaped character and these characters are replaced by the field name