diff --git a/.liquibase/Data_alias/basic/2021.2.2/Ticket/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Ticket/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3cd3ad43ede2182d756ce162411f75abe4f766a2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Ticket/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="update_ticketCategory.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Ticket/update_ticketCategory.xml b/.liquibase/Data_alias/basic/2021.2.2/Ticket/update_ticketCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0e00eec109c0b7de9a02e729b27c87cfdd88d2e0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Ticket/update_ticketCategory.xml
@@ -0,0 +1,77 @@
+<?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="c.groeger" id="26f21263-8d06-46cf-90ec-9ecb98a6d322">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="general"/>
+ <column name="KEYID" value="GENERAL"/>
+ <where> AB_KEYWORD_ENTRYID = "68739ac0-3bf7-49ac-a349-0f645bf49cd2"</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Undefined"/>
+ <where> AB_KEYWORD_ENTRYID = "68739ac0-3bf4-4efa-8ed9-d380f98d8282"</where>
+ </update>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="86303e64-3853-49d5-bbd0-94053a511700"/>
+ <column name="KEYID" value="COMPLAINT"/>
+ <column name="TITLE" value="Complaint"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="5e534fbc-f342-4c27-98d8-839c60b3bb45"/>
+ <column name="KEYID" value="RECLAMATION"/>
+ <column name="TITLE" value="Reclamation"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="923fc28f-9d7b-4c14-b127-ce9ba892c1b5"/>
+ <column name="KEYID" value="RETOUR"/>
+ <column name="TITLE" value="Retour"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3b585d95-8030-41e7-af82-07ea86b44224"/>
+ <column name="KEYID" value="HANDBOOK"/>
+ <column name="TITLE" value="Handbook"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="7430dd30-793c-42ad-af1a-034a34f3a5ad"/>
+ <column name="KEYID" value="SUPPORT"/>
+ <column name="TITLE" value="Support"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="8"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="8a43fc58-d33a-408a-af79-05784a300fc8"/>
+ <column name="KEYID" value="FEEDBACK"/>
+ <column name="TITLE" value="Feedback"/>
+ <column name="CONTAINER" value="TicketCategory"/>
+ <column name="SORTING" valueNumeric="9"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="11af1945-8649-44c8-a6c0-3100f8673c78"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7b9f3b8182485244a24bc715e57e59820edaf728
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 457bbdae09412b9dee35f2fbf947edf32b364c54..016d430cf95592e23f9d9fb70a64d13fa2a8304a 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -29,6 +29,7 @@
<include relativeToChangelogFile="true" file="basic/2021.1.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.1/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="basic/2021.2.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 77e3209cd808d47a9856ae30c84b72b1470774e0..66eebc75bd7fe5e22c3c62f350d8975cffde2864 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -587,8 +587,8 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <title></title>
+ <name>WhitelistIds_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/whitelistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/whitelistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a80763080a7d66cab356368f2bb2c84618726e8e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordticketmedium/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string (JSON.stringify([$KeywordRegistry.activityCategory$contactFormular(),
+$KeywordRegistry.activityCategory$letter(),
+$KeywordRegistry.activityCategory$mail(),
+$KeywordRegistry.activityCategory$mstMessage(),
+$KeywordRegistry.activityCategory$visit()]))
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ec41e0f6f84b3666f1aba611dde4f8e7b8f968dc..5ef51dfa5569bb635aad1acd5694ff8f8cd976d9 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11153,6 +11153,15 @@
<entry>
<key>Service ticket categories</key>
</entry>
+ <entry>
+ <key>Handbook</key>
+ </entry>
+ <entry>
+ <key>Reclamation</key>
+ </entry>
+ <entry>
+ <key>Undefined</key>
+ </entry>
<entry>
<key>Mosaico template</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e41b0cde25ef0a6f36529e102421c059b7fca053..5851130b525a216600ace1f36260b505c31f02a9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1652,6 +1652,10 @@
<key>Extend - request count</key>
<value>Verlängert - Anfrageanzahl</value>
</entry>
+ <entry>
+ <key>Handbook</key>
+ <value>Handbuch</value>
+ </entry>
<entry>
<key>Console</key>
<value>Konsole</value>
@@ -1928,6 +1932,10 @@
<key>setRead</key>
<value>Gelesen setzen</value>
</entry>
+ <entry>
+ <key>Undefined</key>
+ <value>nicht definiert</value>
+ </entry>
<entry>
<key>Title</key>
<value>Titel</value>
@@ -8055,7 +8063,7 @@
<value>%0/%1 verarbeitet:</value>
</entry>
<entry>
- <key>Mosaico template</key>
+ <key>Mosaico template</key>
<value>Mosaicovorlage</value>
</entry>
<entry>
@@ -11361,6 +11369,10 @@ Bitte Datumseingabe prüfen</value>
<key>Marketing workflow</key>
<value>Marketing-Workflow</value>
</entry>
+ <entry>
+ <key>Reclamation</key>
+ <value>Reklamation</value>
+ </entry>
<entry>
<key>Token</key>
<value>Token</value>
@@ -14610,12 +14622,10 @@ Bitte Datumseingabe prüfen</value>
<value>Serviceticket-Kategorien</value>
</entry>
<entry>
- <key>Manual resynchronization</key>
- <value>Manuelle Neusynchronisation</value>
+ <key>Service ticket category</key>
</entry>
<entry>
- <key>Calculate sum</key>
- <value>Summe berechnen</value>
+ <key>Contact & Service ticket</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 984da88bcae40c383f8edc36d6924e76f015cb81..404b25410987640880c234b61381f88ceb714a74 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11207,9 +11207,18 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Reclamation</key>
+ </entry>
+ <entry>
+ <key>Undefined</key>
+ </entry>
<entry>
<key>Create only person</key>
</entry>
+ <entry>
+ <key>Handbook</key>
+ </entry>
<entry>
<key>Slave administration '%0' is '%1'</key>
</entry>