diff --git a/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
index 688c012bbbd10b0e6fe739ad65b5155090ba4381..fb3d1cdf65752ee6fc02bb022c88ffee5b0ce4a0 100644
--- a/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
+++ b/entity/DocumentTemplateTicketCategory_entity/DocumentTemplateTicketCategory_entity.aod
@@ -44,7 +44,7 @@
     </entityConsumer>
     <entityProvider>
       <name>DocumentTemplateClasificationsProv</name>
-      <titlePlural>Serviceticket categories</titlePlural>
+      <titlePlural>Service ticket categories</titlePlural>
       <children>
         <entityParameter>
           <name>DocumentTemplateId_param</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index c18b97ff7403516591010d350e34850adc1d0a77..a7ce89a91dadd56e099566259581ca387063690f 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -327,7 +327,7 @@
     </entityConsumer>
     <entityField>
       <name>ALL_TICKET_CATEGORIES</name>
-      <title>Use all serviceticket categories</title>
+      <title>Use all service ticket categories</title>
       <contentType>BOOLEAN</contentType>
       <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/all_ticket_categories/stateProcess.js</stateProcess>
diff --git a/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js b/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
index 29d30e242c27ba5f0c73e988eb1e365e3e130b67..9255375feb264b5f30e7204dfe6ec43778729c59 100644
--- a/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
+++ b/entity/KnowledgeManagement_entity/recordcontainers/indexsearchknowledgebase/query.js
@@ -24,7 +24,7 @@ var sql = newSelect([
     ]).from("KNOWLEDGEMANAGEMENT", "km1")
     .leftJoin("KNOWLEDGETAGLINK", "KNOWLEDGEMANAGEMENTID = KNOWLEDGEMANAGEMENT_ID")
     .leftJoin("KNOWLEDGETAG", "KNOWLEDGETAGID = KNOWLEDGETAG_ID")
-    .orderBy("KNOWLEDGEMANAGEMENTID");
+    .orderBy("km1.KNOWLEDGEMANAGEMENTID");
 
 if (vars.exists("$local.idvalue"))
     querySelect.whereIfSet("KNOWLEDGEMANAGEMENT.KNOWLEDGEMANAGEMENTID", "$local.idvalue");
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 06cc973024a6288f02e099bde31e52e26bafe02c..cf13144de752cad5c4d70f16bc8f572cea63f830 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1184,7 +1184,7 @@
     </entityActionField>
     <entityActionField>
       <name>newSupportTicket</name>
-      <title>New support ticket</title>
+      <title>New service ticket</title>
       <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:TICKET</iconId>
     </entityActionField>
diff --git a/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
index 264784ddfb5c7463654d880f0963e5e7478852c8..c71f9573320c4f7756490333abc814ac875f4970 100644
--- a/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("Ticket_lib");
 
-TicketUtils.openNewSupportticket( vars.get( "$field.OFFERID"), null, vars.get( "$field.CONTACT_ID"));
\ No newline at end of file
+TicketUtils.openNewSupportticket( vars.get( "$field.OFFERID"), null, null);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 54877615643425e6c73f3cb12e87d10e65e19b8c..598cfd20b5fc2c8e206a0937610707498a4473a4 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11111,6 +11111,30 @@
     <entry>
       <key>Mailing to customer</key>
     </entry>
+    <entry>
+      <key>Create only person</key>
+    </entry>
+    <entry>
+      <key>Slave administration '%0' is '%1'</key>
+    </entry>
+    <entry>
+      <key>The file did not contain any data</key>
+    </entry>
+    <entry>
+      <key>Slave administration</key>
+    </entry>
+    <entry>
+      <key>Service ticket category</key>
+    </entry>
+    <entry>
+      <key>Use all service ticket categories</key>
+    </entry>
+    <entry>
+      <key>Contact &amp; Service ticket</key>
+    </entry>
+    <entry>
+      <key>Service ticket categories</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 517a6ab607868f82b5596c0a004aabd5fd386357..07ddc7bfcd9f80331edef6b76410f8de202aa00b 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -115,7 +115,7 @@
     </entry>
     <entry>
       <key>Service ticket template</key>
-      <value>Serviceticket-Vorlagen</value>
+      <value>Serviceticket-Vorlage</value>
     </entry>
     <entry>
       <key>Service ticket</key>
@@ -129,7 +129,7 @@
       <key>Template</key>
     </entry>
     <entry>
-      <key>Use all serviceticket categories</key>
+      <key>Use all service ticket categories</key>
       <value>Alle Serviceticket Kategorien verwenden</value>
     </entry>
     <entry>
@@ -361,7 +361,7 @@
       <value>Keine Werbung</value>
     </entry>
     <entry>
-      <key>Contact &amp; Serviceticket</key>
+      <key>Contact &amp; Service ticket</key>
       <value>Kontakt &amp; Serviceticket</value>
     </entry>
     <entry>
@@ -6525,7 +6525,7 @@
       <value>E-Mail Vorlage</value>
     </entry>
     <entry>
-      <key>New Service ticket</key>
+      <key>New service ticket</key>
       <value>Neues Serviceticket</value>
     </entry>
     <entry>
@@ -13811,10 +13811,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Task maturity date</key>
       <value>Prüfdatum</value>
     </entry>
-    <entry>
-      <key>New service ticket</key>
-      <value>Neues Serviceticket</value>
-    </entry>
     <entry>
       <key>Support tickets</key>
       <value>Supporttickets</value>
@@ -14169,12 +14165,12 @@ Bitte Datumseingabe prüfen</value>
       <key>2</key>
     </entry>
     <entry>
-      <key>Serviceticket category</key>
+      <key>Service ticket category</key>
       <value>Serviceticket Kategorie</value>
     </entry>
     <entry>
-      <key>Serviceticket categories</key>
-      <value></value>
+      <key>Service ticket categories</key>
+      <value>Serviceticket Kategorien</value>
     </entry>
     <entry>
       <key>Service tickets</key>
@@ -14182,6 +14178,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Service ticket templates</key>
+      <value>Serviceticket-Vorlagen</value>
     </entry>
     <entry>
       <key>Status (Mailbridge)</key>
@@ -14525,10 +14522,16 @@ Bitte Datumseingabe prüfen</value>
       <key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
     </entry>
     <entry>
-      <key>Open new mosaico template</key>
+      <key>New Service ticket</key>
     </entry>
     <entry>
-      <key>Do you really want to resynchronize the user completely?\nThe data in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
+      <key>Serviceticket category</key>
+    </entry>
+    <entry>
+      <key>Serviceticket categories</key>
+    </entry>
+    <entry>
+      <key>Contact &amp; Serviceticket</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2eb9fd685016cd5925b317493490a583120812f9..3dd33ba156acb9bec9781d2c324a4f835b8a95df 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11207,6 +11207,30 @@
     <entry>
       <key>Mailing to customer</key>
     </entry>
+    <entry>
+      <key>Create only person</key>
+    </entry>
+    <entry>
+      <key>Slave administration '%0' is '%1'</key>
+    </entry>
+    <entry>
+      <key>The file did not contain any data</key>
+    </entry>
+    <entry>
+      <key>Slave administration</key>
+    </entry>
+    <entry>
+      <key>Service ticket category</key>
+    </entry>
+    <entry>
+      <key>Use all service ticket categories</key>
+    </entry>
+    <entry>
+      <key>Contact &amp; Service ticket</key>
+    </entry>
+    <entry>
+      <key>Service ticket categories</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
index e998fb5435005c5d3b1d4f6942d1e5f5fa9a9512..2ca9bab7e654d906cf798b7b63f9e484285fc989 100644
--- a/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
+++ b/neonContext/DocumentTemplateTicketCategory/DocumentTemplateTicketCategory.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
   <name>DocumentTemplateTicketCategory</name>
-  <title>Serviceticket category</title>
+  <title>Service ticket category</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>DocumentTemplateTicketCategory_entity</entity>
   <references>