diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml
index 693645c7e9078c01318458182c8be9d598527419..985a059f4655c93d7740e8590ca49d26f6489b5d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml
@@ -6,7 +6,7 @@
             <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
             <column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
             <column name="ATTRIBUTE_PARENT_ID"/>
-            <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+            <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
             <column name="DROPDOWNDEFINITION" value="TargetGroup"/>
         </insert>
         
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml
index 8d4021d1fb8d4bab53026a50cd6eeb06eb7248c7..1e3a2da4fbe1a6b2c121f6996c84761c466f17f4 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml
@@ -3,7 +3,7 @@
     <changeSet author="s.leipold" id="06ce910f-246a-4cf6-ad2a-438dc9c3a335">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="676f498f-3f51-459f-8e07-feec7b604245"/>
-            <column name="KEYID" value="E                                   "/>
+            <column name="KEYID" value="E"/>
             <column name="TITLE" value="Entität"/>
             <column name="CONTAINER" value="PermissionAccessType"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="14f5e2a4-4998-400f-b857-90e14e8736da"/>
-            <column name="KEYID" value="R                                   "/>
+            <column name="KEYID" value="R"/>
             <column name="TITLE" value="Datensatz"/>
             <column name="CONTAINER" value="PermissionAccessType"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -21,7 +21,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="d3ae8077-36db-4f52-8f90-b0ebbb6773d7"/>
-            <column name="KEYID" value="F                                   "/>
+            <column name="KEYID" value="F"/>
             <column name="TITLE" value="Feld"/>
             <column name="CONTAINER" value="PermissionAccessType"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -30,7 +30,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="27ded05a-99c1-4810-91ee-cbb1e4ddec85"/>
-            <column name="KEYID" value="true                                "/>
+            <column name="KEYID" value="true"/>
             <column name="TITLE" value="erlauben"/>
             <column name="CONTAINER" value="PermissionCondType"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -39,7 +39,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="4409adc1-0130-44d3-8aa9-773ff3ab0816"/>
-            <column name="KEYID" value="false                               "/>
+            <column name="KEYID" value="false"/>
             <column name="TITLE" value="beschränken"/>
             <column name="CONTAINER" value="PermissionCondType"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
index 60d66a0bdaf743edf78de1eef253b2d00b7c40eb..07120c5af1f6c528ba2298e75079526792b27904 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
@@ -6,7 +6,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="own company"/>
       <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -14,7 +14,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Interested"/>
       <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -22,7 +22,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -30,7 +30,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Consultant"/>
       <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -38,7 +38,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Partner"/>
       <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -46,7 +46,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Acquisition"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -54,7 +54,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Project planned?"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -62,7 +62,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="No project planned"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -70,7 +70,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Project planning open"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -78,7 +78,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Next contact?"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -86,7 +86,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="First contact"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -94,7 +94,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product interest"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -102,7 +102,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Commodity group A"/>
       <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -110,7 +110,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product A1"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -118,7 +118,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product A2"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -126,7 +126,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Commodity group B"/>
       <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -134,7 +134,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product B1"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -142,7 +142,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product B2"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -150,7 +150,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="General"/>
       <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -158,7 +158,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="ToDo"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -166,7 +166,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Send information"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -174,14 +174,14 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Distribution"/>
       <column name="ATTRIBUTE_PARENT_ID" value="                                    "/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Presentation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -189,7 +189,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Technical requirement"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -197,7 +197,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Pros"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -205,7 +205,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="flexible"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -213,7 +213,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Reference"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -221,7 +221,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Technology"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -229,7 +229,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Cons"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -237,7 +237,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Technology"/>
       <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -245,7 +245,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Reference"/>
       <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -253,7 +253,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Next steps"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -261,7 +261,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="ToDos"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -269,7 +269,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Follow up (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -277,7 +277,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Other (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -285,7 +285,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Personal estimation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -293,7 +293,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Assessment"/>
       <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -301,7 +301,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="30"/>
       <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -309,7 +309,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="60"/>
       <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -317,7 +317,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="90"/>
       <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -325,7 +325,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Reason"/>
       <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -333,7 +333,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Participant"/>
       <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="7"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -341,7 +341,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Commodity group A (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -349,7 +349,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Commodity group B (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -357,7 +357,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Follow up (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -365,7 +365,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Origin"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -373,7 +373,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="personal"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -381,7 +381,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Reference customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -389,7 +389,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Website"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -397,7 +397,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Trade fair"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -405,7 +405,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Call"/>
       <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -413,7 +413,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Contract"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -421,7 +421,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Service contract"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -429,7 +429,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Maintenance contract"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -437,7 +437,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Frame contract (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -445,7 +445,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Custody agreement"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -453,7 +453,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Data protection agreement"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -461,7 +461,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Declaration of acceptance"/>
       <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -469,7 +469,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Known because"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -477,7 +477,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Existing contact"/>
       <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -485,7 +485,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Recommendation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -493,7 +493,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Print media"/>
       <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -501,7 +501,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Trade fair"/>
       <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -509,7 +509,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="ToDo"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="7"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -517,7 +517,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Call back (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -525,7 +525,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Send documents (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -533,7 +533,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Make offer (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -541,21 +541,21 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Send brochure (WV)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Departments"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Management"/>
       <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -563,7 +563,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Distribution"/>
       <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -571,7 +571,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Field staff"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -579,7 +579,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Office staff"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -587,7 +587,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Marketing"/>
       <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -595,7 +595,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="IT/Service"/>
       <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -603,21 +603,21 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Production"/>
       <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
-      <column name="ATTRIBUTE_TYPE" value="VOID                                "/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Competitor"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Pricing policy"/>
       <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="SalesprojectPricePolitics"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -625,7 +625,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Strength"/>
       <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="SalesprojectStrength"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -633,47 +633,47 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Weakness"/>
       <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="SalesprojectWeakness"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Interests"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Goodwill"/>
       <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Type of damage"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Regulation"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Technical specifications"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="B"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -681,7 +681,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="0 low"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -689,7 +689,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="good"/>
       <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -697,7 +697,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Atmosphere"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -705,7 +705,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Risk"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -713,7 +713,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Racing bike"/>
       <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -721,7 +721,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="A"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -729,7 +729,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="NPO"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -737,14 +737,14 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
       <column name="ATTRIBUTE_NAME" value="Dokument template usage"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Handcraft"/>
       <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -752,7 +752,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Dumping price competition"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -760,7 +760,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Full calculation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -768,14 +768,14 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
       <column name="ATTRIBUTE_NAME" value="Conditions"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Others"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -783,7 +783,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Product type"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -791,7 +791,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="medium"/>
       <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -799,7 +799,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="D"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -807,7 +807,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="1 medium"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -815,7 +815,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="loves sociability"/>
       <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -823,7 +823,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Project shift customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -831,7 +831,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Quality problem customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -839,7 +839,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Wine"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -847,7 +847,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Decision-maker changed"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -855,7 +855,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Financial service"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -863,7 +863,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Sport"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -871,7 +871,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Device/Machine"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -879,14 +879,14 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Annual holidays"/>
       <column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-      <column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+      <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Away travel"/>
       <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -894,7 +894,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Partial calculation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -902,28 +902,28 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="PERS"/>
       <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Assessment"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Industry"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Target group"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -931,7 +931,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Service"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -939,7 +939,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -947,7 +947,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Interested person"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -955,7 +955,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Manufacturer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -963,34 +963,34 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Competitor"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Assistance"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Contacting"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Signature"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Beer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -998,7 +998,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Treat"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1006,7 +1006,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Motor cycle"/>
       <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1014,7 +1014,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Revolution speed (rpm)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-      <column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+      <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1022,7 +1022,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="ORG"/>
       <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1030,7 +1030,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Cigars"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1038,7 +1038,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Wear part"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1046,7 +1046,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Mechanical engineering"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1054,7 +1054,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Loyalty"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1062,20 +1062,20 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Data table"/>
       <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Delivery block"/>
-      <column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+      <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Partner"/>
       <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1083,7 +1083,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Birthday list"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="YesNo"/>
       <column name="SORTING" valueNumeric="10"/>
     </insert>
@@ -1091,14 +1091,14 @@
       <column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Project type"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Internal"/>
       <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1106,7 +1106,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Partner"/>
       <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1114,7 +1114,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Consisted customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1122,7 +1122,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Prospective customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1130,7 +1130,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Soccer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1138,7 +1138,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Conveyor"/>
       <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-      <column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+      <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1146,7 +1146,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Additional data"/>
       <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1154,7 +1154,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="No risk"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1162,7 +1162,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="bad"/>
       <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1170,7 +1170,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Spare part"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1178,7 +1178,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Sailing"/>
       <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1186,7 +1186,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Tool changer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-      <column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+      <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1194,7 +1194,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Logistics"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="7"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1202,7 +1202,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="IT"/>
       <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1210,7 +1210,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Payment problem customer"/>
       <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1218,7 +1218,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Agency"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="6"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1226,7 +1226,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Tourism"/>
       <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1234,7 +1234,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Trade"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="4"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1242,7 +1242,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Building industry"/>
       <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="5"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1250,7 +1250,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="2 big"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1258,14 +1258,14 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Weight (kg)"/>
       <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-      <column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
+      <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Creditworthiness"/>
       <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1273,34 +1273,34 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Occupation"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Employees"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="C"/>
       <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Additional data"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Economy"/>
       <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1308,7 +1308,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Golf"/>
       <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1316,21 +1316,21 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Component"/>
       <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Employee account"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
       <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1338,7 +1338,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Incomplete delivery"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1346,7 +1346,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Quality complaint"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="1"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1354,7 +1354,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Faulty delivery"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="2"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1362,7 +1362,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Transport damage"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="0"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1370,7 +1370,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="EVENT"/>
       <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="SORTING" valueNumeric="3"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1378,7 +1378,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Payment term"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="PaymentTerm"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1386,7 +1386,7 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Delivery term"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="DeliveryTerm"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1394,41 +1394,41 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Pricelist"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-      <column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+      <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
       <column name="DROPDOWNDEFINITION" value="ProductPricelist"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Supplier"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Campaign response"/>
       <column name="ATTRIBUTE_PARENT_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Writes for"/>
       <column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Subordinate campaign of"/>
-      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION                     "/>
+      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION"/>
       <column name="DROPDOWNDEFINITION" value="Campaign"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="093c7337-c134-4be5-a215-dc94804c3511"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Superordinate campaign of"/>
-      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION                     "/>
+      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION"/>
       <column name="DROPDOWNDEFINITION" value="Campaign"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
@@ -1436,70 +1436,70 @@
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Holiday"/>
       <column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Office staff"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Field staff"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Service"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
       <column name="ATTRIBUTE_NAME" value="Visit frequency"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Boss of"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Reports to"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Region"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
       <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-      <column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+      <column name="ATTRIBUTE_TYPE" value="TEXT"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
index 26262bd6e78374cfcca5802b8e3647db7470827f..2ffba4f0e316e498ede2d3b98560290f7327fbd1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
@@ -4,7 +4,7 @@
     <changeSet author="s.listl" id="c652301e-5510-4e1a-a39d-cdc6a3356d62">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="2710c44b-73a7-4da5-b828-c7ac572ab79c"/>
-            <column name="KEYID" value="EMAILPENDING                        "/>
+            <column name="KEYID" value="EMAILPENDING"/>
             <column name="TITLE" value="Pending"/>
             <column name="CONTAINER" value="BulkMailRecipientStatus"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="82d04090-3ef1-4eaf-9836-0490733a078f"/>
-            <column name="KEYID" value="EMAILSENT                           "/>
+            <column name="KEYID" value="EMAILSENT"/>
             <column name="TITLE" value="Sent"/>
             <column name="CONTAINER" value="BulkMailRecipientStatus"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -20,7 +20,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="d1d6a461-1bbf-4f03-ac99-33a2d38a36e3"/>
-            <column name="KEYID" value="EMAILFAILED                         "/>
+            <column name="KEYID" value="EMAILFAILED"/>
             <column name="TITLE" value="Failed"/>
             <column name="CONTAINER" value="BulkMailRecipientStatus"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -29,7 +29,7 @@
         
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="6e95db61-6991-41c8-b2bb-e2b39c38efa3"/>
-            <column name="KEYID" value="BULKMAILNOTSENT                     "/>
+            <column name="KEYID" value="BULKMAILNOTSENT"/>
             <column name="TITLE" value="Not sent"/>
             <column name="CONTAINER" value="BulkMailStatus"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -37,7 +37,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="250e5cd6-1842-46b1-b968-03988255eaba"/>
-            <column name="KEYID" value="BULKMAILBEINGSENT                   "/>
+            <column name="KEYID" value="BULKMAILBEINGSENT"/>
             <column name="TITLE" value="Is being sent"/>
             <column name="CONTAINER" value="BulkMailStatus"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -45,7 +45,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
-            <column name="KEYID" value="BULKMAILSENT                        "/>
+            <column name="KEYID" value="BULKMAILSENT"/>
             <column name="TITLE" value="Sent"/>
             <column name="CONTAINER" value="BulkMailStatus"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
index ea033feecb00c7a4a4a4221bca40ae06ec17b0f3..f6ecd80fa121539f550f54a0f513e29b7fd35f7d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
@@ -3,7 +3,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
       <column name="ATTRIBUTE_PARENT_ID" value="                                    "/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
       <column name="ATTRIBUTE_NAME" value="Ticket"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -13,7 +13,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
       <column name="ATTRIBUTE_PARENT_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
-      <column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
+      <column name="ATTRIBUTE_TYPE" value="GROUP"/>
       <column name="ATTRIBUTE_NAME" value="Support"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -23,7 +23,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="ATTRIBUTE_NAME" value="Type"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -33,7 +33,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="72bcad07-6f26-48c0-84b0-1e6ab46d88a9"/>
       <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Issue"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -43,7 +43,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="02e77970-3ea4-4fff-9ffa-099746b5f3c8"/>
       <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Feature"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -53,7 +53,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="abc52bbb-047c-405c-9d58-c2e8ac8eb585"/>
       <column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Consultation"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -64,7 +64,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="ATTRIBUTE_NAME" value="Modul group"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -74,7 +74,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="6d0cce07-4767-477b-af51-e9782ebdbe25"/>
       <column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Product"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -84,7 +84,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="ed3c22a4-3fa1-4c7c-a564-938f3975af94"/>
       <column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Maintenance"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -94,7 +94,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="ace7805c-961f-4412-b3a6-7c89f27e1f6b"/>
       <column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Interfaces"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -104,7 +104,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="cf617db8-b4a4-4596-9f16-d1c58f0024d1"/>
       <column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Questions"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -115,7 +115,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="af312508-8a9b-4b8f-88f3-6b98005c749e"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
-      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION                     "/>
+      <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION"/>
       <column name="ATTRIBUTE_NAME" value="Product"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION" value="Product"/>
@@ -126,7 +126,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBO"/>
       <column name="ATTRIBUTE_NAME" value="Cause"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -136,7 +136,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="0385b6e3-00cc-4018-847f-152364c3c11e"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="User error"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -146,7 +146,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="9b4f4b19-83b0-48f6-91e9-43804d5fd1a4"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Assembly"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -156,7 +156,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="48da5029-b984-4809-8227-fb430bb78920"/>
       <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
-      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
+      <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
       <column name="ATTRIBUTE_NAME" value="Delivery problems"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
@@ -167,7 +167,7 @@
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="a4c2bcc5-5a3d-4a70-b936-9a330329c63a"/>
       <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
-      <column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
+      <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
       <column name="ATTRIBUTE_NAME" value="Billable"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
       <column name="DROPDOWNDEFINITION"/>
diff --git a/.liquibase/Data_alias/basic/2019.2.1/insert_AttributeType_Theme_keyword.xml b/.liquibase/Data_alias/basic/2019.2.1/insert_AttributeType_Theme_keyword.xml
index d5543dba499f36e83c8dd907e1e8b10ca9284335..4315fe30604220cafc441344d1c26de7d4885e94 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/insert_AttributeType_Theme_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/insert_AttributeType_Theme_keyword.xml
@@ -4,7 +4,7 @@
     <changeSet author="s.listl" id="ec0f5419-353e-4643-8f08-03651d530401">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="49dc7423-21c7-47b1-ac1e-b01e8eb5c822"/>
-            <column name="KEYID" value="THEME                               "/>
+            <column name="KEYID" value="THEME"/>
             <column name="TITLE" value="Theme"/>
             <column name="CONTAINER" value="AttributeType"/>
             <column name="SORTING" valueNumeric="11"/>
diff --git a/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml b/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml
index bce88c20a30f80ec5eb516254e46836ae1b70474..e9499721108fc6b520e8234b3cc7dfb65c3da6bd 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/insert_BulkMailProblem_keyword.xml
@@ -4,7 +4,7 @@
     <changeSet author="s.listl" id="8f2b7dca-9035-4f0c-a83f-1d16b5e57e81">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="a18e7a37-c5f6-4f7b-8db6-3018dedbd43f"/>
-            <column name="KEYID" value="MAILADDRESSDOESNOTEXIST             "/>
+            <column name="KEYID" value="MAILADDRESSDOESNOTEXIST"/>
             <column name="TITLE" value="Email address does not exist"/>
             <column name="CONTAINER" value="BulkMailProblem"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="9f11c52f-4c79-4027-877a-0f6eb828fa22"/>
-            <column name="KEYID" value="MAILBLOCKED                         "/>
+            <column name="KEYID" value="MAILBLOCKED"/>
             <column name="TITLE" value="Email blocked"/>
             <column name="CONTAINER" value="BulkMailProblem"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.2.1/insert_SerialLetterStatus_keyword.xml b/.liquibase/Data_alias/basic/2019.2.1/insert_SerialLetterStatus_keyword.xml
index 343f39f023e0e2e52c66b70043273a5d574d87b6..11de08eaedaa06bd902bb1575b755e405c7cc155 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/insert_SerialLetterStatus_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/insert_SerialLetterStatus_keyword.xml
@@ -4,7 +4,7 @@
     <changeSet author="s.listl" id="4c5659dd-16cb-435a-b573-74bc697989d1">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="8898350e-fd68-45b5-97d6-618d867e53b7"/>
-            <column name="KEYID" value="SERIALLETTERNOTSENT                 "/>
+            <column name="KEYID" value="SERIALLETTERNOTSENT"/>
             <column name="TITLE" value="Not sent"/>
             <column name="CONTAINER" value="SerialLetterStatus"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="f2fb362a-97d3-4c1d-8496-20abc99973ec"/>
-            <column name="KEYID" value="SERIALLETTERSENT                    "/>
+            <column name="KEYID" value="SERIALLETTERSENT"/>
             <column name="TITLE" value="Sent"/>
             <column name="CONTAINER" value="SerialLetterStatus"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.3.0/insert_DocumentTemplateCategory_templates.xml b/.liquibase/Data_alias/basic/2019.3.0/insert_DocumentTemplateCategory_templates.xml
index 55a562d70a7efa9b256480dd7aebf537ea89b953..3eba1df0e0c0df5d8aacbd46f4ac26881c07d83b 100644
--- a/.liquibase/Data_alias/basic/2019.3.0/insert_DocumentTemplateCategory_templates.xml
+++ b/.liquibase/Data_alias/basic/2019.3.0/insert_DocumentTemplateCategory_templates.xml
@@ -4,7 +4,7 @@
     <changeSet author="j.hoermann" id="1dd1c707-1ae3-4df3-9b94-84601e835ab1">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="0d30ed22-bb79-450a-a027-6786e7bb6028"/>
-            <column name="KEYID" value="7                                   "/>
+            <column name="KEYID" value="7"/>
             <column name="TITLE" value="HTML template - Only for .html"/>
             <column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
             <column name="SORTING" valueNumeric="7"/>
diff --git a/.liquibase/Data_alias/basic/2019.3.0/update_assistance_attributes.xml b/.liquibase/Data_alias/basic/2019.3.0/update_assistance_attributes.xml
index 5dda62f5ec1bd6b99773ce88965c6249b9c7cd1e..cd9bc1362383151445786d5fc5d85a5b3b5fac9a 100644
--- a/.liquibase/Data_alias/basic/2019.3.0/update_assistance_attributes.xml
+++ b/.liquibase/Data_alias/basic/2019.3.0/update_assistance_attributes.xml
@@ -3,7 +3,7 @@
                    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">
     <changeSet author="j.hoermann" id="14cb7c3c-9355-4376-b40c-d7a2963569b6">
         <update tableName="AB_ATTRIBUTE">
-            <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION                     " />
+            <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION" />
             <column name="DROPDOWNDEFINITION" value="Employee_entity" />
             <where>AB_ATTRIBUTEID in (?, ?, ?, ?)</where>
             <whereParams>
diff --git a/.liquibase/Data_alias/basic/2019.3.1/insert_attribute_ad_supervisor.xml b/.liquibase/Data_alias/basic/2019.3.1/insert_attribute_ad_supervisor.xml
index 637b87fdb060e78d4deaf5f46275b68b9d7cea0e..0d43f173f1c61810aad2c1a6e28f4341f41b8f74 100644
--- a/.liquibase/Data_alias/basic/2019.3.1/insert_attribute_ad_supervisor.xml
+++ b/.liquibase/Data_alias/basic/2019.3.1/insert_attribute_ad_supervisor.xml
@@ -6,7 +6,7 @@
             <column name="AB_ATTRIBUTEID" value="c0b26482-c0aa-413d-a9c3-f44c56bd04a9"/>
             <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
             <column name="ATTRIBUTE_NAME" value="Responsible AD supervisor"/>
-            <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION                     "/>
+            <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION"/>
             <column name="DROPDOWNDEFINITION" value="Employee_entity"/>
             <column name="SORTING" valueNumeric="2"/>
         </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
index 3c703a4303f0ae89a9a012b537b60c52faa882dd..6896a6870aa6ee1abea55e8bfc656ba7f855fd78 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
@@ -42,7 +42,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7a7736db-8b68-4865-a212-bd603af51370"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
-      <column name="ID_VALUE" value="SALPROJPOLLOW                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -60,7 +60,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="76967a63-8322-484b-b603-d3cb5ce27d6d"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="ID_VALUE" value="SALPROJPOLLOW                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -69,7 +69,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7a291363-9a75-4dd5-aa64-34a1801aeb92"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="ID_VALUE" value="PAYTERM30                           "/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -167,7 +167,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f7824359-7f2c-4942-b959-465bf776ef7e"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
-      <column name="ID_VALUE" value="SALPROJSTPRICEPOL                   "/>
+      <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
       <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -185,7 +185,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="44bd5ab6-0b4f-4655-a276-ed172240643b"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
-      <column name="ID_VALUE" value="PAYTERM30                           "/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -194,7 +194,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="2261ef33-50af-445a-bc19-27367cc6ff7a"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
-      <column name="ID_VALUE" value="SALPROJWEAKMARKET                   "/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -203,7 +203,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7abc6537-b254-4a36-8315-2e44a5b10fad"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
-      <column name="ID_VALUE" value="SALPROJPOLABO                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLABO"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -212,7 +212,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="edddb76a-348d-497b-9665-21acbe0bed0b"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
-      <column name="ID_VALUE" value="SALPROJWEAKMARKET                   "/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -221,7 +221,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="086ff454-e407-433a-9124-496de7fef1cb"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
-      <column name="ID_VALUE" value="PRICELISTSPECIAL                    "/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -239,7 +239,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="0563ec4f-6f85-469d-89a1-5fc807f4dc9f"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
-      <column name="ID_VALUE" value="DELIVERCIF                          "/>
+      <column name="ID_VALUE" value="DELIVERCIF"/>
       <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -248,7 +248,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="fedc492c-cc5d-48cb-a7ee-0cef061facec"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
-      <column name="ID_VALUE" value="PAYTERM30                           "/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -266,7 +266,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="ce75da6e-b946-4a8c-a9dc-fb76cc20f0a1"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
-      <column name="ID_VALUE" value="PAYTERM30                           "/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -275,7 +275,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="924e8914-6275-45d4-a36a-94f3b70a35b4"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
-      <column name="ID_VALUE" value="SALPROJSTPERSAPP                    "/>
+      <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
       <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -293,7 +293,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="67f36d84-1997-4801-a4f6-94c9b8318e95"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
-      <column name="ID_VALUE" value="SALPROJSTPRICEPOL                   "/>
+      <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
       <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -302,7 +302,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="2d80654e-3bd5-46bb-af0b-f18f812d11e0"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
-      <column name="ID_VALUE" value="SALPROJWEAKMARKET                   "/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -311,7 +311,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="25dac52d-de7e-47e1-b60c-22d252dae4c2"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
-      <column name="ID_VALUE" value="PAYTERM7                            "/>
+      <column name="ID_VALUE" value="PAYTERM7"/>
       <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -329,7 +329,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="d5cb44f7-6500-47ca-9dac-784b07d0b5f5"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:10"/>
-      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY                "/>
+      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
       <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -338,7 +338,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7f0bccf2-bf10-4a64-8ae7-236bebc2505f"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:18"/>
-      <column name="ID_VALUE" value="PAYTERM30                           "/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -356,7 +356,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="97429450-9cb5-4f8a-bd0f-c6c63c9afee9"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
-      <column name="ID_VALUE" value="SALPROJWEAKMARKET                   "/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -365,7 +365,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="6907f00d-011d-4592-8f0e-26e52449658f"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
-      <column name="ID_VALUE" value="PRICELISTDEFAULT                    "/>
+      <column name="ID_VALUE" value="PRICELISTDEFAULT"/>
       <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -374,7 +374,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f7a60ce6-39c5-43b6-a14d-24b838f541b9"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
-      <column name="ID_VALUE" value="SALPROJPOLLOW                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -383,7 +383,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="6e8b96f9-de86-4dc1-b0c9-d5b99867d29c"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
-      <column name="ID_VALUE" value="PAYTERMDISCOUNT                     "/>
+      <column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
       <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -392,7 +392,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f1f8c53a-46e9-40a9-8be2-8f0775cafa64"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
-      <column name="ID_VALUE" value="SALPROJPOLLOW                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -401,7 +401,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="255571a4-2fda-49ec-baed-ea7b374895f1"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
-      <column name="ID_VALUE" value="PRICELISTSPECIAL                    "/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -410,7 +410,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="b2bb8ab7-0e64-49fc-8e18-372ec0a03822"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
-      <column name="ID_VALUE" value="SALPROJSTPERSAPP                    "/>
+      <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
       <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -437,7 +437,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="1505bacf-c29a-48a7-8da5-5e969252309f"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
-      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY                "/>
+      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
       <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -446,7 +446,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="a433931c-412c-4a42-9a86-e5ca1e671a04"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
-      <column name="ID_VALUE" value="DELIVEREX                           "/>
+      <column name="ID_VALUE" value="DELIVEREX"/>
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -482,7 +482,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7b38959d-d0b7-434a-9316-58d4894982d2"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
-      <column name="ID_VALUE" value="SALPROJPOLABO                       "/>
+      <column name="ID_VALUE" value="SALPROJPOLABO"/>
       <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -491,7 +491,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="25a53e28-d8a1-43d3-9af0-b34ce9c0bc06"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
-      <column name="ID_VALUE" value="PRICELISTSPECIAL                    "/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
index f394f4e22610ba186b2c9ef3c0582b0b99675c15..a8dacc45007c3038def1fec3218349dd9c5fde48 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
@@ -4,10 +4,10 @@
     <delete tableName="ACTIVITY"/>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="CATEGORY" value="ONLINE-MEETING                      "/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_EDIT" valueDate="2019-05-15T03:48:22"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:46:08"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-02-04T03:46:00"/>
       <column name="INFO" value="&lt;p&gt;Erste Pr&amp;auml;sentation mit dem Interessenten. Der Verkaufsleiter scheint von unseren Produkten sehr angetan zu sein.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wollte weitere Informationen zu unseren Produkten und ein erstes Angebot.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erstkontakt mit dem Interessenten"/>
@@ -16,10 +16,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-05-15T03:58:00"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:52:31"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T03:52:00"/>
       <column name="INFO" value="&lt;p&gt;Hatte ersten Kontakt mit dem Projektzust&amp;auml;ndigen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erster Kontakt"/>
@@ -28,10 +28,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:04:05"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T04:57:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie soeben telefonisch vereinbart, erhalten Sie im Anhang die gew&amp;uuml;nschten Informationen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Information Produkt A"/>
@@ -40,10 +40,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:54:05"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-02-25T04:59:00"/>
       <column name="INFO" value="&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produktpräsentation"/>
@@ -52,9 +52,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-11T05:01:00"/>
       <column name="INFO" value="&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gekauft.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produkt gekauft"/>
@@ -62,10 +62,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:04:33"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:05:47"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-08T05:05:00"/>
       <column name="INFO" value="&lt;p&gt;Folgende Sonderkondtionen wurden vereinbart:&lt;/p&gt;&#10;&#10;&lt;p&gt;- 10 % Rabatt auf die Produkte&lt;/p&gt;&#10;&#10;&lt;p&gt;- Sonderzahlungs- recht von 30 Tagen netto&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Konditionen und Preise verhandelt"/>
@@ -74,10 +74,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:06:09"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-05-15T05:13:38"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Tannenbaum,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie unser erneutes Angebot f&amp;uuml;r das gew&amp;uuml;nschte Produkt A.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und stehen Ihnen bei R&amp;uuml;ckfragen jederzeit zur Verf&amp;uuml;gung.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Angebot an Interessenten versandt"/>
@@ -88,7 +88,7 @@
       <column name="ACTIVITYID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:49:59"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:21:44"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-02-19T05:21:00"/>
       <column name="INFO" value="&lt;p&gt;Die ersten Informationen zur derzeitigen Situation beim Interessenten gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Austausch zur aktuellen Situation "/>
@@ -97,10 +97,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:09:30"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-26T07:49:00"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie wie gew&amp;uuml;nscht und vereinbart unser Angebot zu dem Produkten A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen zum Angebot erreichen Sie uns jederzeit unter den bekannten Kontaktdaten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und auf die bevorstehende Zusammenarbeit.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Unser Angebot"/>
@@ -109,10 +109,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:41:30"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T07:55:00"/>
       <column name="INFO" value="&lt;p&gt;Kurzes Gespr&amp;auml;ch gef&amp;uuml;hrt mit Herr Altinger. Haben die ersten Fragen gekl&amp;auml;rt.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat"/>
@@ -121,10 +121,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:46:31"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-01-28T07:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;es freut uns Ihnen mitteilen zu k&amp;ouml;nnen, dass wir gerne mit Ihnen in die engere Auswahl gehen m&amp;ouml;chten.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Die n&amp;auml;chsten Schritte sind weitere Gespr&amp;auml;che sowie eine Pr&amp;auml;sentation Ihrer Produkte.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Auswahlprozess"/>
@@ -133,9 +133,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-02-04T07:57:00"/>
       <column name="INFO" value="&lt;p&gt;Der Interessent hat uns auf der Messe besucht. Hatten ein informatives Gespr&amp;auml;ch, konnten Fragestellungen kl&amp;auml;ren.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Besuch auf der Messe"/>
@@ -144,7 +144,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-13T07:59:00"/>
       <column name="INFO" value="&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Geheimhaltungsvereinbarung unterzeichnen"/>
@@ -152,10 +152,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:33:47"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:08:29"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-02-18T08:08:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr von Matterhorn,&lt;/p&gt;&#10;&#10;&lt;p&gt;gerne lassen ich Ihnen ein paar unserer Referenzen aus Ihrer Branche zukommen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Sollten Sie Interesse an einem Referenzgespr&amp;auml;ch haben, k&amp;ouml;nnen Sie mir gerne Bescheid geben. Ich werde dann die Abstimmung mit einem passenden Kunden f&amp;uuml;r Sie in die Wege leiten.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Herzliche Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Referenzen - Zu unserem Produkt"/>
@@ -164,10 +164,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T08:07:03"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:12:04"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-01T08:12:00"/>
       <column name="INFO" value="&lt;p&gt;Konnten Vor-Ort Termin mit den Ansprechpartnern ausmachen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Vor Ort Termin"/>
@@ -177,7 +177,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:15:11"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-13T08:15:00"/>
       <column name="INFO" value="&lt;p&gt;Die Pr&amp;auml;sentation fand in einer sehr konstruktiven und entspannten Atmosph&amp;auml;re statt.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Präsentation"/>
@@ -185,10 +185,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:37:38"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:16:32"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-29T08:16:00"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr von Matterhorn,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie soeben telefonisch angek&amp;uuml;ndigt freue ich mich, Ihnen im Anhang dieser Nachricht nun die ausgearbeitete Stellungnahme sowie unser Angebot zukommen zu lassen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen k&amp;ouml;nnen Sie mich jederzeit erreichen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e,&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Stellungnahme"/>
@@ -197,10 +197,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:35:58"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:17:47"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-28T08:17:00"/>
       <column name="INFO" value="&lt;p&gt;Prim&amp;auml;r die Fragen gem&amp;auml;&amp;szlig; Agenda besprochen - Unterlagen befinden sich auf dem Filerverzeichnis.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Technischer Workshop bzgl. Produktanforderungen"/>
@@ -210,7 +210,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:47:30"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-14T08:47:00"/>
       <column name="INFO" value="&lt;p&gt;Haben weitere Informationen zu unseren Produkten runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationen von der Webseite runtergeladen"/>
@@ -220,7 +220,7 @@
       <column name="ACTIVITYID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T08:59:45"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:56:11"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-21T08:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;unsere Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Messebesuch"/>
@@ -231,7 +231,7 @@
       <column name="ACTIVITYID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:12:52"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:57:17"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-29T08:57:00"/>
       <column name="INFO" value="&lt;p&gt;15.02.2019: Definition einer Long list auf Basis einer umfassenden Marktstudie &amp;uuml;ber gew&amp;uuml;nschte Produkte&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;22.02.2019:&amp;nbsp;&lt;br /&gt;&#10;Information an potentielle Anbieter / Hersteller&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produkt-Terminplanung"/>
@@ -242,7 +242,7 @@
       <column name="ACTIVITYID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T10:48:04"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:46:27"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-05-01T10:46:00"/>
       <column name="INFO" value="&lt;p&gt;Besuchte Seiten:&lt;/p&gt;&#10;&#10;&lt;p&gt;http://www..&amp;nbsp; &amp;nbsp; &amp;nbsp;/ Besuchsdauer&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Lead über Webseite identifiziert"/>
@@ -253,7 +253,7 @@
       <column name="ACTIVITYID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T10:49:17"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:48:15"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-05-10T10:48:00"/>
       <column name="INFO" value="&lt;p&gt;Anrede:&lt;/p&gt;&#10;&#10;&lt;p&gt;Name:&lt;/p&gt;&#10;&#10;&lt;p&gt;Vorname:&lt;/p&gt;&#10;&#10;&lt;p&gt;Position:&lt;/p&gt;&#10;&#10;&lt;p&gt;Kontaktaufnahme gew&amp;uuml;nscht: ja&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Kontaktformular Webseite"/>
@@ -262,10 +262,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T10:41:06"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:51:27"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-05-17T10:51:27"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr Peterson,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei finden sie unser Informationsmaterial.&lt;/p&gt;&#10;&#10;&lt;p&gt;Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Frau Sommer&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationsmaterial"/>
@@ -276,7 +276,7 @@
       <column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:06:35"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
       <column name="INFO" value="&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Infobrochüre runtergeladen"/>
@@ -287,7 +287,7 @@
       <column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
       <column name="DATE_EDIT" valueDate="2019-05-19T08:57:49"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-12-26T08:55:00"/>
       <column name="INFO" value="&lt;p&gt;Anrede: Herr&lt;/p&gt;&#10;&#10;&lt;p&gt;Vorname:Markus&lt;/p&gt;&#10;&#10;&lt;p&gt;Nachname:Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail:maltinger@industrial-steel.de&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Kontaktaufnahme über Kontaktformular"/>
@@ -297,7 +297,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:40:13"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-01-09T05:40:00"/>
       <column name="INFO" value="&lt;p&gt;Frau Decker hat unsere Webseite nach Referenzen und Produkten durchsucht.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="War auf unserer Webseite - Website Tracking"/>
@@ -307,7 +307,7 @@
       <column name="ACTIVITYID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T05:43:23"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:42:24"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-01-15T05:42:00"/>
       <column name="INFO" value="&lt;p&gt;Produktinformationen zu Produkt 1 runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produktinformationen runtergeladen."/>
@@ -318,7 +318,7 @@
       <column name="ACTIVITYID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:12:42"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:44:17"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-01-18T05:44:00"/>
       <column name="INFO" value="&lt;p&gt;Neuer Kontakt hat Informationen von der Seite runtergeleaden.&lt;/p&gt;&#10;&#10;&lt;p&gt;Nachfassen und Potential abfragen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Nachgefasst - Laut Leadmanagement"/>
@@ -329,7 +329,7 @@
       <column name="ACTIVITYID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T05:47:10"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:45:42"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-01-22T05:45:00"/>
       <column name="INFO" value="&lt;p&gt;Erstkontakt mit dem Au&amp;szlig;endienst vereinbart. Besonderes Interesse an Produkt 1 und 3&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat mit Frau Decker für den Außendienst vereinbart."/>
@@ -340,7 +340,7 @@
       <column name="ACTIVITYID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:36:40"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:47:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-02-08T05:47:00"/>
       <column name="INFO" value="&lt;p&gt;Hatte zusammen mit Frau Decker das erste Gespr&amp;auml;ch zu Produkten 1 und 3.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten alle ersten Fragen kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;N&amp;auml;chster Schritt ist ein Termin vor Ort.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Gespräch mit Frau Decker"/>
@@ -351,7 +351,7 @@
       <column name="ACTIVITYID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:37:07"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:53:02"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-05T05:53:00"/>
       <column name="INFO" value="&lt;p&gt;Termin vor Ort bei Transatlantik Logistics.&lt;/p&gt;&#10;&#10;&lt;p&gt;War ein guter Termin, scheinen von den Produkten sehr angetan zu sein.&lt;/p&gt;&#10;&#10;&lt;p&gt;Weiteres Vorgehen wird n&amp;auml;chste Woche abgestimmt.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Termin vor Ort"/>
@@ -360,10 +360,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:38:39"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:56:06"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-11T05:56:00"/>
       <column name="INFO" value="&lt;p&gt;Herr Morgenstern ist der verantwortliche Vertriebsleiter bei Transatlantik Logistics.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="2. Ansprechpartner kennengelernt"/>
@@ -373,7 +373,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:57:18"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-14T05:57:00"/>
       <column name="INFO" value="&lt;p&gt;Herr Morgenstern hat differenziert von Frau Decker nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat bzgl. offener Fragen"/>
@@ -381,10 +381,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T09:04:33"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:55:01"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-12T08:55:00"/>
       <column name="INFO" value="&lt;p&gt;Weiteres Telefonat mit Herrn Altinger gef&amp;uuml;hrt.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Hr. Altinger ist sehr begeistert von den M&amp;ouml;glichkeiten des Produktes.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat mit Interessent"/>
@@ -393,10 +393,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:01:11"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T08:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Frau Sommer,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie bereits telefonisch angek&amp;uuml;ndigt, bitten wir um ein Angebot f&amp;uuml;r die Produkte A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Industrial Steel AG&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Interessent möchte Angebot zu dem Produkt"/>
@@ -405,10 +405,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:01:47"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T09:06:00"/>
       <column name="INFO" value="&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert. Schickt dazu auch noch eine E-Mail.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Angebot erstellen"/>
@@ -419,7 +419,7 @@
       <column name="ACTIVITYID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T09:30:46"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:27:23"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T09:27:00"/>
       <column name="INFO" value="&lt;p&gt;Produktinformationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationen an Frau Lindner weitergegeben."/>
@@ -430,7 +430,7 @@
       <column name="ACTIVITYID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:55:24"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:29:25"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-20T09:29:00"/>
       <column name="INFO" value="&lt;p&gt;&amp;Uuml;ber die Landingpage von Produkt C&amp;nbsp;auf uns gekommen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Es&amp;nbsp;besteht weiterhin Interesse an den Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Ãœber Online-Werbung auf uns aufmerksam geworden."/>
@@ -439,10 +439,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="CATEGORY" value="ONLINE-MEETING                      "/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:19:12"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:48:08"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-08T10:48:00"/>
       <column name="INFO" value="&lt;p&gt;Gemeinsamer Termin mit allen Beteiligten der Produkteinf&amp;uuml;hrung:&lt;/p&gt;&#10;&#10;&lt;p&gt;- Definition Herausforderungen&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;- Definition weiterer Terminablauf zur Produkteinf&amp;uuml;hrung&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung gestartet"/>
@@ -453,7 +453,7 @@
       <column name="ACTIVITYID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:26:41"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:49:26"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-25T10:49:00"/>
       <column name="INFO" value="&lt;p&gt;Erste Phase der Planung&amp;nbsp;erfolgreich abgeschlossen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktkonfiguration fertig gestellt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Individuelles Produkt geht in die Produktion.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung abgeschlossen"/>
@@ -462,10 +462,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:27:26"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:50:46"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2019-05-23T10:50:46"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;die Produktion des Produktes startet. &amp;Uuml;ber den Verlauf und den aktuellen Stand der Produktion k&amp;ouml;nnen Sie sich in unserem Kundenportal informieren.&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="2. Phase der Produkt-Planung startet"/>
@@ -475,16 +475,16 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:30:16"/>
-      <column name="DIRECTION" value="inx                                 "/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-06-11T02:30:16"/>
       <column name="SUBJECT" value="Rahmenvertrag"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:38:27"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2019-04-17T02:38:00"/>
       <column name="INFO" value="&lt;p&gt;Hr. von Matterhorn hatte die erfreuliche Nachricht, dass sie sich f&amp;uuml;r unser Produkt entschieden haben;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Vertrag kann nun fertig gemacht und zugesandt werden&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Rückmeldung zum Angebot "/>
@@ -492,9 +492,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="ONLINE-MEETING                      "/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2017-04-13T02:41:22"/>
       <column name="INFO" value="Informationen sind zu seiner Zufriedenheit gewesen, sendet eine Email mit einer konkreten Anfrage."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -503,9 +503,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-02-22T03:41:22"/>
       <column name="INFO" value="erworben von Roboterabteilung"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -514,9 +514,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -525,9 +525,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -536,9 +536,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
       <column name="INFO" valueClobFile="ACTIVITY/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -547,9 +547,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-07-31T02:02:52"/>
       <column name="INFO" value="Aufzeichnungen zum Thema &quot;Transparentes Kampagnen- und Veranstaltungsmanagement&quot; verschickt."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -558,9 +558,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
-      <column name="CATEGORY" value="ONLINE-MEETING                      "/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
       <column name="INFO" value="Hat uns Zusatzinfos geschickt - diese wurden an allen entsprechenden Stellen hinterlegt und final eingepflegt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -569,9 +569,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
-      <column name="CATEGORY" value="ONLINE-MEETING                      "/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-08-06T02:02:52"/>
       <column name="INFO" value="Abgleich der Bestandsdaten wurde gemacht."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -580,9 +580,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
       <column name="INFO" value="Vertragsgrundlagen besprochen. Wird in den nächsten Tagen definiert"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -591,9 +591,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
-      <column name="CATEGORY" value="PHONE                               "/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-08-09T02:02:52"/>
       <column name="INFO" value="Ein Standortwechsel steht an und die neuen Daten wurden erfasst."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -602,9 +602,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
       <column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -613,9 +613,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i                                   "/>
+      <column name="DIRECTION" value="i"/>
       <column name="ENTRYDATE" valueDate="2018-08-12T02:02:52"/>
       <column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -624,9 +624,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
-      <column name="CATEGORY" value="VISIT                               "/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o                                   "/>
+      <column name="DIRECTION" value="o"/>
       <column name="ENTRYDATE" valueDate="2018-08-11T02:02:52"/>
       <column name="INFO" value="Einladung von Kunden, Interessenten und Zulieferern zu einer internen Veranstaltung in unserem Haus"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -635,9 +635,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
-      <column name="CATEGORY" value="MAIL                                "/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-09-04T05:57:51"/>
-      <column name="DIRECTION" value="x                                   "/>
+      <column name="DIRECTION" value="x"/>
       <column name="ENTRYDATE" valueDate="2019-09-04T05:57:51"/>
       <column name="INFO" value="&lt;p&gt;Bitte pr&amp;uuml;fen ob alle Angaben passen und wir das so best&amp;auml;tigen k&amp;ouml;nnen.&lt;/p&gt;&#10;"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -647,7 +647,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
       <column name="DATE_NEW" valueDate="2019-09-04T05:59:27"/>
-      <column name="DIRECTION" value="x                                   "/>
+      <column name="DIRECTION" value="x"/>
       <column name="ENTRYDATE" valueDate="2019-09-04T05:59:27"/>
       <column name="INFO" value="&lt;p&gt;Alle Teilnehmer werden zum Termin anwesend sein, werden den Ablauf und das Standpersonal besprechen.&lt;/p&gt;&#10;"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -657,7 +657,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
       <column name="DATE_NEW" valueDate="2019-09-04T09:15:52"/>
-      <column name="DIRECTION" value="x                                   "/>
+      <column name="DIRECTION" value="x"/>
       <column name="ENTRYDATE" valueDate="2019-09-04T09:15:52"/>
       <column name="INFO" value="&lt;p&gt;Hallo Zusammen,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;bitte ladet alle eure A Kontakte ein f&amp;uuml;r das Event.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;&lt;br /&gt;&#10;Euer Markteting;&lt;/p&gt;&#10;"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -668,7 +668,7 @@
       <column name="ACTIVITYID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
       <column name="DATE_EDIT" valueDate="2019-09-04T09:17:42"/>
       <column name="DATE_NEW" valueDate="2019-09-04T09:16:51"/>
-      <column name="DIRECTION" value="x                                   "/>
+      <column name="DIRECTION" value="x"/>
       <column name="ENTRYDATE" valueDate="2019-09-04T09:16:00"/>
       <column name="INFO" value="&lt;p&gt;Erinnerung das am 18.09 die Einladungen versandt werden!&lt;/p&gt;&#10;"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -679,7 +679,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
       <column name="DATE_NEW" valueDate="2019-09-04T09:19:40"/>
-      <column name="DIRECTION" value="x                                   "/>
+      <column name="DIRECTION" value="x"/>
       <column name="ENTRYDATE" valueDate="2019-08-27T09:19:00"/>
       <column name="INFO" value="&lt;p&gt;Hallo zusammen,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;wir sind sehr froh euch mitteilen zu d&amp;uuml;rfen das wir die ersten Vorbereitungen f&amp;uuml;r die Messe geplant haben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Weitere Infos werden euch zum passenden Zeitpunkt zugespielt.&lt;/p&gt;&#10;&#10;&lt;p&gt;&lt;br /&gt;&#10;Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Das Marketing&lt;/p&gt;&#10;"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
index 3fbf9a65a3070a32981ace769de452d35a3469be..bba9e213a806b7b550d1516c122958f836c74061 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
@@ -5,7 +5,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Spresstrasse"/>
       <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="67"/>
       <column name="CITY" value="Bielefeld Babenhausen"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
@@ -19,7 +19,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Kurfürstendamm"/>
       <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="95"/>
       <column name="CITY" value="Rostock"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
@@ -33,7 +33,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Stahlstraße"/>
       <column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="24"/>
       <column name="CITY" value="Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -46,7 +46,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Hafenstraße"/>
       <column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Friedrichshafen"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -59,7 +59,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Baustraße"/>
       <column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="64"/>
       <column name="CITY" value="Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
@@ -72,7 +72,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Kronenstraße"/>
       <column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
@@ -85,7 +85,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grassstraße"/>
       <column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Geisenhausen"/>
       <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
@@ -98,7 +98,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Leasingstrasse"/>
       <column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="78"/>
       <column name="CITY" value="Berlin"/>
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
@@ -111,7 +111,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Eichenallee"/>
       <column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
@@ -124,7 +124,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Steinstraße"/>
       <column name="ADDRESSID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="Regensburg"/>
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
@@ -137,7 +137,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Dotterblumenstrasse"/>
       <column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="CITY" value="Ingolstadt"/>
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="COUNTRY" value="DE"/>
@@ -149,7 +149,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Birkenstrasse"/>
       <column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="78"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
@@ -162,7 +162,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Bogenallee"/>
       <column name="ADDRESSID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Bremen"/>
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
@@ -175,7 +175,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grabweg"/>
       <column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="17a"/>
       <column name="CITY" value="Neumünster"/>
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
@@ -191,7 +191,7 @@
       <column name="ADDRESS" value="Wilhelm-Straße"/>
       <column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="2"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -206,7 +206,7 @@
       <column name="ADDRESS" value="Laufertorgraben"/>
       <column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="25"/>
       <column name="CITY" value="Nürnberg"/>
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
@@ -221,7 +221,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
@@ -236,7 +236,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -251,7 +251,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
-      <column name="ADDR_TYPE" value="DELIVERADDR                         "/>
+      <column name="ADDR_TYPE" value="DELIVERADDR"/>
       <column name="BUILDINGNO" value="13"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -266,7 +266,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Hauptstraße"/>
       <column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="110"/>
       <column name="CITY" value="Windach"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -281,7 +281,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Rudolstaedter Strasse"/>
       <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="77"/>
       <column name="CITY" value="Heinrichsthal"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -296,7 +296,7 @@
       <column name="ADDRESS" value="Muster-Straße"/>
       <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="3"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -311,7 +311,7 @@
       <column name="ADDRESS" value="Lützowplatz"/>
       <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
       <column name="ADDRIDENTIFIER" value="Tor 4"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
@@ -328,7 +328,7 @@
       <column name="ADDRESS" value="Hildburghausen"/>
       <column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
@@ -345,7 +345,7 @@
       <column name="ADDRESS" value="Rudower Strasse"/>
       <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
@@ -359,7 +359,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Büsingstrasse"/>
       <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Bergkirchen"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
@@ -373,7 +373,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Landsberger Allee"/>
       <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="83"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -387,7 +387,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grosse Praesidenten Str."/>
       <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
-      <column name="ADDR_TYPE" value="HOMEADDR                            "/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Niederkirchen"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -401,7 +401,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Lagerstraße"/>
       <column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="2"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
@@ -414,7 +414,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Großstraße"/>
       <column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
-      <column name="ADDR_TYPE" value="DELIVERADDR                         "/>
+      <column name="ADDR_TYPE" value="DELIVERADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
@@ -427,7 +427,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Augsburger Straße"/>
       <column name="ADDRESSID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
@@ -441,7 +441,7 @@
       <column name="ADDRESS" value="Hildburghausen"/>
       <column name="ADDRESSID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
       <column name="ADDRIDENTIFIER" value="Tor 1 "/>
-      <column name="ADDR_TYPE" value="OFFICEADDR                          "/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGN.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGN.xml
index d88ff3fa4c5eae6a102a7eb29a609182dec9b5d8..7dd2eb5e2f352692235eceb22d20e048f8b326ee 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGN.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGN.xml
@@ -4,44 +4,44 @@
     <delete tableName="CAMPAIGN"/>
     <insert tableName="CAMPAIGN">
       <column name="CAMPAIGNID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_EDIT" valueDate="2019-09-04"/>
       <column name="DATE_NEW" valueDate="2019-09-02"/>
       <column name="DESCRIPTION" value="Prüfung unserer Software durch Teilnehmer"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="NAME" value="CRM-Scan"/>
-      <column name="STATUS" value="PLANNING                            "/>
+      <column name="STATUS" value="PLANNING"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGN">
       <column name="CAMPAIGNID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="DESCRIPTION" value="Messe um neue Kontakte zu akquirieren."/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="NAME" value="Vertriebsmesse"/>
-      <column name="STATUS" value="PLANNING                            "/>
+      <column name="STATUS" value="PLANNING"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGN">
       <column name="CAMPAIGNID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="DESCRIPTION" value="Zweijährige Messe."/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="NAME" value="Hannovermesse"/>
-      <column name="STATUS" value="PLANNING                            "/>
+      <column name="STATUS" value="PLANNING"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGN">
       <column name="CAMPAIGNID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="DESCRIPTION" value="An unsererem  Kundentag können sich bestehende Kunden und Interessenten  austauschen."/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="NAME" value="Interner Kundentag"/>
-      <column name="STATUS" value="PLANNING                            "/>
+      <column name="STATUS" value="PLANNING"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNCOST.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNCOST.xml
index b9ddc0abbf80b99a7fd89fe8de3e7049d31afb8b..051577aa7d19d74ed13e0397f6cbadacb6293a20 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNCOST.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNCOST.xml
@@ -6,7 +6,7 @@
       <column name="CAMPAIGNCOSTID" value="ebbc4865-1646-4c61-afc5-2f0af305f9e2"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
       <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="CATEGORY" value="SHIPCOST                            "/>
+      <column name="CATEGORY" value="SHIPCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-03"/>
       <column name="NET" valueNumeric="150.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -14,7 +14,7 @@
     <insert tableName="CAMPAIGNCOST">
       <column name="CAMPAIGNCOSTID" value="7b8fd98d-f947-46d8-ad6b-271378aca137"/>
       <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="CATEGORY" value="PRINTCOST                           "/>
+      <column name="CATEGORY" value="PRINTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-03"/>
       <column name="NET" valueNumeric="250.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -23,7 +23,7 @@
       <column name="CAMPAIGNCOSTID" value="ea5d6362-b629-4026-96fd-adbb89641428"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
       <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CATEGORY" value="PRINTCOST                           "/>
+      <column name="CATEGORY" value="PRINTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="100.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -31,7 +31,7 @@
     <insert tableName="CAMPAIGNCOST">
       <column name="CAMPAIGNCOSTID" value="09e7f86f-983d-4e68-bf19-54018fa9b230"/>
       <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CATEGORY" value="SHIPCOST                            "/>
+      <column name="CATEGORY" value="SHIPCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="250.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -40,7 +40,7 @@
       <column name="CAMPAIGNCOSTID" value="1d9bc85b-48a6-423b-b59f-dbc32b27c917"/>
       <column name="CAMPAIGNSTEP_ID" value="fd5d676b-94a3-441e-9b55-eceffc2a0b49"/>
       <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="CATEGORY" value="LAYOUTCOST                          "/>
+      <column name="CATEGORY" value="LAYOUTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="250.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -48,7 +48,7 @@
     <insert tableName="CAMPAIGNCOST">
       <column name="CAMPAIGNCOSTID" value="293f7a24-191a-4ccd-83c2-4adf976d8dcd"/>
       <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="CATEGORY" value="LAYOUTCOST                          "/>
+      <column name="CATEGORY" value="LAYOUTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="1000.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -56,7 +56,7 @@
     <insert tableName="CAMPAIGNCOST">
       <column name="CAMPAIGNCOSTID" value="c2a145a2-3e12-4a1c-825a-d5555256062a"/>
       <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="CATEGORY" value="PRINTCOST                           "/>
+      <column name="CATEGORY" value="PRINTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="500.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -65,7 +65,7 @@
       <column name="CAMPAIGNCOSTID" value="2af457dd-d4ef-4faa-8d33-dca3346dfd10"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CATEGORY" value="LAYOUTCOST                          "/>
+      <column name="CATEGORY" value="LAYOUTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="500.00"/>
       <column name="USER_NEW" value="Admin"/>
@@ -73,7 +73,7 @@
     <insert tableName="CAMPAIGNCOST">
       <column name="CAMPAIGNCOSTID" value="bb77c632-a0a1-4bfb-89de-8a80dc00d8ff"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CATEGORY" value="LAYOUTCOST                          "/>
+      <column name="CATEGORY" value="LAYOUTCOST"/>
       <column name="DATE_NEW" valueDate="2019-09-04"/>
       <column name="NET" valueNumeric="1000.00"/>
       <column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNSTEP.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNSTEP.xml
index cce18f72ca86f37b0cf9c03384722bca30e6f1bf..20c4202ef09a848cf6005fa99791746fbd81d4df 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNSTEP.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CAMPAIGNSTEP.xml
@@ -12,7 +12,7 @@
       <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="NAME" value="Hinzugefügt"/>
       <column name="SORTING" valueNumeric="1"/>
-      <column name="STATUS" value="OPEN                                "/>
+      <column name="STATUS" value="OPEN"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -26,8 +26,8 @@
       <column name="NAME" value="Telefonische Kontaktaufnahme"/>
       <column name="PREDECESSORSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
       <column name="SORTING" valueNumeric="2"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -40,7 +40,7 @@
       <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="NAME" value="Hinzugefügt"/>
       <column name="SORTING" valueNumeric="1"/>
-      <column name="STATUS" value="OPEN                                "/>
+      <column name="STATUS" value="OPEN"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -54,8 +54,8 @@
       <column name="NAME" value="Telefonisch Nachfassen"/>
       <column name="PREDECESSORSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
       <column name="SORTING" valueNumeric="2"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -69,8 +69,8 @@
       <column name="NAME" value="Bestätigung zugesandt"/>
       <column name="PREDECESSORSTEP_ID" value="963dc8b8-55e4-4e22-8162-a706dbeefa94"/>
       <column name="SORTING" valueNumeric="3"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -83,7 +83,7 @@
       <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="NAME" value="Hinzugefügt"/>
       <column name="SORTING" valueNumeric="1"/>
-      <column name="STATUS" value="OPEN                                "/>
+      <column name="STATUS" value="OPEN"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -97,8 +97,8 @@
       <column name="NAME" value="E-Mail Einladung aussenden"/>
       <column name="PREDECESSORSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
       <column name="SORTING" valueNumeric="2"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -112,8 +112,8 @@
       <column name="NAME" value="Nachfassen"/>
       <column name="PREDECESSORSTEP_ID" value="fd5d676b-94a3-441e-9b55-eceffc2a0b49"/>
       <column name="SORTING" valueNumeric="3"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -127,8 +127,8 @@
       <column name="NAME" value="Teilnahme bestätigt"/>
       <column name="PREDECESSORSTEP_ID" value="2d89fd53-76e4-4dfa-8941-d0a80b040849"/>
       <column name="SORTING" valueNumeric="4"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -141,7 +141,7 @@
       <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="NAME" value="Hinzugefügt"/>
       <column name="SORTING" valueNumeric="1"/>
-      <column name="STATUS" value="OPEN                                "/>
+      <column name="STATUS" value="OPEN"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -155,8 +155,8 @@
       <column name="NAME" value="Einladung versandt"/>
       <column name="PREDECESSORSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="SORTING" valueNumeric="2"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -170,8 +170,8 @@
       <column name="NAME" value="Teilnahme bestätigt"/>
       <column name="PREDECESSORSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="SORTING" valueNumeric="3"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CAMPAIGNSTEP">
@@ -185,8 +185,8 @@
       <column name="NAME" value="Teilgenommen"/>
       <column name="PREDECESSORSTEP_ID" value="76295722-96f0-4992-a2d4-8defe962bf9a"/>
       <column name="SORTING" valueNumeric="4"/>
-      <column name="STATUS" value="OPEN                                "/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL                       "/>
+      <column name="STATUS" value="OPEN"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CLASSIFICATIONTYPE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CLASSIFICATIONTYPE.xml
index c6b09ad6278f78d6224f6cd94de400eeb8875f19..729056856f16e03d8a725d8f4a342b2ce8d5c1e1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CLASSIFICATIONTYPE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CLASSIFICATIONTYPE.xml
@@ -4,67 +4,67 @@
     <delete tableName="CLASSIFICATIONTYPE"/>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORETYPE" value="ScoreBased"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORETYPE" value="ScoreBranch"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORETYPE" value="ScoreUsers"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORETYPE" value="ScoreBudget"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="SCORETYPE" value="ScoreCustomizing"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="SCORETYPE" value="ScoreStandard"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
       <column name="SCORETYPE" value="ScoreCloud"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORETYPE" value="ScoreDepartment"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORETYPE" value="ScoreDecisionPhase"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORETYPE" value="ScorePosition"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
-      <column name="CLASSIFICATIONTYPE" value="SALESPROJ                           "/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORETYPE" value="ScoreProjectStart"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
index cb5a2b9584b61c1c68cf8ae3de8598b50e9c7bc8..349e6c79dc7e724af763244867a265526907201a 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
@@ -9,7 +9,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:48:55"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -20,7 +20,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:46:11"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMINTERNET                        "/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -31,7 +31,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-06T02:50:34"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMINTERNET                        "/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -41,7 +41,7 @@
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMINTERNET                        "/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -51,7 +51,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:36:32"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:56:26"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMMOBIL                           "/>
+      <column name="MEDIUM_ID" value="COMMMOBIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -61,7 +61,7 @@
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:10:34"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -70,7 +70,7 @@
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:13:19"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -79,7 +79,7 @@
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:24:26"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -89,7 +89,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:37"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:26:03"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -100,7 +100,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:32:33"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:03:15"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -111,7 +111,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T08:26:27"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:04:03"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -122,7 +122,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:50:57"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -133,7 +133,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:10"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -143,7 +143,7 @@
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -153,7 +153,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:27"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -163,7 +163,7 @@
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:11:20"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -172,7 +172,7 @@
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:13:02"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -182,7 +182,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:35:59"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -193,7 +193,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:39:42"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -204,7 +204,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T10:41:56"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -214,7 +214,7 @@
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="0"/>
-      <column name="MEDIUM_ID" value="COMMINTERNET                        "/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -224,7 +224,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:48:25"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -235,7 +235,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:38:02"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -246,7 +246,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:49:15"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -257,7 +257,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:47"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -267,7 +267,7 @@
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -277,7 +277,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:36:21"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -287,7 +287,7 @@
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -297,7 +297,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:17"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -308,7 +308,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:50:35"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -319,7 +319,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:36"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:22:23"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -329,7 +329,7 @@
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:22:24"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -338,7 +338,7 @@
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -348,7 +348,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:37:07"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -359,7 +359,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:37:23"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -369,7 +369,7 @@
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -379,7 +379,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:45"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:30:47"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -389,7 +389,7 @@
       <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:30:48"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -399,7 +399,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:28"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -409,7 +409,7 @@
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -418,7 +418,7 @@
       <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:32:30"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -428,7 +428,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:36"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -438,7 +438,7 @@
       <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -448,7 +448,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:53"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -459,7 +459,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:51:51"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -470,7 +470,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:26"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -480,7 +480,7 @@
       <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -490,7 +490,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-05T03:52:13"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:42:07"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -500,7 +500,7 @@
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:09:20"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -509,7 +509,7 @@
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:10:07"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -518,7 +518,7 @@
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:10:46"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -527,7 +527,7 @@
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:11:18"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -536,7 +536,7 @@
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:19:53"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -545,7 +545,7 @@
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:20:31"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -555,7 +555,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:44:07"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:21:42"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -565,7 +565,7 @@
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:22:21"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -575,7 +575,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:43:55"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:24:31"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -585,7 +585,7 @@
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:27:25"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -594,7 +594,7 @@
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:27:48"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -603,7 +603,7 @@
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:30:12"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -613,7 +613,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:41:44"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:31:52"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -623,7 +623,7 @@
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:32:15"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -633,7 +633,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:41:08"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:32:54"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -644,7 +644,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:40:05"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:33:16"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -655,7 +655,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:26"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:34:41"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -666,7 +666,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:37"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:45:42"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -677,7 +677,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:48"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:46:23"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -688,7 +688,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:59"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:46:57"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -699,7 +699,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-23T11:23:53"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:48:09"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -710,7 +710,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:31"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:48:35"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -721,7 +721,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:43"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:12"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -732,7 +732,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:52"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:30"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -743,7 +743,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:02"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:52"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -754,7 +754,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:29"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:29:24"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -765,7 +765,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:57"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:30:33"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -776,7 +776,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:16"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:31:22"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -787,7 +787,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:46"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:32:03"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -798,7 +798,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:46:14"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:32:40"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -809,7 +809,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-11T11:58:59"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:36:18"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -820,7 +820,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:46:49"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:36:39"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -830,7 +830,7 @@
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:42:41"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -840,7 +840,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:37"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:42:51"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -850,7 +850,7 @@
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="DATE_NEW" valueDate="2019-05-23T11:42:52"/>
       <column name="ISSTANDARD" valueNumeric="0"/>
-      <column name="MEDIUM_ID" value="COMMXING                            "/>
+      <column name="MEDIUM_ID" value="COMMXING"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -859,7 +859,7 @@
       <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_NEW" valueDate="2019-06-05T03:52:59"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -868,7 +868,7 @@
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -877,7 +877,7 @@
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -886,7 +886,7 @@
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -895,7 +895,7 @@
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMEMAIL                           "/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -904,7 +904,7 @@
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="DATE_NEW" valueDate="2019-06-11T08:26:11"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -913,7 +913,7 @@
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="DATE_NEW" valueDate="2019-06-11T08:26:49"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
@@ -922,7 +922,7 @@
       <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="DATE_NEW" valueDate="2019-06-11T11:58:07"/>
       <column name="ISSTANDARD" valueNumeric="1"/>
-      <column name="MEDIUM_ID" value="COMMPHONE                           "/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
index 8eaf631316c4f2597e05d7b03770ea6b8d04c482..a3e7036f23047f5a1aa262b7e6e111f62aba8f65 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
@@ -3,12 +3,12 @@
   <changeSet author="autogenerated" id="efa51685-7bc1-463f-a88b-351055ce9be4">
     <delete tableName="CONTACT"/>
     <insert tableName="CONTACT">
-      <column name="ADDRESS_ID" value="0                                   "/>
-      <column name="CONTACTID" value="0                                   "/>
+      <column name="ADDRESS_ID" value="0"/>
+      <column name="CONTACTID" value="0"/>
       <column name="DATE_NEW" valueDate="2019-08-29T02:43:16"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0                                   "/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="ORGANISATION_ID" value="0"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -17,7 +17,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -26,7 +26,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -35,7 +35,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -44,7 +44,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -53,7 +53,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -64,7 +64,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -75,7 +75,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -86,7 +86,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -97,7 +97,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -105,10 +105,10 @@
       <column name="CONTACTID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0                                   "/>
+      <column name="ORGANISATION_ID" value="0"/>
       <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -116,10 +116,10 @@
       <column name="CONTACTID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0                                   "/>
+      <column name="ORGANISATION_ID" value="0"/>
       <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -130,7 +130,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -141,7 +141,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -152,7 +152,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -163,7 +163,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -172,7 +172,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -181,7 +181,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -190,7 +190,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -203,7 +203,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -216,7 +216,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -229,7 +229,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -242,7 +242,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -255,7 +255,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -267,7 +267,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -280,7 +280,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -293,7 +293,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -306,7 +306,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -318,7 +318,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -331,7 +331,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -344,7 +344,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -355,7 +355,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -366,7 +366,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -375,7 +375,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -384,7 +384,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -393,7 +393,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -402,7 +402,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -411,7 +411,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -420,7 +420,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -429,7 +429,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -438,7 +438,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -447,7 +447,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -456,7 +456,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -465,7 +465,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -474,7 +474,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
-      <column name="STATUS" value="CONTACTSTATACTIVE                   "/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
index f19731d2660dc15ea85231223fe5c4c690e68da0..c51167fa066711bd31b9addd2a19f712f81c1994 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
@@ -9,9 +9,9 @@
       <column name="CONTRACTEND" valueDate="2019-09-30T02:00:00"/>
       <column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
       <column name="CONTRACTSTART" valueDate="2018-10-01T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYQUARTER                  "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -20,9 +20,9 @@
       <column name="CONTRACTEND" valueDate="2018-09-15T02:00:00"/>
       <column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
       <column name="CONTRACTSTART" valueDate="2017-05-01T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYQUARTER                  "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -31,9 +31,9 @@
       <column name="CONTRACTEND" valueDate="2020-09-15T02:00:00"/>
       <column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYQUARTER                  "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -42,9 +42,9 @@
       <column name="CONTRACTEND" valueDate="2021-09-15T02:00:00"/>
       <column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYQUARTER                  "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -53,9 +53,9 @@
       <column name="CONTRACTEND" valueDate="2022-09-15T02:00:00"/>
       <column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYQUARTER                  "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -64,9 +64,9 @@
       <column name="CONTRACTEND" valueDate="2021-02-11T01:00:00"/>
       <column name="CONTRACTID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
       <column name="CONTRACTSTART" valueDate="2019-05-16T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL               "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
@@ -74,9 +74,9 @@
       <column name="CONTRACTDUE" valueDate="2020-06-01T02:00:00"/>
       <column name="CONTRACTID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
       <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYANNUAL                   "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYANNUAL"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -84,9 +84,9 @@
       <column name="CONTRACTEND" valueDate="2025-03-11T01:00:00"/>
       <column name="CONTRACTID" value="28234066-ad12-451d-9cd2-fbc9f8ee0412"/>
       <column name="CONTRACTSTART" valueDate="2019-03-11T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI                 "/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEMAIN                    "/>
-      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL               "/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEMAIN"/>
+      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -95,8 +95,8 @@
       <column name="CONTRACTEND" valueDate="2022-05-17T02:00:00"/>
       <column name="CONTRACTID" value="5fcfa9a9-2f3d-43f0-8be0-21241a5f2ec3"/>
       <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME                   "/>
-      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL               "/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/DESCRIPTIONTRANSLATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/DESCRIPTIONTRANSLATION.xml
index 96ae32d2f212853c4bb281465fe30123f7ce30f7..22fd89d8a7bbcd2c432c0a815a26e6d928945459 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/DESCRIPTIONTRANSLATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/DESCRIPTIONTRANSLATION.xml
@@ -5,21 +5,21 @@
     <insert tableName="DESCRIPTIONTRANSLATION">
       <column name="DESCRIPTION" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="DESCRIPTIONTRANSLATIONID" value="70108db9-2c27-438d-9dff-d01c8b54c8c7"/>
-      <column name="LANG" value="deu                                 "/>
+      <column name="LANG" value="deu"/>
       <column name="OBJECT_ROWID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="DESCRIPTIONTRANSLATION">
       <column name="DESCRIPTION" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="DESCRIPTIONTRANSLATIONID" value="91f7d8e8-136c-46de-8d01-ba231ebb49e3"/>
-      <column name="LANG" value="deu                                 "/>
+      <column name="LANG" value="deu"/>
       <column name="OBJECT_ROWID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="DESCRIPTIONTRANSLATION">
       <column name="DESCRIPTION" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="DESCRIPTIONTRANSLATIONID" value="020ca255-eae8-4771-a4a3-e62d6702f9f0"/>
-      <column name="LANG" value="deu                                 "/>
+      <column name="LANG" value="deu"/>
       <column name="OBJECT_ROWID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
index 726736b25a2a3fb2ee4666aef2fc7c4f4b1f159b..10e3160f427d2db10bd1eebdd8d7a5240aba3bd2 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
@@ -3,68 +3,68 @@
   <changeSet author="autogenerated" id="54251236-5624-493a-ac0b-f033dc0f904f">
     <delete tableName="DOCUMENTTEMPLATE"/>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="2                                   "/>
+      <column name="CLASSIFICATION" value="2"/>
       <column name="DATE_NEW" valueDate="2019-10-17T06:59:35"/>
       <column name="DESCRIPTION" value="Diese Email wird an Interessenten versendet, um ihnen erste Informationen zukommen zu lassen."/>
       <column name="DOCUMENTTEMPLATEID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="MAI                                 "/>
+      <column name="KIND" value="MAI"/>
       <column name="NAME" value="Erstkontakt meineFirma"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="2                                   "/>
+      <column name="CLASSIFICATION" value="2"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:00:37"/>
       <column name="DOCUMENTTEMPLATEID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="MAI                                 "/>
+      <column name="KIND" value="MAI"/>
       <column name="NAME" value="Telefonkonferenz-Einladung"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="7                                   "/>
+      <column name="CLASSIFICATION" value="7"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:01:34"/>
       <column name="DESCRIPTION" value="Fußtext mit Logo, Informationen und Links zu meineFirma."/>
       <column name="DOCUMENTTEMPLATEID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="TEX                                 "/>
+      <column name="KIND" value="TEX"/>
       <column name="NAME" value="footer_meineFrima"/>
       <column name="REPLACEMENTNAME" value="footermeineFirma"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="2                                   "/>
+      <column name="CLASSIFICATION" value="2"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:02:46"/>
       <column name="DOCUMENTTEMPLATEID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="LET                                 "/>
+      <column name="KIND" value="LET"/>
       <column name="NAME" value="Geschaeftspapiere"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="1                                   "/>
+      <column name="CLASSIFICATION" value="1"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:03:08"/>
       <column name="DOCUMENTTEMPLATEID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="LET                                 "/>
+      <column name="KIND" value="LET"/>
       <column name="NAME" value="Kostenübernahmeerklärung"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="1                                   "/>
+      <column name="CLASSIFICATION" value="1"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:03:22"/>
       <column name="DOCUMENTTEMPLATEID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="LET                                 "/>
+      <column name="KIND" value="LET"/>
       <column name="NAME" value="Standardbriefvorlage"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="2                                   "/>
+      <column name="CLASSIFICATION" value="2"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:03:43"/>
       <column name="DOCUMENTTEMPLATEID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="MAI                                 "/>
+      <column name="KIND" value="MAI"/>
       <column name="NAME" value="Erstkontakt ADITO"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -72,25 +72,25 @@
       <column name="DATE_NEW" valueDate="2019-10-17T07:04:35"/>
       <column name="DOCUMENTTEMPLATEID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="ATT                                 "/>
+      <column name="KIND" value="ATT"/>
       <column name="NAME" value="Rahmenvertrag"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="3                                   "/>
+      <column name="CLASSIFICATION" value="3"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:07:01"/>
       <column name="DOCUMENTTEMPLATEID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="TEX                                 "/>
+      <column name="KIND" value="TEX"/>
       <column name="NAME" value="Angebotskopftext mit Dank"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="DOCUMENTTEMPLATE">
-      <column name="CLASSIFICATION" value="4                                   "/>
+      <column name="CLASSIFICATION" value="4"/>
       <column name="DATE_NEW" valueDate="2019-10-17T07:10:02"/>
       <column name="DOCUMENTTEMPLATEID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="KIND" value="TEX                                 "/>
+      <column name="KIND" value="TEX"/>
       <column name="NAME" value="Angebotskopftext mit Dank"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
index fe43a1f509ffe4ce04079aeb5ea6c8df68787d34..23d8712a53828327e6d9eff8a16a445377b9dcd1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
@@ -5,7 +5,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-17T02:00:00"/>
       <column name="FORECASTID" value="2ba9de60-4c59-4441-96d8-2bee798b80fb"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="75000"/>
@@ -13,7 +13,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-09-23T02:00:00"/>
       <column name="FORECASTID" value="6e36057c-1cf3-442a-ab7c-d608195c4290"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="80000"/>
@@ -21,7 +21,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-12-23T01:00:00"/>
       <column name="FORECASTID" value="02f21967-1303-4a82-b4f7-3959097dca9c"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP2"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="25000"/>
@@ -29,7 +29,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2017-10-03T02:00:00"/>
       <column name="FORECASTID" value="fbddbffb-dca1-4a83-95ea-0c518ed63363"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="150000"/>
@@ -37,7 +37,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-10-17T02:00:00"/>
       <column name="FORECASTID" value="b17a9912-07d3-46b7-90e3-cc912f3d85d8"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="25000"/>
@@ -45,7 +45,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-22T02:00:00"/>
       <column name="FORECASTID" value="3379d40c-a21c-42ba-a9db-29eef26fcb35"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP1"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="100000"/>
@@ -53,7 +53,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2018-04-17T02:00:00"/>
       <column name="FORECASTID" value="5470f7bb-5917-4c11-8c24-b6c91cf4bd29"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="250000"/>
@@ -61,7 +61,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2016-05-02T02:00:00"/>
       <column name="FORECASTID" value="b161df55-a04b-484f-b337-5e83bf4f38d3"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="100000"/>
@@ -69,7 +69,7 @@
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-23T02:00:00"/>
       <column name="FORECASTID" value="a537b090-4292-446f-bdec-db491023a6bf"/>
-      <column name="GROUPCODE" value="PRODUCTSERVICE                      "/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="100000"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
index 767d7ac11202a86a4ada1691a433a77adcfd6348..bde2224293dc87dfd5939d43babd710eda368b22 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
@@ -5,7 +5,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEPROJMANAG                    "/>
+      <column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
       <column name="OBJECTMEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -13,7 +13,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEPROJASSIST                   "/>
+      <column name="MEMBERROLE" value="MEMROLEPROJASSIST"/>
       <column name="OBJECTMEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -29,7 +29,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEPROJMANAG                    "/>
+      <column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
       <column name="OBJECTMEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -37,7 +37,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEADVISE                       "/>
+      <column name="MEMBERROLE" value="MEMROLEADVISE"/>
       <column name="OBJECTMEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -53,7 +53,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEADVISE                       "/>
+      <column name="MEMBERROLE" value="MEMROLEADVISE"/>
       <column name="OBJECTMEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -61,7 +61,7 @@
     <insert tableName="OBJECTMEMBER">
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="DECIDER" valueNumeric="0"/>
-      <column name="MEMBERROLE" value="MEMROLEEXSALEMANAG                  "/>
+      <column name="MEMBERROLE" value="MEMROLEEXSALEMANAG"/>
       <column name="OBJECTMEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
index 67f44f26d2ab433b209392ad1dcff15cb5a535e5..fd4c3a8bb2a24c2943874af913400106858c6450 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
@@ -5,9 +5,9 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="210.00"/>
@@ -16,9 +16,9 @@
       <column name="OFFERCODE" valueNumeric="1005"/>
       <column name="OFFERDATE" valueDate="2019-05-16T02:00:00"/>
       <column name="OFFERID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -26,10 +26,10 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T08:26:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:23:52"/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="3500.00"/>
@@ -38,9 +38,9 @@
       <column name="OFFERCODE" valueNumeric="1006"/>
       <column name="OFFERDATE" valueDate="2019-03-08T01:00:00"/>
       <column name="OFFERID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
-      <column name="PROBABILITY" value="25                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="25"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -49,7 +49,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T11:01:46"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:27:21"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
@@ -60,8 +60,8 @@
       <column name="OFFERCODE" valueNumeric="1007"/>
       <column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="OFFERID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -70,9 +70,9 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:03:46"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="192500.00"/>
@@ -81,9 +81,9 @@
       <column name="OFFERCODE" valueNumeric="1008"/>
       <column name="OFFERDATE" valueDate="2019-02-22T01:00:00"/>
       <column name="OFFERID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -91,10 +91,10 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:43:39"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:27:12"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="175000.00"/>
@@ -103,9 +103,9 @@
       <column name="OFFERCODE" valueNumeric="1009"/>
       <column name="OFFERDATE" valueDate="2018-08-14T02:00:00"/>
       <column name="OFFERID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
-      <column name="PROBABILITY" value="75                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="PROBABILITY" value="75"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -114,9 +114,9 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="17500.00"/>
@@ -125,9 +125,9 @@
       <column name="OFFERCODE" valueNumeric="1010"/>
       <column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="OFFERID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
-      <column name="PROBABILITY" value="25                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="25"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -135,7 +135,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-22T11:40:03"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:&#10;&#10;Produkt: &#10;Produkt:"/>
       <column name="ISOLANGUAGE" value="deu"/>
@@ -145,9 +145,9 @@
       <column name="OFFERCODE" valueNumeric="1011"/>
       <column name="OFFERDATE" valueDate="2017-07-11T02:00:00"/>
       <column name="OFFERID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="10165.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -155,9 +155,9 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="45000.00"/>
@@ -166,9 +166,9 @@
       <column name="OFFERCODE" valueNumeric="1012"/>
       <column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="OFFERID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="8550.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -176,10 +176,10 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T11:33:16"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="HEADER" value="Für die bisherigen Gespräche möchten wir uns bei Ihnen bedanken. Gerne bieten wir Ihnen wie folgt an:&#10;&#10;"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="25000.00"/>
@@ -188,9 +188,9 @@
       <column name="OFFERCODE" valueNumeric="1013"/>
       <column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="OFFERID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
-      <column name="PROBABILITY" value="75                                  "/>
-      <column name="STATUS" value="OFFERSTATOPEN                       "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="75"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="4750.00"/>
@@ -199,7 +199,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="210.00"/>
@@ -208,8 +208,8 @@
       <column name="OFFERCODE" valueNumeric="1000"/>
       <column name="OFFERDATE" valueDate="2018-11-21T01:00:00"/>
       <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
-      <column name="PROBABILITY" value="100                                 "/>
-      <column name="STATUS" value="OFFERSTATSENT                       "/>
+      <column name="PROBABILITY" value="100"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -217,7 +217,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
@@ -226,8 +226,8 @@
       <column name="OFFERCODE" valueNumeric="1001"/>
       <column name="OFFERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATSENT                       "/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -235,7 +235,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="630.00"/>
@@ -244,8 +244,8 @@
       <column name="OFFERCODE" valueNumeric="1002"/>
       <column name="OFFERDATE" valueDate="2018-06-14T02:00:00"/>
       <column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="75                                  "/>
-      <column name="STATUS" value="OFFERSTATSENT                       "/>
+      <column name="PROBABILITY" value="75"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="119.70"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -253,7 +253,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
@@ -262,8 +262,8 @@
       <column name="OFFERCODE" valueNumeric="1003"/>
       <column name="OFFERDATE" valueDate="2018-02-23T01:00:00"/>
       <column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="0                                   "/>
-      <column name="STATUS" value="OFFERSTATCHECK                      "/>
+      <column name="PROBABILITY" value="0"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -271,7 +271,7 @@
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="840.00"/>
@@ -280,8 +280,8 @@
       <column name="OFFERCODE" valueNumeric="1004"/>
       <column name="OFFERDATE" valueDate="2017-11-09T01:00:00"/>
       <column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="50                                  "/>
-      <column name="STATUS" value="OFFERSTATCHECK                      "/>
+      <column name="PROBABILITY" value="50"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="159.60"/>
       <column name="VERSNR" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
index 29d75bb01a7604679fe1932925d30aa573001c76..ed034f2ca8a0792e80d561d724285c083b959ed9 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
@@ -3,7 +3,7 @@
   <changeSet author="autogenerated" id="6a69559d-4a35-4c1e-bb85-88ad03b22d8a">
     <delete tableName="OFFERITEM"/>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +13,12 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +27,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +40,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +53,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +66,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +79,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +92,10 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +105,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +119,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +133,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +147,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +161,12 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +175,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +188,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +201,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +214,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +227,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -240,11 +240,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="8"/>
@@ -253,10 +253,10 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -266,10 +266,10 @@
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -280,10 +280,10 @@
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Turbolader"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -293,10 +293,10 @@
       <column name="PRICE" valueNumeric="3500.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -307,11 +307,11 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="QUANTITY" valueNumeric="5.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="DISCOUNT" valueNumeric="5.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="Förderanlage"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -321,10 +321,10 @@
       <column name="PRICE" valueNumeric="150000.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="ITEMNAME" value="Stahlträger Standard"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -335,10 +335,10 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="QUANTITY" valueNumeric="10.00"/>
-      <column name="UNIT" value="QUANTITYKGS                         "/>
+      <column name="UNIT" value="QUANTITYKGS"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -348,10 +348,10 @@
       <column name="PRICE" valueNumeric="150.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="QUANTITY" valueNumeric="1000.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -361,10 +361,10 @@
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -374,10 +374,10 @@
       <column name="PRICE" valueNumeric="15000.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Vollstange"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -387,10 +387,10 @@
       <column name="PRICE" valueNumeric="250.00"/>
       <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="QUANTITY" valueNumeric="10.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -400,11 +400,11 @@
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ITEMNAME" value="Service Einsatz"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -414,11 +414,11 @@
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -428,11 +428,11 @@
       <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Ersatzteil 1"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -442,11 +442,11 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 1"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -457,11 +457,11 @@
       <column name="PRICE" valueNumeric="10000.00"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYKGS                         "/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -471,11 +471,11 @@
       <column name="PRICE" valueNumeric="30000.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 5"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -485,7 +485,7 @@
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
index 0f26dbccc74d41d6a76009a0fcf362f654cf689b..7d169665013374e4b67b714eafba54f3443c3d02 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
@@ -7,7 +7,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T01:56:19"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
       <column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Industrial Steel AG"/>
       <column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -18,7 +18,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-28T08:00:12"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
       <column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen.  Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Transatlantik Logistics GmbH"/>
       <column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -28,7 +28,7 @@
       <column name="CUSTOMERCODE" value="1236"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
       <column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Skyscraper Bau GmbH"/>
       <column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="USER_NEW" value="Admin"/>
@@ -45,7 +45,7 @@
     <insert tableName="ORGANISATION">
       <column name="CUSTOMERCODE" value="4545"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="JPM Touristik GmbH"/>
       <column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="USER_NEW" value="Admin"/>
@@ -55,7 +55,7 @@
       <column name="DATE_EDIT" valueDate="2019-06-07T02:38:00"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
       <column name="INFO" value="Automobilvermietung"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Sevent SE"/>
       <column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -74,7 +74,7 @@
       <column name="CUSTOMERCODE" value="3232"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:38:18"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="SuperBauer AG"/>
       <column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -84,7 +84,7 @@
       <column name="CUSTOMERCODE" value="4758"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:37:12"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Grobbe-Werk GmbH"/>
       <column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -102,7 +102,7 @@
     <insert tableName="ORGANISATION">
       <column name="CUSTOMERCODE" value="4567"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Firmengruppe Matthias Bogen"/>
       <column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="USER_NEW" value="Admin"/>
@@ -111,7 +111,7 @@
       <column name="CUSTOMERCODE" value="3469"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:36:31"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
-      <column name="KIND" value="ORGMANUF                            "/>
+      <column name="KIND" value="ORGMANUF"/>
       <column name="NAME" value="Aquire GmbH"/>
       <column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -121,7 +121,7 @@
       <column name="CUSTOMERCODE" value="6354"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:37:36"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
-      <column name="KIND" value="ORGMANUF                            "/>
+      <column name="KIND" value="ORGMANUF"/>
       <column name="NAME" value="Netro AG"/>
       <column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -131,7 +131,7 @@
       <column name="CUSTOMERCODE" value="1212"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:36:56"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="Glob Group"/>
       <column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -141,7 +141,7 @@
       <column name="CUSTOMERCODE" value="6758"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:37:48"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
-      <column name="KIND" value="ORGPARTNER                          "/>
+      <column name="KIND" value="ORGPARTNER"/>
       <column name="NAME" value="Schild AG"/>
       <column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -151,7 +151,7 @@
       <column name="CUSTOMERCODE" value="0001"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:35:38"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="meine Firma"/>
       <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -195,9 +195,9 @@
     </insert>
     <insert tableName="ORGANISATION">
       <column name="DATE_NEW" valueDate="2019-08-29T02:43:16"/>
-      <column name="KIND" value="ORGCUTOMER                          "/>
+      <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="privat"/>
-      <column name="ORGANISATIONID" value="0                                   "/>
+      <column name="ORGANISATIONID" value="0"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
index bc215387dad66f51cae3a64fdc7fa7204c10f4fe..6056a90358b7e30d4c12a5a08446f26b80923ad5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
@@ -7,7 +7,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:02:01"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Peter"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Pfiffig"/>
       <column name="PERSONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/9052404f642301dfa02140a5dc34b592"/>
@@ -20,7 +20,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:02:24"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Lisa"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Sommer"/>
       <column name="PERSONID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/58d526fe1ec32f07facc7c52e04619b3"/>
@@ -33,7 +33,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:01:41"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Franz"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Müller"/>
       <column name="PERSONID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/cdd7846a9bc763c20ff79b7559a015a1"/>
@@ -46,7 +46,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:01:09"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Birgit"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Leicht"/>
       <column name="PERSONID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/75df8e492ebe7d8363abd71906e2c471"/>
@@ -59,7 +59,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:12:40"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Ludwig"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Kanzler"/>
       <column name="PERSONID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
       <column name="SALUTATION" value="Herr"/>
@@ -71,7 +71,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:10:37"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Jerome"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Grüner"/>
       <column name="PERSONID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
       <column name="SALUTATION" value="Monsieur"/>
@@ -83,7 +83,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:01:51"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Herbert"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Obermeier"/>
       <column name="PERSONID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/9386121ffea926a30b9fa54870968dd1"/>
@@ -96,7 +96,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T04:02:10"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Harold"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Smith"/>
       <column name="PERSONID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
@@ -109,7 +109,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T03:57:28"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="FIRSTNAME" value="Susanne"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Lustig"/>
       <column name="PERSONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/5dbfcfef4e102c68982c8dccc390f3e0"/>
@@ -122,7 +122,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-29T03:56:17"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="FIRSTNAME" value="Tim"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Admin"/>
       <column name="PERSONID" value="b16282bd-254e-4569-a56e-675449821467"/>
       <column name="PICTURE" valueBlobFile="PERSON/PICTURE/blobFiles/fb4e7cd5e2815300d1858079eadae3ca"/>
@@ -134,7 +134,7 @@
       <column name="DATEOFBIRTH" valueDate="1980-05-12"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
       <column name="FIRSTNAME" value="Peter"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Macher"/>
       <column name="PERSONID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
       <column name="SALUTATION" value="Herr"/>
@@ -144,7 +144,7 @@
       <column name="DATEOFBIRTH" valueDate="1987-03-04"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
       <column name="FIRSTNAME" value="Anja"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Lindner"/>
       <column name="PERSONID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
       <column name="SALUTATION" value="Frau"/>
@@ -154,7 +154,7 @@
       <column name="DATEOFBIRTH" valueDate="1975-01-01"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
       <column name="FIRSTNAME" value="Andreas"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Tannenbaum"/>
       <column name="PERSONID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
       <column name="SALUTATION" value="Herr"/>
@@ -164,7 +164,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:03:46"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
       <column name="FIRSTNAME" value="Markus"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Altinger"/>
       <column name="PERSONID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="SALUTATION" value="Herr"/>
@@ -174,7 +174,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
       <column name="FIRSTNAME" value="Petra"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Solano"/>
       <column name="PERSONID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="SALUTATION" value="Frau"/>
@@ -183,7 +183,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
       <column name="FIRSTNAME" value="Albert"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Zweistein"/>
       <column name="PERSONID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
       <column name="SALUTATION" value="Herr"/>
@@ -192,7 +192,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
       <column name="FIRSTNAME" value="Robin"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Scherbatsky"/>
       <column name="PERSONID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="SALUTATION" value="Frau"/>
@@ -201,7 +201,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
       <column name="FIRSTNAME" value="Ted"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Mosby"/>
       <column name="PERSONID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="SALUTATION" value="Herr"/>
@@ -210,7 +210,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
       <column name="FIRSTNAME" value="Lorenzo"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="von Matterhorn"/>
       <column name="PERSONID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="SALUTATION" value="Herr"/>
@@ -220,7 +220,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:08:44"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:06:16"/>
       <column name="FIRSTNAME" value="Marshel"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Ericson"/>
       <column name="PERSONID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="SALUTATION" value="Herr"/>
@@ -232,7 +232,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:18:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
       <column name="FIRSTNAME" value="Andreas"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Morgenstern"/>
       <column name="PERSONID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
       <column name="SALUTATION" value="Herr"/>
@@ -244,7 +244,7 @@
       <column name="DATE_EDIT" valueDate="2019-05-19T08:05:12"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:41:41"/>
       <column name="FIRSTNAME" value="Chloe"/>
-      <column name="GENDER" value="f                                   "/>
+      <column name="GENDER" value="f"/>
       <column name="LASTNAME" value="Decker"/>
       <column name="PERSONID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="SALUTATION" value="Frau"/>
@@ -256,7 +256,7 @@
       <column name="DATEOFBIRTH" valueDate="1978-06-08"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
       <column name="FIRSTNAME" value="Daniel"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Vortrefflich"/>
       <column name="PERSONID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
       <column name="SALUTATION" value="Herr"/>
@@ -265,7 +265,7 @@
     <insert tableName="PERSON">
       <column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
       <column name="FIRSTNAME" value="Peter"/>
-      <column name="GENDER" value="m                                   "/>
+      <column name="GENDER" value="m"/>
       <column name="LASTNAME" value="Steiger"/>
       <column name="PERSONID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
       <column name="SALUTATION" value="Herr"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
index ad6afb792814b888036f882c40e15b74b9baa5a9..65e64e3028301a796381bc419d2808cf7b647ea6 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
@@ -6,13 +6,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="12"/>
       <column name="PRODUCTCODE" value="ET1006"/>
       <column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="PRODUCTNAME" value="Ersatzteil 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -20,13 +20,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:13:42"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="10"/>
       <column name="PRODUCTCODE" value="ET1005"/>
       <column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="PRODUCTNAME" value="Ersatzteil 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -34,13 +34,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:14:05"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="15"/>
       <column name="PRODUCTCODE" value="ET1004"/>
       <column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="PRODUCTNAME" value="Ersatzteil 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -48,13 +48,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:14:32"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="50"/>
       <column name="PRODUCTCODE" value="ET1009"/>
       <column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="PRODUCTNAME" value="Ersatzteil 4"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -62,12 +62,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:22:20"/>
       <column name="DATE_NEW" valueDate="2019-05-22T11:20:28"/>
-      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="PRODUCTCODE" value="DL1005"/>
       <column name="PRODUCTID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="PRODUCTNAME" value="Beratungsdienstleistung"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -75,13 +75,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="MINSTOCK" valueNumeric="10"/>
       <column name="PRODUCTCODE" value="WG0001"/>
       <column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYKGS                         "/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -89,12 +89,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2002"/>
       <column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -102,12 +102,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2003"/>
       <column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -115,12 +115,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:53:18"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2004"/>
       <column name="PRODUCTID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="PRODUCTNAME" value="WG2 Proudkt 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -128,12 +128,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:23:33"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2005"/>
       <column name="PRODUCTID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 4"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -141,36 +141,36 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:25:18"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2006"/>
       <column name="PRODUCTID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 5"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="PRODUCT">
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:30:01"/>
-      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="PRODUCTCODE" value="DL1001"/>
       <column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="PRODUCTNAME" value="Service Einsatz"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="PRODUCT">
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:32:19"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="PRODUCTCODE" value="WG1005"/>
       <column name="PRODUCTID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -178,12 +178,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:34:44"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="PRODUCTCODE" value="WG1003"/>
       <column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -191,12 +191,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:18"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:37:31"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3001"/>
       <column name="PRODUCTID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="PRODUCTNAME" value="WG3 Produkt A"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -204,12 +204,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:27"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:39:37"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3002"/>
       <column name="PRODUCTID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="PRODUCTNAME" value="WG3 Produkt B"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -217,12 +217,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:35"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:45:10"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3003"/>
       <column name="PRODUCTID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="PRODUCTNAME" value="WG3 Produkt C"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
index 4fe2483d16ba1a66189630057818bdfdd4c9633d..8ad78bc4265f83620d74d0cd1b3aa1fcc0182b9b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
@@ -4,10 +4,10 @@
     <delete tableName="PRODUCTPRICE"/>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1060.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="c5b5bfce-2bec-4601-ba43-2567209bea04"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="VALID_FROM" valueDate="2018-11-01T01:00:00"/>
@@ -16,10 +16,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1500.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="c0769e98-bf18-444c-92b0-fc5d17613ea8"/>
       <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -27,10 +27,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="443b9532-7a41-481a-8f95-ffaf5e7949af"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -38,10 +38,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a75cc2e2-bb81-4e9f-9fa4-95c8531e966d"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -49,10 +49,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="bb425e07-4238-4cb7-b20b-a0ba4ed8b1ae"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -60,10 +60,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="7500.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="ad57ee30-4afe-4426-912b-c0b9d03107f7"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -71,10 +71,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a9b9097a-f664-4114-aa0a-ff2a01dddd04"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -82,10 +82,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="20000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
       <column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -93,10 +93,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="43fa161c-0f85-4915-89be-6bb442143506"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -105,10 +105,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="4028dfb7-d0e4-493e-9676-6f14a24a9507"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -117,10 +117,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="f90ff3d2-3e62-4b6f-bcfb-db4d4ecd8de8"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -130,10 +130,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="75365b30-fd09-4255-b1d7-f4c91e9d255e"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -143,10 +143,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="1c5b6a5a-4aa0-499e-994f-278c7bdf87bf"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -156,10 +156,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="15000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="bf8ef6ac-9f34-40fd-aa2e-9792fee9a970"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -168,10 +168,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="35000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="24d65d20-bf5c-474d-8351-2788431e0e1a"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -179,10 +179,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="50000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="df9fe0b0-4f16-4592-8066-fe9b3f41fdc1"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -190,10 +190,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="71d5a323-12d8-4d1b-8de6-6a7bf81d0b61"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -201,10 +201,10 @@
     </insert>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="abfa7e4d-bd88-4186-a7ae-26385ea1d91c"/>
       <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -213,10 +213,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="ead04c9b-955e-4595-bb31-31685b3ceaec"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
@@ -226,10 +226,10 @@
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="150000.00"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT                    "/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="2749f80a-f09b-4153-97dd-2284253e8228"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
index 2a4b5a2fe2ca5db29fe06ed37fcbb4e60adcc8ba..ab10ac6897657ef3d26645bb9b6952a024af3ad6 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
@@ -5,15 +5,15 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="210.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPECONF                         "/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="SALESORDERCODE" valueNumeric="1000"/>
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
@@ -23,19 +23,19 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="DUNNINGDATE" valueDate="2019-09-01T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="1                                   "/>
+      <column name="DUNNINGLEVEL" value="1"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO                         "/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="PAID" valueNumeric="300"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1001"/>
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
@@ -45,16 +45,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="1"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="630.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPECRED                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
       <column name="PAYDATE" valueDate="2018-07-25T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="SALESORDERCODE" valueNumeric="1002"/>
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
@@ -64,16 +64,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPECANC                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECANC"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1003"/>
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
@@ -83,16 +83,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPENOTE                         "/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1004"/>
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
@@ -102,16 +102,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="210.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPECANC                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECANC"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="SALESORDERCODE" valueNumeric="1005"/>
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
@@ -121,16 +121,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="1"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPECRED                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1006"/>
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
@@ -140,19 +140,19 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="DUNNINGDATE" valueDate="2019-08-25T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2                                   "/>
+      <column name="DUNNINGLEVEL" value="2"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="630.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO                         "/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="PAID" valueNumeric="545"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="SALESORDERCODE" valueNumeric="1007"/>
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
@@ -162,15 +162,15 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPECONF                         "/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1008"/>
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
@@ -180,16 +180,16 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="420.00"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPENOTE                         "/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="SALESORDERCODE" valueNumeric="1009"/>
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
@@ -199,18 +199,18 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="CURRENCY" value="EUR                                 "/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="DUNNINGDATE" valueDate="2019-08-25T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2                                   "/>
+      <column name="DUNNINGLEVEL" value="2"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="0.00"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO                         "/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="PAID" valueNumeric="0"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="SALESORDERCODE" valueNumeric="1010"/>
       <column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
@@ -220,9 +220,9 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="1"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX                           "/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
       <column name="FOOTER" value="Unsere Zahlungkonditionen finden sie hier:"/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
@@ -231,10 +231,10 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPENOTE                         "/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
       <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1011"/>
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
@@ -244,9 +244,9 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="1"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="3500.00"/>
@@ -254,10 +254,10 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPECRED                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
       <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT                     "/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="SALESORDERCODE" valueNumeric="1012"/>
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
@@ -267,11 +267,11 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="DUNNINGDATE" valueDate="2019-07-13T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="1                                   "/>
+      <column name="DUNNINGLEVEL" value="1"/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:&#10;&#10;Produkt: &#10;Produkt:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="53500.00"/>
@@ -279,11 +279,11 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO                         "/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="PAID" valueNumeric="10000"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
       <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30                           "/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="SALESORDERCODE" valueNumeric="1013"/>
       <column name="SALESORDERDATE" valueDate="2019-06-14T02:00:00"/>
       <column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
@@ -293,11 +293,11 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DELIVERYADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF                          "/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="DUNNINGDATE" valueDate="2019-05-29T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2                                   "/>
+      <column name="DUNNINGLEVEL" value="2"/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="175000.00"/>
@@ -305,11 +305,11 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO                         "/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
       <column name="PAID" valueNumeric="40000"/>
       <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
       <column name="PAYMENTADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="SALESORDERCODE" valueNumeric="1014"/>
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
@@ -319,9 +319,9 @@
     <insert tableName="SALESORDER">
       <column name="CANCELLATION" valueNumeric="0"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="CURRENCY" value="EUR                                 "/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="DELIVERYADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
-      <column name="DELIVERYTERMS" value="FREE                                "/>
+      <column name="DELIVERYTERMS" value="FREE"/>
       <column name="DUNNINGTEXT" value="Bitte zahlen Sie den ausstehenden Betrag, dies ist die erste/zweite Mahnung."/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
@@ -329,10 +329,10 @@
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPECONF                         "/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
       <column name="PAYDUEDATE" valueDate="2018-09-18T12:00:00"/>
       <column name="PAYMENTADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7                            "/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="SALESORDERCODE" valueNumeric="1015"/>
       <column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
       <column name="SALESORDERID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
index e5b7464367748235a8d50f40ee8d5301929f45a4..d20819f671cf833c579d9f5ed5fd5f2e64efa1a8 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
@@ -3,7 +3,7 @@
   <changeSet author="autogenerated" id="bb5d1400-0c1a-46dc-aa50-87a7d5a3fcdc">
     <delete tableName="SALESORDERITEM"/>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +13,12 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +27,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +40,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +53,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +66,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="8c60146f-e950-47ad-8fed-d7bb88947789"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +79,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="21ee4b39-876e-44a8-8153-dc7f38957fc7"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +92,10 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="f268cf96-7ba6-44aa-8357-42e0469afe79"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +105,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="ed7dcd27-0369-4196-894c-bfcce94b9e73"/>
       <column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +119,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
       <column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +133,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="3b25eeb9-ea52-4c62-a22c-041a1a2a41c2"/>
       <column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +147,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
       <column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +161,12 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +175,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +188,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +201,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +214,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +227,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -240,10 +240,10 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -253,11 +253,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
       <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -267,11 +267,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
       <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -281,11 +281,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
       <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -295,11 +295,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
       <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Turbolader"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -309,10 +309,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -323,10 +323,10 @@
       <column name="QUANTITY" valueNumeric="5.00"/>
       <column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -336,10 +336,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="b4f02784-4593-4caf-a845-40b426d00082"/>
       <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -350,10 +350,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="001410e8-f70b-4041-901c-02275ff6deb5"/>
       <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -363,11 +363,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="e53aaecf-d8b6-4327-96cb-66f004e4b5fb"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ITEMNAME" value="Service Einsatz"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -377,11 +377,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="cd7c9255-0de8-4b15-a952-caf9669b447a"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="QUANTITYHOUR                        "/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -391,11 +391,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="468023b8-fb3e-4e4c-9d30-841d12888b73"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -405,10 +405,10 @@
       <column name="QUANTITY" valueNumeric="1000.00"/>
       <column name="SALESORDERITEMID" value="b5f17aaa-ffa7-4c8e-bbcb-d51cfecb06db"/>
       <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -418,7 +418,7 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="39da8def-662f-4904-b9bf-b4e97affbeb7"/>
       <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
-      <column name="UNIT" value="QUANTITYPIECES                      "/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
index dac3214d98e4af0362c92d7f52217de997c5199d..6b5a45fc0f1263bd679131e42eb0cbbe63050c80 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
@@ -5,61 +5,61 @@
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="ENDDATE" valueDate="2020-05-16T02:00:00"/>
-      <column name="PHASE" value="SALPROJPHASEMQC                     "/>
-      <column name="PROBABILITY" value="SALPROJPROB25                       "/>
+      <column name="PHASE" value="SALPROJPHASEMQC"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1002"/>
       <column name="PROJECTTITLE" value="Erstprojekt"/>
       <column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="STARTDATE" valueDate="2019-05-16T02:00:00"/>
-      <column name="STATUS" value="SALPROJSTATOPEN                     "/>
+      <column name="STATUS" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="200000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
-      <column name="PHASE" value="SALPROJPHASESAL                     "/>
-      <column name="PROBABILITY" value="SALPROJPROB25                       "/>
+      <column name="PHASE" value="SALPROJPHASESAL"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1003"/>
       <column name="PROJECTTITLE" value="Skyscraper / Pilotprojekt"/>
       <column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
-      <column name="STATUS" value="SALPROJSTATOPEN                     "/>
+      <column name="STATUS" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="120000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
-      <column name="PHASE" value="SALPROJPHASESQO                     "/>
-      <column name="PROBABILITY" value="SALPROJPROB25                       "/>
+      <column name="PHASE" value="SALPROJPHASESQO"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1004"/>
       <column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
       <column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
-      <column name="STATUS" value="SALPROJSTATOPEN                     "/>
+      <column name="STATUS" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="250000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-      <column name="PHASE" value="SALPROJPHASENEGO                    "/>
-      <column name="PROBABILITY" value="SALPROJPROB50                       "/>
+      <column name="PHASE" value="SALPROJPHASENEGO"/>
+      <column name="PROBABILITY" value="SALPROJPROB50"/>
       <column name="PROJECTCODE" valueNumeric="1005"/>
       <column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
       <column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="STARTDATE" valueDate="2017-05-16T02:00:00"/>
-      <column name="STATUS" value="SALPROJSTATOPEN                     "/>
+      <column name="STATUS" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="350000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-      <column name="PHASE" value="SALPROJPHASESQO                     "/>
-      <column name="PROBABILITY" value="SALPROJPROB50                       "/>
+      <column name="PHASE" value="SALPROJPHASESQO"/>
+      <column name="PROBABILITY" value="SALPROJPROB50"/>
       <column name="PROJECTCODE" valueNumeric="1006"/>
       <column name="PROJECTTITLE" value="Buchner Neuprojekt"/>
       <column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="STARTDATE" valueDate="2016-02-05T01:00:00"/>
-      <column name="STATUS" value="SALPROJSTATOPEN                     "/>
+      <column name="STATUS" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="450000.00"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
index 3c69bcf8188874641f410255327f9de67935e549..7228bf423c5907f9d344f1edbd91af8bb4bf74b3 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -6,14 +6,14 @@
       <column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
       <column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASENQC                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-06-15T01:34:58"/>
       <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
     </insert>
@@ -21,7 +21,7 @@
       <column name="DATE_END" valueDate="2019-05-10T08:08:07"/>
       <column name="DATE_START" valueDate="2019-04-25T08:08:07"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASENQC                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
     </insert>
@@ -29,7 +29,7 @@
       <column name="DATE_END" valueDate="2019-06-17T08:08:07"/>
       <column name="DATE_START" valueDate="2019-05-10T08:08:07"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
       <column name="PARENT_ID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
@@ -37,7 +37,7 @@
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-06-17T08:08:07"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESAL                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
       <column name="PARENT_ID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
@@ -45,7 +45,7 @@
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-17T08:08:08"/>
       <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="5189697c-5dbf-4d10-a163-dfde87e490ab"/>
     </insert>
@@ -53,14 +53,14 @@
       <column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
       <column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESAL                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
       <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="d77dc2ae-f12d-49ac-9a8f-ee0b5086f6ef"/>
     </insert>
@@ -68,14 +68,14 @@
       <column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
       <column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESAL                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
       <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/>
     </insert>
@@ -83,14 +83,14 @@
       <column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESQO                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
       <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-06-19T08:08:07"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
       <column name="PARENT_ID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
       <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
@@ -98,7 +98,7 @@
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
       <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
       <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
     </insert>
@@ -106,7 +106,7 @@
       <column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
       <column name="DATE_START" valueDate="2019-06-01T10:18:10"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER                   "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
       <column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
@@ -114,7 +114,7 @@
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASENEGO                    "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASENEGO"/>
       <column name="PARENT_ID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
@@ -122,7 +122,7 @@
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESQO                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
       <column name="PARENT_ID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
@@ -131,7 +131,7 @@
       <column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
       <column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC                     "/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
       <column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_TOUCHPOINT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_TOUCHPOINT.xml
index 89d018c764945df27ef8c87d09abc8e23a9bd7d0..a97099aa02d6de5a39ba8608077a590f66471921 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_TOUCHPOINT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_TOUCHPOINT.xml
@@ -7,40 +7,40 @@
       <column name="INFO" value="Kontakt über die Webseite"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="2290111c-005b-4602-8adb-fb13844e065f"/>
-      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB                     "/>
+      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
     </insert>
     <insert tableName="SALESPROJECT_TOUCHPOINT">
       <column name="ENTRYDATE" valueDate="2019-05-17T08:23:27"/>
       <column name="INFO" value="Besuch bei der Messe"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="a3e94450-561f-43a8-bdec-64b093056187"/>
-      <column name="TOUCHPOINT" value="SALPROJSCFAIR                       "/>
+      <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_TOUCHPOINT">
       <column name="ENTRYDATE" valueDate="2019-03-12T01:00:00"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="d178bb9e-0b6f-4f61-ac5e-f29b14488185"/>
-      <column name="TOUCHPOINT" value="SALPROJSCFAIR                       "/>
+      <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_TOUCHPOINT">
       <column name="ENTRYDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="f42c0831-5f10-4b32-af21-62b334fd21d7"/>
-      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB                     "/>
+      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
     </insert>
     <insert tableName="SALESPROJECT_TOUCHPOINT">
       <column name="ENTRYDATE" valueDate="2019-05-23T10:19:16"/>
       <column name="INFO" value="Die relevanten AP's waren am Stand. Hatten ein sehr produktives Gespräch."/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
-      <column name="TOUCHPOINT" value="SALPROJSCFAIR                       "/>
+      <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_TOUCHPOINT">
       <column name="ENTRYDATE" valueDate="2019-05-23T10:33:18"/>
       <column name="INFO" value="Erster Kontakt mit uns."/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
-      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB                     "/>
+      <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml
index f805d833856ae5aea033d4b37c95d04867db5257..81fc570dd45b06aa2050a8880c4ded49d93ab192 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml
@@ -8,7 +8,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr {ln}"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="1"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -17,7 +17,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Bürgermeister"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="2"/>
       <column name="TITLE" value="Bürgermeister"/>
     </insert>
@@ -27,7 +27,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrte Frau {ln}"/>
       <column name="SALUTATION" value="Frau"/>
       <column name="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="3"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -42,7 +42,7 @@
       <column name="LETTERSALUTATION" value="Dear Dr.  {ln}"/>
       <column name="SALUTATION" value="Mr."/>
       <column name="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="5"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -52,7 +52,7 @@
       <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
       <column name="SALUTATION" value="Mrs."/>
       <column name="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="6"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -68,7 +68,7 @@
       <column name="LETTERSALUTATION" value="Monsieur"/>
       <column name="SALUTATION" value="Monsieur"/>
       <column name="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="8"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -77,7 +77,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. {ln}"/>
       <column name="SALUTATION" value="Frau"/>
       <column name="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="9"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -87,7 +87,7 @@
       <column name="LETTERSALUTATION" value="Monsieur Prof."/>
       <column name="SALUTATION" value="Monsieur"/>
       <column name="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Prof."/>
     </insert>
@@ -97,7 +97,7 @@
       <column name="LETTERSALUTATION" value="Monsieur Dr."/>
       <column name="SALUTATION" value="Monsieur"/>
       <column name="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="11"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -107,7 +107,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="12"/>
       <column name="TITLE" value="Professor"/>
     </insert>
@@ -117,7 +117,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. {ln}"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="13"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -127,7 +127,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsident"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="14"/>
       <column name="TITLE" value="Präsident"/>
     </insert>
@@ -137,7 +137,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="15"/>
       <column name="TITLE" value="Prof. Dr."/>
     </insert>
@@ -147,7 +147,7 @@
       <column name="LETTERSALUTATION" value="Dear Mr. {ln}"/>
       <column name="SALUTATION" value="Mr."/>
       <column name="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="16"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -156,7 +156,7 @@
       <column name="LETTERSALUTATION" value="Dear Professor {ln}"/>
       <column name="SALUTATION" value="Mr."/>
       <column name="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="17"/>
       <column name="TITLE" value="Professor"/>
     </insert>
@@ -166,7 +166,7 @@
       <column name="LETTERSALUTATION" value="Dear Mrs. {ln}"/>
       <column name="SALUTATION" value="Mrs."/>
       <column name="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="18"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -175,7 +175,7 @@
       <column name="LETTERSALUTATION" value="Madame"/>
       <column name="SALUTATION" value="Madame"/>
       <column name="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="19"/>
     </insert>
     <insert tableName="SALUTATION">
@@ -190,7 +190,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="21"/>
       <column name="TITLE" value="Prof."/>
     </insert>
@@ -200,7 +200,7 @@
       <column name="LETTERSALUTATION" value="Monsieur Prof.Dr."/>
       <column name="SALUTATION" value="Monsieur"/>
       <column name="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="22"/>
       <column name="TITLE" value="Prof.Dr."/>
     </insert>
@@ -210,7 +210,7 @@
       <column name="LETTERSALUTATION" value="Madame Dr."/>
       <column name="SALUTATION" value="Madame"/>
       <column name="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="23"/>
       <column name="TITLE" value="Dr."/>
     </insert>
@@ -220,7 +220,7 @@
       <column name="LETTERSALUTATION" value="Monsieur Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Monsieur"/>
       <column name="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="24"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -230,7 +230,7 @@
       <column name="LETTERSALUTATION" value="Madame Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Madame"/>
       <column name="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="25"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -240,7 +240,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Frau"/>
       <column name="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="26"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -250,7 +250,7 @@
       <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Herr"/>
       <column name="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="27"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -260,7 +260,7 @@
       <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Mr."/>
       <column name="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="28"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -270,7 +270,7 @@
       <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Señor"/>
       <column name="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
-      <column name="SEX" value="m                                   "/>
+      <column name="SEX" value="m"/>
       <column name="SORT" valueNumeric="29"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -280,7 +280,7 @@
       <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Señora"/>
       <column name="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
@@ -290,7 +290,7 @@
       <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
       <column name="SALUTATION" value="Mrs."/>
       <column name="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
-      <column name="SEX" value="f                                   "/>
+      <column name="SEX" value="f"/>
       <column name="SORT" valueNumeric="31"/>
       <column name="TITLE" value="Dr. Ing."/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
index ca092dd47b4b91fc68dad30b7c387a653f8889b2..e094b21fe85cc673dd16634973a7ab3ac51aa63c 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
@@ -4,194 +4,194 @@
     <delete tableName="TASK"/>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
-      <column name="PRIORITY" value="TASKPRIOLOW                         "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-17T09:34:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Forecast anpassen"/>
       <column name="TASKID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-15T09:36:00"/>
-      <column name="PRIORITY" value="TASKPRIOMEDIUM                      "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-08T09:36:00"/>
-      <column name="STATUS" value="IN-PROGRESS                         "/>
+      <column name="STATUS" value="IN-PROGRESS"/>
       <column name="SUBJECT" value="Nachfassen bei Kunden"/>
       <column name="TASKID" value="783f38b6-db71-42b5-9117-848553905c93"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T09:38:00"/>
-      <column name="PRIORITY" value="TASKPRIOMEDIUM                      "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-17T09:38:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Besuch vorbereiten"/>
       <column name="TASKID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-22T10:25:00"/>
-      <column name="PRIORITY" value="TASKPRIOHIGH                        "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOHIGH"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-17T10:25:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Kampagne zu Akquise planen"/>
       <column name="TASKID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
-      <column name="PRIORITY" value="TASKPRIOMEDIUM                      "/>
-      <column name="PROGRESS" value="TASKPROG50                          "/>
+      <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-22T01:44:00"/>
-      <column name="STATUS" value="IN-PROGRESS                         "/>
+      <column name="STATUS" value="IN-PROGRESS"/>
       <column name="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
       <column name="TASKID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T01:46:00"/>
-      <column name="PRIORITY" value="TASKPRIONONE                        "/>
-      <column name="PROGRESS" value="TASKPROG50                          "/>
+      <column name="PRIORITY" value="TASKPRIONONE"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="START_DATE" valueDate="2019-05-22T01:46:00"/>
-      <column name="STATUS" value="IN-PROGRESS                         "/>
+      <column name="STATUS" value="IN-PROGRESS"/>
       <column name="SUBJECT" value="Vorbereitung Präsentation"/>
       <column name="TASKID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-29T01:48:00"/>
-      <column name="PRIORITY" value="TASKPRIOLOW                         "/>
-      <column name="PROGRESS" value="TASKPROG50                          "/>
+      <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="START_DATE" valueDate="2019-02-11T01:48:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Lead nachfassen"/>
       <column name="TASKID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
     </insert>
     <insert tableName="TASK">
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
-      <column name="PRIORITY" value="TASKPRIOLOW                         "/>
-      <column name="PROGRESS" value="TASKPROG25                          "/>
+      <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="PROGRESS" value="TASKPROG25"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-03-11T06:03:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
       <column name="TASKID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-11-13T06:04:00"/>
-      <column name="PRIORITY" value="TASKPRIOHIGH                        "/>
-      <column name="PROGRESS" value="TASKPROG75                          "/>
+      <column name="PRIORITY" value="TASKPRIOHIGH"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-22T06:04:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Event im Hause"/>
       <column name="TASKID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-10-01T06:05:00"/>
-      <column name="PRIORITY" value="TASKPRIONONE                        "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIONONE"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="START_DATE" valueDate="2019-05-22T06:05:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Autoreifen wechseln"/>
       <column name="TASKID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Preisabstimmung."/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-04-05T09:08:00"/>
-      <column name="PRIORITY" value="TASKPRIOMEDIUM                      "/>
-      <column name="PROGRESS" value="TASKPROG75                          "/>
+      <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-04-01T09:08:00"/>
-      <column name="STATUS" value="WAITING                             "/>
+      <column name="STATUS" value="WAITING"/>
       <column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
       <column name="TASKID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
     </insert>
     <insert tableName="TASK">
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
-      <column name="PRIORITY" value="TASKPRIOHIGH                        "/>
-      <column name="PROGRESS" value="TASKPROG75                          "/>
+      <column name="PRIORITY" value="TASKPRIOHIGH"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-23T09:21:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
       <column name="TASKID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
     </insert>
     <insert tableName="TASK">
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
-      <column name="PRIORITY" value="TASKPRIOLOW                         "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-23T11:50:00"/>
-      <column name="STATUS" value="NEW                                 "/>
+      <column name="STATUS" value="NEW"/>
       <column name="SUBJECT" value="Test"/>
       <column name="TASKID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
       <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="KIND" value="TASK                                "/>
+      <column name="KIND" value="TASK"/>
       <column name="MATURITY_DATE" valueDate="2019-01-20T05:00:00"/>
-      <column name="PRIORITY" value="TASKPRIOHIGH                        "/>
+      <column name="PRIORITY" value="TASKPRIOHIGH"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="START_DATE" valueDate="2019-01-20T03:00:00"/>
-      <column name="STATUS" value="IN-PROGRESS                         "/>
+      <column name="STATUS" value="IN-PROGRESS"/>
       <column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
       <column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Die Funktionalitäten des Tools erfüllen nicht die geforderten Funktionalitäten.&#10;Im Detail:  Die Zeiterfassung kann nicht zu Tickets erfasst werden.&#10;"/>
       <column name="EDITOR_CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="KIND" value="TICKET                              "/>
+      <column name="KIND" value="TICKET"/>
       <column name="MATURITY_DATE" valueDate="2019-09-12T01:43:00"/>
-      <column name="PRIORITY" value="TASKPRIOLOW                         "/>
-      <column name="PROGRESS" value="TASKPROG0                           "/>
+      <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-09-05T01:43:00"/>
-      <column name="STATUS" value="ASSIGNED                            "/>
+      <column name="STATUS" value="ASSIGNED"/>
       <column name="SUBJECT" value="Projektplanung fehlerhaft"/>
       <column name="TASKID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TICKET.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TICKET.xml
index 94cef43507f7c04539c5068a26183fa270391002..ad0a9004f8f48cd44630054b56f62cc061b10a32 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TICKET.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TICKET.xml
@@ -6,7 +6,7 @@
       <column name="CODE" valueNumeric="0"/>
       <column name="TASK_ID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
       <column name="TICKETID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="TICKETTYPE" value="SUPPORTTICKET                       "/>
+      <column name="TICKETTYPE" value="SUPPORTTICKET"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file