diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 9885aa127554ad7e435fbd6a2405cd22c7f355a9..876fa8e77553251308a11423050ca464a547eba2 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -35,6 +35,12 @@
       "line": -1,
       "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
       "groupName": "nb-tasklist-warning"
+    },
+    {
+      "target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
+      "line": -1,
+      "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
+      "groupName": "nb-tasklist-warning"
     }
   ]
 }
\ No newline at end of file
diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 2a99306b4f55d45d587ab183bf39b2e7b85ed5a9..b4940e7b136a1e7dc45d5afe6100e622a0deb61d 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Mon Mar 16 10:08:50 CET 2020
-version=6.1.1
+#Tue Sep 08 15:42:02 CEST 2020
+version=6.2.0
diff --git a/.gitignore b/.gitignore
index 3e6393c7c265ce2b7da30dcc0815f1879bb01e76..bd9db83469ecf1751dacf06f8a70f5caffc39ff0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /others/db_changes/liqui_update.bat
 /others/db_changes/liqui_reset.ps1
 /others/jsdocOut
+/userhelp
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4a1ab973694e123dc08a82bf659081bd49e2404e..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 9661ac713428efbad557d3ba3a62216b5bb7d226..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
index 7153295dc12d1b84566a0af057f0f65bf706f3e9..733b8a07299e2b2cae54225d3703e0403790b4f3 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ComunicationMedium_IdDatatype.xml
@@ -11,7 +11,11 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+        <dropIndex  tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID"/>
         <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+            <column name="MEDIUM_ID"/>
+        </createIndex>
     </changeSet>
 
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index 2cfda5e78c75dc24d61318c4867d381d01e4105d..9e31af2c9427a6976dc010890598ca2862ad85e0 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -14,6 +14,9 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
+        <dropPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" dropIndex="true"/>
         <modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
+        <addNotNullConstraint columnName="DOCUMENTTEMPLATEID" tableName="DOCUMENTTEMPLATE" columnDataType="CHAR(36)" validate="true"/>
+        <addPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" columnNames="DOCUMENTTEMPLATEID"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
index 237c9fd9e447f01353d895dba2a7c1123e684471..116ed24246e298e7f8987879ad4ad3e243300227 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_ExportTemplateDatatype.xml
@@ -19,8 +19,25 @@
     </changeSet>
     
     <changeSet dbms="!derby" author="b.ulrich" id="a53a2f38-3788-44a2-a151-13b3853ccb74">
+        <!--EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="idx_exprttmppou_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATEPLACEOFUSE" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmppou_tmpltid" tableName="EXPORTTEMPLATEPLACEOFUSE">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        
+        <!--EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATEFIELD" indexName="idx_exprttmpfld_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATEFIELD" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmpfld_tmpltid" tableName="EXPORTTEMPLATEFIELD">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        
+        <!--EXPORTTEMPLATESELECTION.EXPORTTEMPLATE_ID-->
+        <dropIndex  tableName="EXPORTTEMPLATESELECTION" indexName="idx_exprttmpselection_tmpltid"/>
         <modifyDataType tableName="EXPORTTEMPLATESELECTION" columnName="EXPORTTEMPLATE_ID" newDataType="CHAR(36)"/>
+        <createIndex indexName="idx_exprttmpselection_tmpltid" tableName="EXPORTTEMPLATESELECTION">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
index 3d8f901c79b2216826873ea4664e1f1a401652fc..21c394983e85d2e5173447ffa54e06f91c1146ef 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
@@ -1,7 +1,10 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+    <changeSet author="s.pongratz" id="2153f1f9-b62b-4a65-948a-92e236ae53a3">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'f862f71e-9155-4e88-8158-170ddfa4dbf3'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="f862f71e-9155-4e88-8158-170ddfa4dbf3"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_PHONECALL"/>
@@ -11,7 +14,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="2a4cc7c2-c497-4c21-89b8-4e922fd7eee7">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '19876b72-cd7d-4916-b853-22c4d9fe49c2'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="19876b72-cd7d-4916-b853-22c4d9fe49c2"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_EMAIL"/>
@@ -21,7 +28,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="59aac29a-5cc8-4825-9868-33247bb45a71">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '16f9fbb5-9b8a-4908-babd-06c86032a22b'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="16f9fbb5-9b8a-4908-babd-06c86032a22b"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_APPOINTMENT"/>
@@ -31,7 +42,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="42c7f06f-eadb-45de-9aa0-129c475333ff">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '53458dba-80f5-427c-a44c-3fc8e74f3380'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="53458dba-80f5-427c-a44c-3fc8e74f3380"/>
             <column name="KEYID" value="_____SYSTEM_NOTIFICATION_TODO"/>
@@ -41,7 +56,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="b0a0157b-8732-49e3-90d6-3797b1a035d4">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '3d2393b3-ed13-44d6-9a6f-9280d84252cb'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3d2393b3-ed13-44d6-9a6f-9280d84252cb"/>
             <column name="KEYID" value="DownloadReady"/>
@@ -51,7 +70,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="45cff8ed-3b4f-47b6-af6b-3b2a39877b68">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '09ce4611-3254-4590-958a-79178924188b'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="09ce4611-3254-4590-958a-79178924188b"/>
             <column name="KEYID" value="BulkMailSent"/>
@@ -61,7 +84,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
-        
+    </changeSet>
+    <changeSet author="s.pongratz" id="148a5837-b2a6-4e17-b812-7db0f4efd9b8">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'df47c6db-2a72-464a-b155-c4e33a4294ba'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="df47c6db-2a72-464a-b155-c4e33a4294ba"/>
             <column name="KEYID" value="Leadimport_Notification"/>
@@ -71,6 +98,11 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
+    </changeSet>
+    <changeSet author="s.pongratz" id="b15af488-facc-4245-9daa-2f38754ab8ea">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = '58281d88-71a7-4fa7-8ef8-9289fc904697'</sqlCheck>  
+        </preConditions>  
         
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="58281d88-71a7-4fa7-8ef8-9289fc904697"/>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
index 35501bf1692b76aa533e32e47930c612f0d97ef2..a87db22eeb836919d984869e9a9a2e93f3d0ba44 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
@@ -2,6 +2,9 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="s.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+        <preConditions  onFail="MARK_RAN">  
+            <sqlCheck  expectedResult="0">select count(*) from AB_KEYWORD_ENTRY where AB_KEYWORD_ENTRYID = 'daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81'</sqlCheck>  
+        </preConditions>  
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81"/>
             <column name="KEYID" value="TODELETE"/>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fc9e12d38ffb3a457f219ee37898dd5092e5f08
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/changelog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="create_district.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtresponsible.xml"/>
+    <include relativeToChangelogFile="true" file="create_districtResponsibleKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="create_indizes.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6ea091c954808cffc73235d0378ab1d3d5bbc7aa
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_district.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="4bfb41ea-ef43-403a-9a93-48d92294b1cb">
+        <createTable tableName="DISTRICT">
+            <column name="DISTRICTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICT_DISTRICTID"/>
+            </column>
+            <column name="DISTRICT_NAME" type="VARCHAR(50)"/>
+            <column name="DISTRICT_NUMBER" type="INTEGER"/>
+            <column name="DISTRICT_INFO" type="VARCHAR(50)"/>
+            <column name="ISO3" type="VARCHAR(5)"/>
+            <column name="PARENTDISTRICT_DISTRICTID" type="CHAR(36)"/>
+            <column name="DISTRICT_FILTER" type="NCLOB"/>
+            <column name="DISTRICT_STATUS" type="INTEGER"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5747db8f3688988d77e8645b3a5787e9c35cc6d6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtResponsibleKeyword.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="d95ebf6c-1e34-4ba3-9f0b-386c5059444e">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="66d1563a-a76c-47ca-af6b-38586a2f3ce3"/>
+            <column name="KEYID" value="MEMROLEDISTRICTRESPONSIBLE"/>
+            <column name="TITLE" value="District Responsible"/>
+            <column name="CONTAINER" value="MemberRole"/>
+            <column name="SORTING" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71ac9397e0d2378e4db0a8643cf3f5db376d3b65
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_districtresponsible.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="0e5cc99d-3500-484c-abc4-441e3a5c4b7f">
+        <createTable tableName="DISTRICTRESPONSIBLE">
+            <column name="DISTRICTRESPONSIBLEID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DISTRICTRESPONSIBLE_DISTRICTRESPONSIBLEID"/>
+            </column>
+            <column name="DISTRICT_ID" type="CHAR(36)"/>
+            <column name="EMPLOYEE_CONTACT_ID" type="CHAR(36)"/>
+            <column name="DEPARTMENT_ATTRIBUTE_ID" type="CHAR(36)"/>
+            <column name="USER_NEW" type="NVARCHAR(50)"/>
+            <column name="USER_EDIT" type="NVARCHAR(50)"/>
+            <column name="DATE_NEW" type="DATETIME"/>
+            <column name="DATE_EDIT" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb677337dfd9f958dfc341532fba299d98adc36c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Districts/create_indizes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="7dbaa3ae-ba37-4fd1-9b63-fab48975fb87">
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DEPARTMENT_ATTRIBUTE_ID">
+            <column name="DEPARTMENT_ATTRIBUTE_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_DISTRICTRESPONSIBLE_DISTRICT_ID">
+            <column name="DISTRICT_ID"/>
+        </createIndex>
+        <createIndex tableName="DISTRICTRESPONSIBLE" indexName="IDX_EMPLOYEE_CONTACT_ID">
+            <column name="EMPLOYEE_CONTACT_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
index 1c2fd454c2bbc0ff0f784acc0b34a8410110a2a5..b1e24d455594743e9cac21474efb08d69702602a 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/ImportFields/alterLead.xml
@@ -2,8 +2,8 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="s.pongratz" id="99f19a82-62aa-41fc-b756-da4da3be45de">
-         <sql>
-            ALTER TABLE LEAD ADD COLUMN ATTRIBUTE_Industry VARCHAR(100);
-        </sql>
+        <addColumn tableName="LEAD">
+            <column name="ATTRIBUTE_Industry" type="VARCHAR(100)"/>
+        </addColumn>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Lead/addAndRenameColumnLead.xml b/.liquibase/Data_alias/basic/2020.2.0/Lead/addAndRenameColumnLead.xml
new file mode 100644
index 0000000000000000000000000000000000000000..212ff34737c65b7b9450b4accccee87669280337
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Lead/addAndRenameColumnLead.xml
@@ -0,0 +1,44 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="bcd6cb02-d074-444f-a307-34973b3dd4e1">
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMMOBIL"  
+            oldColumnName="COMMMOBIL"  
+            tableName="LEAD"/>
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMEMAIL"  
+            oldColumnName="COMMEMAIL"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMBLOG"  
+            oldColumnName="COMMBLOG"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMPHONE"  
+            oldColumnName="COMMPHONE"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMXING"  
+            oldColumnName="COMMXING"  
+            tableName="LEAD"/> 
+        <renameColumn
+            columnDataType="NVARCHAR(254)"  
+            newColumnName="O_COMMLINKEDIN"  
+            oldColumnName="COMMLINKEDIN"  
+            tableName="LEAD"/>
+        
+        <addColumn tableName="LEAD">
+            <column name="P_COMMMOBIL"     type="NVARCHAR(254)" />
+            <column name="P_COMMEMAIL"     type="NVARCHAR(254)" />
+            <column name="P_COMMPHONE"     type="NVARCHAR(254)" />
+            <column name="P_COMMBLOG"      type="NVARCHAR(254)" />
+            <column name="P_COMMXING"      type="NVARCHAR(254)" />
+            <column name="P_COMMLINKEDIN"  type="NVARCHAR(254)" />
+	</addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Lead/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/Lead/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..314818ec499144b38512bdd1c15cdf1207f33750
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Lead/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="addAndRenameColumnLead.xml" relativeToChangelogFile="true" />
+    <include file="insertAndUpdateImportFields.xml" relativeToChangelogFile="true" />
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/Lead/insertAndUpdateImportFields.xml b/.liquibase/Data_alias/basic/2020.2.0/Lead/insertAndUpdateImportFields.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb271a864d5926cb09bc00af99d23e4d3059627c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/Lead/insertAndUpdateImportFields.xml
@@ -0,0 +1,125 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.pongratz" id="bcd6cb02-d074-444f-a307-34973b3dd4e1">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMMOBIL"/>
+            <column name="TITLE" value="Mobile number (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="da3acc3a-457e-4c88-a477-8abdaf819539" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMEMAIL"/>
+            <column name="TITLE" value="Mail (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="2e7952b1-56a8-484d-9d82-564236c30d20" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMPHONE"/>
+            <column name="TITLE" value="Phone number (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="96534736-0247-4596-a8db-f6d7eee611c5" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMMOBIL"/>
+            <column name="TITLE" value="Internet (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="9ed26d58-cc2f-436e-b67b-afbb9f102bf4" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMBLOG"/>
+            <column name="TITLE" value="Blog (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="52bad941-02be-4c63-94a7-979e8ecef0c9" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMXING"/>
+            <column name="TITLE" value="Xing (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="8bf354dc-4278-493e-9824-40367382290f" />
+            </whereParams>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="O_COMMLINKEDIN"/>
+            <column name="TITLE" value="Linked in (Organisation)"/>
+            <where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
+            <whereParams>
+                <param value="97e27378-e733-4629-b0c4-515faf89da7e" />
+            </whereParams>
+        </update>
+        
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="dd5abf99-b43d-4b3d-b4b0-376c70572490"/>
+        <column name="KEYID" value="P_COMMMOBIL"/>
+        <column name="TITLE" value="Mobile number (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="29"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="345fe723-73dc-4687-afd2-c4ebc16aebdc"/>
+        <column name="KEYID" value="P_COMMEMAIL"/>
+        <column name="TITLE" value="Mail (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="30"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="370672a7-946a-43b6-98dd-532422bef388"/>
+        <column name="KEYID" value="P_COMMPHONE"/>
+        <column name="TITLE" value="Phone number (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="31"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="01f18fd8-44c1-43ec-8601-bf1fe7e62700"/>
+        <column name="KEYID" value="P_COMMMOBIL"/>
+        <column name="TITLE" value="Internet (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="32"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="504d48d1-1a0d-437a-adc9-38501679137a"/>
+        <column name="KEYID" value="P_COMMBLOG"/>
+        <column name="TITLE" value="Blog (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="33"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="fde1a4d1-d77e-494c-a1e4-2ef82abec246"/>
+        <column name="KEYID" value="P_COMMXING"/>
+        <column name="TITLE" value="Xing (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="34"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="53e06704-e28d-49b5-a49f-e40ca250ee6a"/>
+        <column name="KEYID" value="P_COMMLINKEDIN"/>
+        <column name="TITLE" value="Linked in (Person)"/>
+        <column name="CONTAINER" value="ImportFields"/>
+        <column name="SORTING" valueNumeric="35"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d8b506037199897a34e8c6e8660d418fdc986dda
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml
@@ -0,0 +1,55 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="b16e0a6e-74b7-414a-9cc2-fb7f8f1c3d72">
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="bbd50206-c4d5-42e0-a19a-2d11e957af1f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="63f5b453-24af-47a2-8ef1-ee5c91003428"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="910939c0-fe4f-4142-9656-d06ed1fe6d04"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="a5ccf0e5-2c4d-4782-8970-61af4db2dd31"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="460e8b4c-5124-4b83-ab81-16ad919abe35"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="346113a2-e3b6-41e5-b058-13342e45984a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b741dc23-8e46-46a6-9485-56a9033d944a"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="50cd8a91-5a48-479d-a329-aa9c1d1a3835"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Organisation"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="5e2011ef-87aa-4b51-bea4-34cbfa11722f"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="DSGVOReport"/>
+        </insert>
+        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="e1422fa3-dcd2-4863-b972-1a3fb4b4fdc6"/>
+            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+            <column name="PLACEOFUSE" value="Order"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
index 2d5712313fe118fe829ff4451b83ef6f7bae4785..9817d49cf3f4f9207324679b50b014dae51f149a 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/addNotificationStateKeywords/addNotificationStateKeyword.xml
@@ -4,7 +4,7 @@
     <changeSet author="a.schindlbeck" id="866dab92-b0fe-4a8c-8b90-123824c10ffd">
         <update tableName="AB_KEYWORD_ENTRY">
             <column name="TITLE" value="Unread"/>
-            <where>AB_KEYWORD_ENTRYID='765dacdb-8f9c-46e9-8303-41355ba17010'</where>
+            <where>AB_KEYWORD_ENTRYID='f568c222-7ac5-475e-b916-cea0e0e8612a'</where>
         </update>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_CommrestrictionsEmployeeInvolved.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_CommrestrictionsEmployeeInvolved.xml
new file mode 100644
index 0000000000000000000000000000000000000000..487e3f6392b51a1f109d28108bac658191861065
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_CommrestrictionsEmployeeInvolved.xml
@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet dbms="derby" author="b.ulrich" id="c56df7ca-aa5c-426b-bdb7-16f8ad16d17c">
+        <sql>
+            ALTER TABLE COMMRESTRICTION ADD COLUMN EMPLOYEE_INVOLVED_NEW CHAR(36);
+            UPDATE COMMRESTRICTION SET EMPLOYEE_INVOLVED_NEW=EMPLOYEE_INVOLVED;
+            ALTER TABLE COMMRESTRICTION DROP COLUMN EMPLOYEE_INVOLVED;
+            RENAME COLUMN COMMRESTRICTION.EMPLOYEE_INVOLVED_NEW TO EMPLOYEE_INVOLVED;
+        </sql>
+    </changeSet>
+    
+    <changeSet dbms="!derby" author="b.ulrich" id="17c1eb73-3131-4a2b-bf9a-913590767c79">
+        <modifyDataType tableName="COMMRESTRICTION" columnName="EMPLOYEE_INVOLVED" newDataType="CHAR(36)"/>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c96e25152e85616ffbc3eab34e9b3372af4675b3
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_ComunicationMedium_IdDatatype.xml
@@ -0,0 +1,48 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <!--*****
+        The data type has been changed by accident to CHAR(36) so let's change it back to VARCHAR(36) and update the data that is already persistant.
+        Tested on Apache Derby DB.
+    ******-->
+    <!--first: remove the index (if it's there) because on some dbms this prevents the column from changing/dropping-->
+    <changeSet author="j.goderbauer" id="763ea49e-8c9b-4262-9e2a-c59488358cd4">
+        <preConditions onFail="MARK_RAN">
+            <indexExists indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION"/>
+        </preConditions>
+        <dropIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION" />
+    </changeSet>
+    <!--second: change the type, dependent on the dbms-->
+    <changeSet dbms="derby" author="j.goderbauer" id="c6e4a017-6e48-4238-80d7-41e2b210874d">
+        <sql>
+            ALTER TABLE COMMUNICATION ADD COLUMN MEDIUM_ID_NEW VARCHAR(36);
+            UPDATE COMMUNICATION SET MEDIUM_ID_NEW=MEDIUM_ID;
+            ALTER TABLE COMMUNICATION DROP COLUMN MEDIUM_ID;
+            RENAME COLUMN COMMUNICATION.MEDIUM_ID_NEW TO MEDIUM_ID;
+        </sql>
+    </changeSet>
+    <changeSet dbms="!derby" author="j.goderbauer" id="fbee4d8c-681d-4bea-b665-9fa951c3daa8">
+        <modifyDataType tableName="COMMUNICATION" columnName="MEDIUM_ID" newDataType="VARCHAR(36)"/>
+    </changeSet>
+    <!--third: update data that now contains the data with spaces at the end-->
+    <!--MS SQL supports the regular trim-function with  MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+    <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+    <changeSet dbms="mssql" author="j.goderbauer" id="74b69edd-74f6-42c6-8164-e41614b47140">
+        <update tableName="COMMUNICATION">
+            <column name="MEDIUM_ID" valueComputed="ltrim(rtrim(MEDIUM_ID))" />
+            <where>MEDIUM_ID is not null</where>
+        </update>
+    </changeSet>
+    <changeSet dbms="!mssql" author="j.goderbauer" id="ee6466ce-ef57-44fd-b3c7-4e8fe305f25e">
+        <update tableName="COMMUNICATION">
+            <column name="MEDIUM_ID" valueComputed="trim(MEDIUM_ID)" />
+            <where>MEDIUM_ID is not null</where>
+        </update>
+    </changeSet>
+    <!--fourth: recreate the index with the original name-->
+    <changeSet author="j.goderbauer" id="071450d1-2cd6-487e-9b12-7f8b042f179c">
+        <createIndex indexName="IDX_COMMUNICATION_MEDIUM_ID" tableName="COMMUNICATION">
+            <column name="MEDIUM_ID"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_KeywordTitlesForTranslation.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_KeywordTitlesForTranslation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..abac4fa4557924d019396c169f79b421911228ab
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_KeywordTitlesForTranslation.xml
@@ -0,0 +1,30 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="b.ulrich" id="82e86a5a-7796-496e-87ba-4c94ac5e3bb4">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="restrict"/>
+            <where>AB_KEYWORD_ENTRYID='4409adc1-0130-44d3-8aa9-773ff3ab0816'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="entity"/>
+            <where>AB_KEYWORD_ENTRYID='676f498f-3f51-459f-8e07-feec7b604245'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="dataset"/>
+            <where>AB_KEYWORD_ENTRYID='14f5e2a4-4998-400f-b857-90e14e8736da'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="field"/>
+            <where>AB_KEYWORD_ENTRYID='d3ae8077-36db-4f52-8f90-b0ebbb6773d7'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="allow"/>
+            <where>AB_KEYWORD_ENTRYID='27ded05a-99c1-4810-91ee-cbb1e4ddec85'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="ZIP"/>
+            <where>AB_KEYWORD_ENTRYID='6164631f-3378-412d-8c80-8be0aaca7c77'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23fcaf6c04e4498f779b278eb273a48031d980a0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_VisitrecommendationpriorityDatatype.xml
@@ -0,0 +1,103 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
+    <changeSet author="b.ulrich" id="2c14c955-e312-4085-bf3e-9a07cf8a39b6">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSPLANNED"/>
+            <where>AB_KEYWORD_ENTRYID='9d427420-2c87-4ada-9349-a799972bda0f'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSAPPPLANED"/>
+            <where>AB_KEYWORD_ENTRYID='2f740f93-12ed-4e22-a158-adba5da81b40'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITSTATUSREPORTCREATED"/>
+            <where>AB_KEYWORD_ENTRYID='dd276100-b867-489c-8128-a3b71aa7564f'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="MANUAL"/>
+            <where>AB_KEYWORD_ENTRYID='2f162837-868a-4517-810e-677cd423be56'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITFREQUENCY"/>
+            <where>AB_KEYWORD_ENTRYID='17905c4d-1c88-4cee-83da-164c13bbe848'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOCRITICAL"/>
+            <where>AB_KEYWORD_ENTRYID='91d7417e-fd45-429e-9ce9-a46f25c0c1d1'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOCVERYHIGH"/>
+            <where>AB_KEYWORD_ENTRYID='c0147b73-f678-4136-b3c4-0fde7e943a84'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOHIGH"/>
+            <where>AB_KEYWORD_ENTRYID='4ac4c7e1-d73b-4a26-9a6d-bc06505b9611'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOMEDIUM"/>
+            <where>AB_KEYWORD_ENTRYID='facb77a6-5bc1-4e2f-8dd0-72200b57c326'</where>
+        </update>
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="KEYID" value="VISITPRIOLOW"/>
+            <where>AB_KEYWORD_ENTRYID='036cbf6f-a8bd-4f25-b885-f1a689927bf1'</where>
+        </update>
+    </changeSet>
+    <!--*****
+        The data type has been set to CHAR(36) by accident, so let's change it back to VARCHAR(36) and update the data that is already persistant.
+        Tested on Apache Derby DB.
+    ******-->
+    <!--second: change the type, dependent on the dbms-->
+    <changeSet dbms="derby" author="b.ulrich" id="30bdc4ef-1b99-43c6-8637-da20f64772c9">
+        <sql>
+            ALTER TABLE VISITRECOMMENDATION ADD COLUMN PRIORITY_NEW VARCHAR(36);
+            UPDATE VISITRECOMMENDATION SET PRIORITY_NEW=PRIORITY;
+            ALTER TABLE VISITRECOMMENDATION DROP COLUMN PRIORITY;
+            RENAME COLUMN VISITRECOMMENDATION.PRIORITY_NEW TO PRIORITY;
+            ALTER TABLE VISITPLANENTRY ADD COLUMN STATUS_NEW VARCHAR(36);
+            UPDATE VISITPLANENTRY SET STATUS_NEW=STATUS;
+            ALTER TABLE VISITPLANENTRY DROP COLUMN STATUS;
+            RENAME COLUMN VISITPLANENTRY.STATUS_NEW TO STATUS;
+            ALTER TABLE VISITRECOMMENDATION ADD COLUMN SOURCE_NEW VARCHAR(36);
+            UPDATE VISITRECOMMENDATION SET SOURCE_NEW=SOURCE;
+            ALTER TABLE VISITRECOMMENDATION DROP COLUMN SOURCE;
+            RENAME COLUMN VISITRECOMMENDATION.SOURCE_NEW TO SOURCE;
+        </sql>
+    </changeSet>
+    <changeSet dbms="!derby" author="b.ulrich" id="ec6f82ad-491b-4e0a-a24c-e45ea0e494de">
+        <modifyDataType tableName="VISITRECOMMENDATION" columnName="PRIORITY" newDataType="VARCHAR(36)"/>
+        <modifyDataType tableName="VISITPLANENTRY" columnName="STATUS" newDataType="VARCHAR(36)"/>
+        <modifyDataType tableName="VISITRECOMMENDATION" columnName="SOURCE" newDataType="VARCHAR(36)"/>
+    </changeSet>
+    <!--third: update data that now contains the data with spaces at the end-->
+    <!--MS SQL supports the regular trim-function with  MS SQL 2017 or higher, so lets use the old ltrim/rtrim functions for better compability -->
+    <!--sauce: https://docs.microsoft.com/de-de/sql/t-sql/functions/trim-transact-sql?view=sql-server-ver15-->
+    <changeSet dbms="mssql" author="b.ulrich" id="d306d290-c3cf-42e2-8f28-e4a4cfa7d16f">
+        <update tableName="VISITRECOMMENDATION">
+            <column name="PRIORITY" valueComputed="ltrim(rtrim(PRIORITY))" />
+            <where>PRIORITY is not null</where>
+        </update>
+        <update tableName="VISITPLANENTRY">
+            <column name="STATUS" valueComputed="ltrim(rtrim(STATUS))" />
+            <where>STATUS is not null</where>
+        </update>
+        <update tableName="VISITRECOMMENDATION">
+            <column name="SOURCE" valueComputed="ltrim(rtrim(SOURCE))" />
+            <where>SOURCE is not null</where>
+        </update>
+    </changeSet>
+    <changeSet dbms="!mssql" author="b.ulrich" id="3fcc49d0-eb7d-4976-aff4-0e8b911e95af">
+        <update tableName="VISITRECOMMENDATION">
+            <column name="PRIORITY" valueComputed="trim(PRIORITY)" />
+            <where>PRIORITY is not null</where>
+        </update>
+        <update tableName="VISITPLANENTRY">
+            <column name="STATUS" valueComputed="trim(STATUS)" />
+            <where>STATUS is not null</where>
+        </update>
+        <update tableName="VISITRECOMMENDATION">
+            <column name="SOURCE" valueComputed="trim(SOURCE)" />
+            <where>SOURCE is not null</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 6007ef250f386a2a42165275f7a3eb6f7e1852ef..620de869917cdd857fbdaee72b06b6b9ae84c26c 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -1,9 +1,16 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Districts/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Classification/changelog.xml"/>
     <include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
     <include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
     <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
     <include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
+    <include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
+    <include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
+    <include relativeToChangelogFile="true" file="alter_KeywordTitlesForTranslation.xml"/>
+    <include relativeToChangelogFile="true" file="alter_CommrestrictionsEmployeeInvolved.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index b94480075bcdddbb678bcaa40e61aaa420669329..c3eab6fea6cdd0fe13a20852ee965f5581c2be5c 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -2,12 +2,12 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="s.listl" id="a303ace0-b324-435a-84d8-7ef4d0419af8">
-        <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_MEDIUM_ID">
-            <column name="MEDIUM_ID"/>
-        </createIndex>
-        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTMENTLINK_AP_ID">
+        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_AP_ID">
             <column name="APPOINTMENT_ID"/>
         </createIndex>
+        <createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_OBJECT_ROWID">
+            <column name="OBJECT_ROWID"/>
+        </createIndex>
         <createIndex tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="IDX_EXPORTTEMPLATEUSE_T_ID">
             <column name="EXPORTTEMPLATE_ID"/>
         </createIndex>
@@ -29,5 +29,26 @@
         <createIndex tableName="LEADIMPORTMAPPINGASSISTANT" indexName="IDX_LEADIMPORTMAPPING_LI_ID">
             <column name="LEADIMPORT_ID"/>
         </createIndex>
+        <createIndex tableName="EXPORTTEMPLATESELECTION" indexName="IDX_EXPTEMPLATESEL_TEMPLATE_ID">
+            <column name="EXPORTTEMPLATE_ID"/>
+        </createIndex>
+        <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_PROCURER_ROWID">
+            <column name="PERMISSIONPROCURER_ROWID"/>
+        </createIndex>
+        <createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_DEALER_ROWID">
+            <column name="PERMISSIONDEALER_ROWID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_VRECOMMND_ID">
+            <column name="VISITRECOMMENDATION_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_CONTCT_ID">
+            <column name="CONTACT_ID"/>
+        </createIndex>
+        <createIndex tableName="VISITPLANENTRY" indexName="IDX_VISITPLNENTRY_ORGCONTCT_ID">
+            <column name="ORGANISATION_CONTACT_ID"/>
+        </createIndex>
+        <createIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_ADDR">
+            <column name="ADDR"/>
+        </createIndex>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index 22fe51ac97046f0037d1bbe244ce1d5b2751ca28..f6d11f67aca68ced3d37b0ba75215a15d7a8d4d9 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -15,17 +15,27 @@
   <include file="generatedData/campaignparticipantlog.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/campaignstep.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classification.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationgrading.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationgroup.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classificationscore.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/classificationstorage.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/classificationtype.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/commrestriction.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/communication.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/contact.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/contract.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/descriptiontranslation.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/district.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/districtresponsible.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/documenttemplate.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/documenttemplatelink.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/dsgvo.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/dsgvoinfo.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/duplicatescanner.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/exporttemplate.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/forecast.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/letterrecipient.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/objectmember.xml" relativeToChangelogFile="true"/>
@@ -45,13 +55,5 @@
   <include file="generatedData/task.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/tasklink.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/ticket.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/duplicates/duplicatescanner.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/exporttemplate.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/classificationgrading.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/classificationgroup.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/classificationstorage.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/visitrecommendation.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
index 1a2d9eafc5085339edbd681cc496cd2a81c8be19..68c4a24099c21895e4346ab23dde9434ae87272d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
@@ -1,905 +1,923 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="09cabd06-9e28-447f-ab83-a699ee6f6ebe">
+  <changeSet author="autogenerated" id="7e40f0c3-8059-4ea4-983e-4c5023d74ca6">
     <delete tableName="ab_attributerelation"/>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="0563ec4f-6f85-469d-89a1-5fc807f4dc9f"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
       <column name="ID_VALUE" value="DELIVERCIF"/>
-      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="05b3c80a-1d1f-46f8-bce5-164a3606b8ee"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:52:22"/>
       <column name="ID_VALUE" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="086ff454-e407-433a-9124-496de7fef1cb"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="0a1aabd7-4faf-4a82-9a85-3351add5b357"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
       <column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="12a0bb2a-9b6c-4282-9209-2dc90d726fc2"/>
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:54"/>
       <column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="AB_ATTRIBUTERELATIONID" value="1378d5a4-93d1-4d7f-b58f-8278200a17c2"/>
       <column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:56:25"/>
       <column name="ID_VALUE" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
-      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="1505bacf-c29a-48a7-8da5-5e969252309f"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
       <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
-      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="1f1a17c5-c800-4501-9174-58573c00192a"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:35:13"/>
       <column name="ID_VALUE" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="2261ef33-50af-445a-bc19-27367cc6ff7a"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Activity"/>
       <column name="AB_ATTRIBUTERELATIONID" value="2540fef8-2f98-4bc9-8f38-4802a7c41263"/>
       <column name="AB_ATTRIBUTE_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
-      <column name="OBJECT_ROWID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="OBJECT_TYPE" value="Activity"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="255571a4-2fda-49ec-baed-ea7b374895f1"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="25a53e28-d8a1-43d3-9af0-b34ce9c0bc06"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
       <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="25dac52d-de7e-47e1-b60c-22d252dae4c2"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
       <column name="ID_VALUE" value="PAYTERM7"/>
-      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="2d80654e-3bd5-46bb-af0b-f18f812d11e0"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="2e456151-e59d-4d37-85cc-6e4b4054c8fe"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3253baa7-06ea-4458-b7c1-36907321d025"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="375957e1-542a-43b8-826a-d068f2a06864"/>
       <column name="AB_ATTRIBUTE_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
       <column name="ID_VALUE" value="48da5029-b984-4809-8227-fb430bb78920"/>
-      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3a32b8d5-1770-49cd-ae41-5b02f792ac6a"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:58"/>
       <column name="ID_VALUE" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
-      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3acc3d04-5212-4510-b88c-5885db940fec"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3be00926-6687-4378-837e-9a337cc4a38d"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3e119bed-4330-4519-bf98-73b7edc8a404"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
       <column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="3e91603c-813c-43f9-964f-90e566cbc042"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="AB_ATTRIBUTERELATIONID" value="407dc1e9-fdb0-4064-88b8-f3dba6e38117"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="DATE_NEW" valueDate="2019-11-25T09:22:44"/>
       <column name="ID_VALUE" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
-      <column name="OBJECT_ROWID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="41760794-1b3e-418d-9dd0-233ddbdfedce"/>
       <column name="AB_ATTRIBUTE_ID" value="a4c2bcc5-5a3d-4a70-b936-9a330329c63a"/>
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="INT_VALUE" valueNumeric="0"/>
-      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
+      <column name="INT_VALUE" valueNumeric="0"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="4475ef06-83ab-4dff-91e1-be7053e004fa"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="44bd5ab6-0b4f-4655-a276-ed172240643b"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="4d65a707-7dec-44c1-9a06-3dbb3204059c"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="4de531e4-4e91-4362-b701-a76282e7b976"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="4ecfff5d-221a-4cf2-9498-fd24a11e4055"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="509845c5-6b4a-4918-923d-75b1aef3a1f4"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="52b61d0c-3cbf-4e98-a126-786540c808c9"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="550ab6c3-7678-4196-b84a-ff56635755de"/>
       <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:52:29"/>
       <column name="ID_VALUE" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="5878efc7-79cc-417d-920c-b78052e0230d"/>
       <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
       <column name="ID_VALUE" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="593d0626-9049-43ca-b7bd-eb6c7327beed"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:53"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="5ac66b09-46b0-4c4b-b72d-cae853c5ccc4"/>
       <column name="AB_ATTRIBUTE_ID" value="af312508-8a9b-4b8f-88f3-6b98005c749e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
       <column name="ID_VALUE" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
-      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="5b459ece-8d57-4b7c-bf37-574f46084508"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:32:43"/>
       <column name="ID_VALUE" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="5d83b2c1-92b6-478d-a5b1-fdda3d35592d"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:44"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="605951b3-5954-4ab8-ad13-8359f68d2287"/>
       <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:35:05"/>
       <column name="ID_VALUE" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="67f36d84-1997-4801-a4f6-94c9b8318e95"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
       <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
-      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="68b689b8-f9ff-40d1-b936-629985423ebb"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="6907f00d-011d-4592-8f0e-26e52449658f"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
       <column name="ID_VALUE" value="PRICELISTDEFAULT"/>
-      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="69cb66c6-1d04-4029-8a20-0f6452bc4bf1"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="6d919048-7873-449a-9378-8f72bddee5de"/>
       <column name="AB_ATTRIBUTE_ID" value="af312508-8a9b-4b8f-88f3-6b98005c749e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
       <column name="ID_VALUE" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
-      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="6e619f34-361d-48d7-868a-572848ab4463"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="6e8b96f9-de86-4dc1-b0c9-d5b99867d29c"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
       <column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
-      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="72cb6a41-def0-4a96-b8c1-56df885cf151"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
       <column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="76967a63-8322-484b-b603-d3cb5ce27d6d"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7a291363-9a75-4dd5-aa64-34a1801aeb92"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7a7736db-8b68-4865-a212-bd603af51370"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7a7e223f-a1f9-4503-b6e9-95e4f49c75c1"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7abc6537-b254-4a36-8315-2e44a5b10fad"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
       <column name="ID_VALUE" value="SALPROJPOLABO"/>
-      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7abee4a3-fd20-4153-adef-ffa3dc8a4ab4"/>
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:25"/>
       <column name="ID_VALUE" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7b38959d-d0b7-434a-9316-58d4894982d2"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
       <column name="ID_VALUE" value="SALPROJPOLABO"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7e3d2c81-a9dd-4e82-a3e6-b26835c8ac46"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="7f0bccf2-bf10-4a64-8ae7-236bebc2505f"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:18"/>
       <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"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="81dc88e3-3540-4675-a6d8-bca92cd91f84"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="84c93ae0-1821-40da-9eee-d180ce23cad5"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="851b8378-b20d-49ff-907d-30e4587a83c9"/>
       <column name="AB_ATTRIBUTE_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
       <column name="ID_VALUE" value="6d0cce07-4767-477b-af51-e9782ebdbe25"/>
-      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="88420b13-3678-4743-bcf2-fa3c0b5166c9"/>
       <column name="AB_ATTRIBUTE_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
       <column name="ID_VALUE" value="72bcad07-6f26-48c0-84b0-1e6ab46d88a9"/>
-      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="AB_ATTRIBUTERELATIONID" value="8c3a841e-dbb8-45eb-a137-a189c135fe2b"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="DATE_NEW" valueDate="2019-11-25T01:27:33"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="8e474a2c-6adc-4f1d-88d8-217b0ddd592b"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:36:47"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+    </insert>
+    <insert tableName="ab_attributerelation">
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="AB_ATTRIBUTERELATIONID" value="90ddd9eb-bf78-4584-9592-0612e414c09d"/>
+      <column name="AB_ATTRIBUTE_ID" value="547b8b9d-88ba-4590-9e01-34d2a58116cc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:45:41"/>
+      <column name="ID_VALUE" value="22722783-aa87-418f-9686-9b97c0639cae"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="924e8914-6275-45d4-a36a-94f3b70a35b4"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
       <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="AB_ATTRIBUTERELATIONID" value="954bb22e-e098-48e3-a12a-d464519bdd4c"/>
       <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:32:53"/>
       <column name="ID_VALUE" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="95513181-69ac-4775-860a-42730e370e38"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:50:03"/>
       <column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="956d65fa-6c89-475b-9c85-3ce9265b4273"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="97429450-9cb5-4f8a-bd0f-c6c63c9afee9"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="9953ea99-685d-4fbb-afe7-eeeca76fb758"/>
       <column name="AB_ATTRIBUTE_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
       <column name="ID_VALUE" value="6d0cce07-4767-477b-af51-e9782ebdbe25"/>
-      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="9f7d0b52-0f03-4eb0-b0b2-e3751862a3a1"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
       <column name="ID_VALUE" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
-      <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="a433931c-412c-4a42-9a86-e5ca1e671a04"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
       <column name="ID_VALUE" value="DELIVEREX"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="a59304f1-2019-4191-a897-801747adb0e5"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="af83222e-56e3-4fc8-ab0b-d936227dcde0"/>
       <column name="AB_ATTRIBUTE_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
       <column name="ID_VALUE" value="0385b6e3-00cc-4018-847f-152364c3c11e"/>
-      <column name="OBJECT_ROWID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="b2bb8ab7-0e64-49fc-8e18-372ec0a03822"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
       <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
-      <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+    </insert>
+    <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="AB_ATTRIBUTERELATIONID" value="b3354836-6570-4162-9408-c118b1834a4e"/>
+      <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:49:24"/>
+      <column name="ID_VALUE" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Ticket"/>
       <column name="AB_ATTRIBUTERELATIONID" value="b39a7a7a-b33e-4894-a173-9f77ebb8a763"/>
       <column name="AB_ATTRIBUTE_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
       <column name="ID_VALUE" value="72bcad07-6f26-48c0-84b0-1e6ab46d88a9"/>
-      <column name="OBJECT_ROWID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
-      <column name="OBJECT_TYPE" value="Ticket"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="b45cc44c-77d2-4ba4-ae85-8b2046301a95"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="b482cf64-0b8c-49a3-8894-b50635bc2db2"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="b9712ac0-cf76-47c1-b059-9d7498b6fa5c"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="c0a7430e-6393-4d1a-9954-b67e9d6cd73d"/>
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:25"/>
       <column name="ID_VALUE" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
-      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="c7f04b7a-de66-4398-8810-2592d5ca8674"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:05"/>
       <column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="c87cf142-382a-426a-a4d6-07b71b6d41ed"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:50:59"/>
       <column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-      <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="cdab4a76-c6e6-4ffd-bae6-750128b6ed5d"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
       <column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="ce75da6e-b946-4a8c-a9dc-fb76cc20f0a1"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="d4974b69-d5b9-4e4e-9f39-de34622765b1"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="d4a3c8a0-2050-4147-abad-43a1f35ccbf0"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="d5cb44f7-6500-47ca-9dac-784b07d0b5f5"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:10"/>
       <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"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="df4e0db2-dbcb-46c2-b3ec-b7689ff2f3ba"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="e1beb5a9-acfa-4b7b-bc6d-735b1a669e10"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="e303b295-01ae-4dd4-bad1-35a70c6dc90f"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="e7ebccea-0850-4525-908c-040681de1bf4"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="edddb76a-348d-497b-9665-21acbe0bed0b"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
       <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
-      <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="ee0027e1-8fa2-4550-96f7-59c32461e2b0"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
       <column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="ef53917b-ae76-4903-a68a-ab0feb743288"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f1f8c53a-46e9-40a9-8be2-8f0775cafa64"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f3e49333-515d-4060-869a-888dee879b8f"/>
       <column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:56:25"/>
       <column name="ID_VALUE" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
-      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f5a05824-270c-4556-a992-e5af9491b734"/>
       <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
       <column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-      <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f69ac4cd-7d18-47b4-994f-4fda20f2bc9f"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f7824359-7f2c-4942-b959-465bf776ef7e"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
-      <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f7a60ce6-39c5-43b6-a14d-24b838f541b9"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
       <column name="ID_VALUE" value="SALPROJPOLLOW"/>
-      <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="f9404e0f-48cc-4a2b-a4f7-d260fe4f6e07"/>
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:10"/>
       <column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="fedc492c-cc5d-48cb-a7ee-0cef061facec"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
       <column name="ID_VALUE" value="PAYTERM30"/>
-      <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ab_attributerelation">
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="AB_ATTRIBUTERELATIONID" value="fffb23a5-20a8-40d9-b05f-b2bb822f2db1"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
       <column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
index 65cea7ecab918b754bd6311c0872f70c91e83b7d..553a0753b0ba68e30e4bf419527bc8324b3c3733 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
@@ -1,1548 +1,2648 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="a6134fe0-cbd5-4836-820a-59636ae15a58">
+  <changeSet author="autogenerated" id="dc70b18d-4875-42b1-ab34-9c37d7048750">
     <delete tableName="ab_loghistory"/>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-02T01:58:02"/>
-      <column name="DESCRIPTION" value="Kopftext: &quot;Gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Verknüpfung: &quot;Herr Markus Altinger | Industrial Steel AG&quot;,&#10;Datum: &quot;11.09.2018&quot;,&#10;Belegnummer: &quot;1015&quot;,&#10;Vers.-Nr.: &quot;1&quot;,&#10;Währung: &quot;EUR                                 &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Kopftext: &quot;Gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Verknüpfung: &quot;Herr Markus Altinger | Industrial Steel AG&quot;,&#10;Datum: &quot;11.09.2018&quot;,&#10;Belegnummer: &quot;1015&quot;,&#10;Vers.-Nr.: &quot;1&quot;,&#10;Währung: &quot;EUR                                 &quot; eingefügt."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="DATE_NEW" valueDate="2019-09-02T01:58:02"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-02T01:58:03"/>
-      <column name="DESCRIPTION" value="Betrag netto: &quot;0&quot;,&#10;UmsSt.: &quot;0&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: &quot;0&quot;,&#10;UmsSt.: &quot;0&quot; geändert."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="DATE_NEW" valueDate="2019-09-02T01:58:03"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Hier liegt die Kampagne für die Hannovermesse&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Kategorie: &quot;MAIL                                &quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Hier liegt die Kampagne für die Hannovermesse&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Kategorie: &quot;MAIL                                &quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;22924044-c41d-4130-b9c2-de51e3c9e928&quot;,&#10;Objekt: &quot;a10eaf09-7230-4889-a601-776de71cb71b&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;22924044-c41d-4130-b9c2-de51e3c9e928&quot;,&#10;Objekt: &quot;a10eaf09-7230-4889-a601-776de71cb71b&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="4d12c3fe-358a-440b-9008-33c58b235502"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4d12c3fe-358a-440b-9008-33c58b235502"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Kickoff Meeting am 1. Oktober&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Alle Teilnehmer werden zum Termin anwesend sein, werden den Ablauf und das Standpersonal besprechen.&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Kickoff Meeting am 1. Oktober&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Alle Teilnehmer werden zum Termin anwesend sein, werden den Ablauf und das Standpersonal besprechen.&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;38a20ed1-f75e-439d-957a-53cbb815a9fe&quot;,&#10;Objekt: &quot;a10eaf09-7230-4889-a601-776de71cb71b&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;38a20ed1-f75e-439d-957a-53cbb815a9fe&quot;,&#10;Objekt: &quot;a10eaf09-7230-4889-a601-776de71cb71b&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="557a8ef1-209f-4d0b-9ca9-b779ccf6ce8c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="557a8ef1-209f-4d0b-9ca9-b779ccf6ce8c"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Wichtige Teilnehmer einladen&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Wichtige Teilnehmer einladen&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;be9c6fd3-a401-4696-9382-442a20da6266&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;be9c6fd3-a401-4696-9382-442a20da6266&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="bd8df5fe-5aec-4f85-a12b-36a1225955da"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="bd8df5fe-5aec-4f85-a12b-36a1225955da"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:17:36"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Einladungen gehen 18.09 raus&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Erinnerung das heute die Einladungen versandt werden!&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;04.09.2019&quot;,&#10;Betreff: &quot;Einladungen gehen 18.09 raus&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Erinnerung das heute die Einladungen versandt werden!&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:17:36"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:17:36"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="62db9cd0-b240-4009-822e-a40cb81b671f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62db9cd0-b240-4009-822e-a40cb81b671f"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:17:36"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:17:53"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Erinnerung das am 18.09 die Einladungen versandt werden!&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Erinnerung das am 18.09 die Einladungen versandt werden!&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:17:53"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;27.08.2019&quot;,&#10;Betreff: &quot;Erste Planung für die Kampagne gelaufen&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;27.08.2019&quot;,&#10;Betreff: &quot;Erste Planung für die Kampagne gelaufen&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;&quot;,&#10;Richtung: &quot;x                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;0eec5c89-272c-4675-b8a3-3a17e5cc2907&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;0eec5c89-272c-4675-b8a3-3a17e5cc2907&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="3d6a37b4-33bb-4641-a62a-daed1216f43a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="3d6a37b4-33bb-4641-a62a-daed1216f43a"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:23:40"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;0eec5c89-272c-4675-b8a3-3a17e5cc2907&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;0eec5c89-272c-4675-b8a3-3a17e5cc2907&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="25a8fe8a-f75e-4696-970b-660b11540967"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="25a8fe8a-f75e-4696-970b-660b11540967"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:23:40"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:23:56"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;be9c6fd3-a401-4696-9382-442a20da6266&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;be9c6fd3-a401-4696-9382-442a20da6266&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="e763809c-f612-4879-be39-6c3f08339093"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e763809c-f612-4879-be39-6c3f08339093"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:23:56"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-04T09:24:17"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot;,&#10;Art: &quot;Campaign&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="8d91fe31-c2de-433a-b8ab-691a8970f7e6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8d91fe31-c2de-433a-b8ab-691a8970f7e6"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:24:17"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;zugewiesen&quot;,&#10;Bearbeiter: &quot;Herr Harold Smith | meine Firma&quot;,&#10;Beginn: &quot;05.09.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Beschreibung: &quot;Die Funktionalitäten des Tools erfüllen nicht die geforderten Funktionalitäten.&#10;Im Detail:  Die Zeiterfassung kann nicht zu Tickets erfasst werden.&#10;&quot;,&#10;Fällig: &quot;12.09.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Projektplanung fehlerhaft&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;zugewiesen&quot;,&#10;Bearbeiter: &quot;Herr Harold Smith | meine Firma&quot;,&#10;Beginn: &quot;05.09.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Beschreibung: &quot;Die Funktionalitäten des Tools erfüllen nicht die geforderten Funktionalitäten.&#10;Im Detail:  Die Zeiterfassung kann nicht zu Tickets erfasst werden.&#10;&quot;,&#10;Fällig: &quot;12.09.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Projektplanung fehlerhaft&quot; eingefügt."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Cause: &quot;Anwenderfehler&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Cause: &quot;Anwenderfehler&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Modul group: &quot;Produkt&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Modul group: &quot;Produkt&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Type: &quot;Fehler&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Type: &quot;Fehler&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Billable: &quot;Nein&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Billable: &quot;Nein&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
+      <column name="DATE_NEW" valueDate="2019-09-05T01:45:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-12T02:39:44"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;Decker&quot; auf &quot;Decken&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;Decker&quot; auf &quot;Decken&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
+      <column name="DATE_NEW" valueDate="2019-11-12T02:39:44"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-12T02:40:10"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;Mosby&quot; auf &quot;Mausbeier&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;Mosby&quot; auf &quot;Mausbeier&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
+      <column name="DATE_NEW" valueDate="2019-11-12T02:40:10"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-12T02:40:30"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;Scherbatsky&quot; auf &quot;Scherbatstein&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;Scherbatsky&quot; auf &quot;Scherbatstein&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
+      <column name="DATE_NEW" valueDate="2019-11-12T02:40:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-12T02:41:05"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;von Matterhorn&quot; auf &quot;von Alpenhorn&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;von Matterhorn&quot; auf &quot;von Alpenhorn&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
+      <column name="DATE_NEW" valueDate="2019-11-12T02:41:05"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-12T02:50:52"/>
-      <column name="DESCRIPTION" valueClobFile="ab_loghistory/DESCRIPTION/clobFiles/6797689c3c12b094b0147a099343a309.txt"/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" valueClobFile="ab_loghistory/DESCRIPTION/clobFiles/6797689c3c12b094b0147a099343a309.txt"/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
+      <column name="DATE_NEW" valueDate="2019-11-12T02:50:52"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;13.11.2019&quot;,&#10;Betreff: &quot;Neuer Kontaktpunkt zum Produkt&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;13.11.2019&quot;,&#10;Betreff: &quot;Neuer Kontaktpunkt zum Produkt&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
+      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T07:56:20"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;&#10;&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;unsere Firma hat Interesse an ihren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bitte kontaktieren sie mich f&amp;uuml;r weitere Besprechungen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;&#10;&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;unsere Firma hat Interesse an ihren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bitte kontaktieren sie mich f&amp;uuml;r weitere Besprechungen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T07:56:20"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T07:57:27"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hatte ersten Kontakt mit dem Projektzust&amp;auml;ndigen Tim Admin gehabt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktinformationen werden versandt.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hatte ersten Kontakt mit dem Projektzust&amp;auml;ndigen Tim Admin gehabt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktinformationen werden versandt.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T07:57:27"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:02:47"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;d5a2dc64-e503-4aed-a0c6-d54f49b8db87&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;d5a2dc64-e503-4aed-a0c6-d54f49b8db87&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="a9b38151-dc23-4e47-9574-dc99eea2e7d4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a9b38151-dc23-4e47-9574-dc99eea2e7d4"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:02:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:02:58"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;d5a2dc64-e503-4aed-a0c6-d54f49b8db87&quot;,&#10;Art: &quot;Person&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;d5a2dc64-e503-4aed-a0c6-d54f49b8db87&quot;,&#10;Art: &quot;Person&quot; gelöscht."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="a9b38151-dc23-4e47-9574-dc99eea2e7d4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a9b38151-dc23-4e47-9574-dc99eea2e7d4"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:02:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:03:11"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d608cae4-7b54-4a12-95f3-5b9eac3d04ef&quot;,&#10;Objekt: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="6e0b4cc4-6784-4952-8bf9-c3d644c6a38c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="6e0b4cc4-6784-4952-8bf9-c3d644c6a38c"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:03:11"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:04:31"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kurzes Gespr&amp;auml;ch gef&amp;uuml;hrt mit Herr Altinger.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten seine R&amp;uuml;ckfragen zu unserem Produkt erstmal kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kurzes Gespr&amp;auml;ch gef&amp;uuml;hrt mit Herr Altinger.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten seine R&amp;uuml;ckfragen zu unserem Produkt erstmal kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:04:31"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:05:11"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;e3be48af-e679-4b3a-972f-ad17239e3bb4&quot;,&#10;Objekt: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;e3be48af-e679-4b3a-972f-ad17239e3bb4&quot;,&#10;Objekt: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="4c9fc29d-261b-4165-9109-94bfabd71544"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4c9fc29d-261b-4165-9109-94bfabd71544"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:05:11"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:05:24"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:05:24"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:05:54"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:05:54"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:06:04"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:06:04"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:06:13"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:06:13"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:08:53"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:08:53"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:10:47"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:10:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:11:25"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Kategorie: &quot;ONLINE-MEETING                      &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Kategorie: &quot;ONLINE-MEETING                      &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:11:25"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:11:41"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:11:41"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:12:36"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:12:36"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:13:21"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Automatischer Import:&lt;/p&gt;&#10;&#10;&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Automatischer Import:&lt;/p&gt;&#10;&#10;&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:13:21"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:21:44"/>
-      <column name="DESCRIPTION" value="Datum: von &quot;14.06.2019&quot; auf &quot;10.10.2017&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Datum: von &quot;14.06.2019&quot; auf &quot;10.10.2017&quot; geändert."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:21:44"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:27:42"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:27:42"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:27:50"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:27:50"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:28:29"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:28:29"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:28:51"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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;&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;i                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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;&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;i                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:28:51"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:29:45"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sehr geehrter Herr Admin,&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sehr geehrter Herr Admin,&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:29:45"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:30:17"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:30:17"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:30:51"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:30:51"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:31:46"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:31:46"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:32:09"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:32:09"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:32:30"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:32:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:32:42"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;Tim Admin&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;&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&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;Tim Admin&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;&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:32:42"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:33:11"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:33:11"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:33:43"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:33:43"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:33:58"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;Tim Admin&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:33:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:34:33"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;So wie besprochen mit den korrigierten Produktpreisen.&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;Tim Admin&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&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;So wie besprochen mit den korrigierten Produktpreisen.&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;Tim Admin&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:34:33"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:34:56"/>
-      <column name="DESCRIPTION" value="Betreff: von &quot;Neuer Kontaktpunkt zum Produkt&quot; auf &quot;Neuer Kontaktpunkt zum Produkt C&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betreff: von &quot;Neuer Kontaktpunkt zum Produkt&quot; auf &quot;Neuer Kontaktpunkt zum Produkt C&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:34:56"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:35:08"/>
-      <column name="DESCRIPTION" value="Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:35:08"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:37:04"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;45635aca-7971-43df-a683-c80c86cb58cc&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;45635aca-7971-43df-a683-c80c86cb58cc&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="04eabfbc-b143-4eba-ab09-2bb6341bb194"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="04eabfbc-b143-4eba-ab09-2bb6341bb194"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:37:04"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:37:32"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;6e667085-bb97-4039-8dfe-2230002985e0&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;e265a424-b343-4bc1-b1cd-d40b9405ca12&quot;,&#10;Objekt: &quot;6e667085-bb97-4039-8dfe-2230002985e0&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="b0df24a5-a162-40aa-b240-04c03845f896"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b0df24a5-a162-40aa-b240-04c03845f896"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:37:32"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:38:27"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Produktinformationen zu produkt C versandt.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Produktinformationen zu produkt C versandt.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:38:27"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:39:33"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:39:33"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:39:45"/>
-      <column name="DESCRIPTION" value="Betreff: von &quot;Produkt gekauft&quot; auf &quot;Produkt gemietet.&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betreff: von &quot;Produkt gekauft&quot; auf &quot;Produkt gemietet.&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:39:45"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:40:25"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;Solano&quot; auf &quot;Solana&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;Solano&quot; auf &quot;Solana&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:40:25"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:40:55"/>
-      <column name="DESCRIPTION" value="Nachname: von &quot;Ericson&quot; auf &quot;Ericsan&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Nachname: von &quot;Ericson&quot; auf &quot;Ericsan&quot; geändert."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:40:55"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:43:08"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sehr geehrter Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sehr geehrter Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:43:08"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:43:21"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:43:21"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:43:34"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:43:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:43:44"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:43:44"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:43:58"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;VISIT                               &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;VISIT                               &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:43:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:44:11"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:44:11"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:44:24"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hallo Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hallo Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:44:24"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:44:30"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Hallo Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Hallo Herr von Alpenhorn,&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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:44:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:44:38"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:44:38"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:44:58"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hr. von Alpenhorn 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;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Hr. von Alpenhorn 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;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:44:58"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;Rahmenvertrag an den neuen Kunden versandt&quot;,&#10;Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Spezifikationen wurden so mit dem Kunden besprochen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Er erh&amp;auml;lt in den ersten zwei Jahren 10 % Nachlass.&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;MAIL                                &quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;Rahmenvertrag an den neuen Kunden versandt&quot;,&#10;Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Spezifikationen wurden so mit dem Kunden besprochen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Er erh&amp;auml;lt in den ersten zwei Jahren 10 % Nachlass.&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;MAIL                                &quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;b2c211a7-6dcf-450b-b420-9f04d790de7a&quot;,&#10;Art: &quot;Contract&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;b2c211a7-6dcf-450b-b420-9f04d790de7a&quot;,&#10;Art: &quot;Contract&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="b65b384e-dfd6-4633-8a0b-f9382a03a495"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b65b384e-dfd6-4633-8a0b-f9382a03a495"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;f7b8f0c3-7702-4466-b502-d21fa4fa0010&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b&quot;,&#10;Objekt: &quot;f7b8f0c3-7702-4466-b502-d21fa4fa0010&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:50:49"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;1a67eaa7-21da-4a18-97ab-755ac5cb74f7&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;1a67eaa7-21da-4a18-97ab-755ac5cb74f7&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:50:49"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:51:09"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;1a67eaa7-21da-4a18-97ab-755ac5cb74f7&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;1a67eaa7-21da-4a18-97ab-755ac5cb74f7&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:51:09"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:51:30"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;PHONE                               &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:51:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:51:37"/>
-      <column name="DESCRIPTION" value="Betreff: von &quot;Gespräch mit Frau Decker&quot; auf &quot;Gespräch mit Frau Decken&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betreff: von &quot;Gespräch mit Frau Decker&quot; auf &quot;Gespräch mit Frau Decken&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:51:37"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:51:59"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:51:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:52:54"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;62486e9e-52c6-476f-b1e3-5d62e3f6384e&quot;,&#10;Objekt: &quot;19c6bf30-cd8b-40df-980c-ce71c92c194c&quot;,&#10;Art: &quot;Person&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;62486e9e-52c6-476f-b1e3-5d62e3f6384e&quot;,&#10;Objekt: &quot;19c6bf30-cd8b-40df-980c-ce71c92c194c&quot;,&#10;Art: &quot;Person&quot; gelöscht."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="3deeae10-5bcf-4474-bacb-571d49e88860"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="3deeae10-5bcf-4474-bacb-571d49e88860"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:52:54"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:53:17"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;i                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;i                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:53:17"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:53:32"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Herr Morgenstern hat differenziert von Frau Decken&amp;nbsp;nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Herr Morgenstern hat differenziert von Frau Decken&amp;nbsp;nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:53:32"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:53:48"/>
-      <column name="DESCRIPTION" value="Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:53:48"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:54:17"/>
-      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beschreibung: &quot;&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:54:17"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:54:30"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;i                                   &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;&quot;,&#10;Kategorie: &quot;VISIT                               &quot;,&#10;Richtung: von &quot;i                                   &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:54:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:55:02"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:55:02"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:55:20"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;o                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:55:20"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:55:41"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:55:41"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:55:59"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:55:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:56:15"/>
-      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Verantwortlich: &quot;ef345d11-a40d-59e0-a24c-afcb6095d2cb&quot;,&#10;Richtung: von &quot;inx                                 &quot; auf &quot;x                                   &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:56:15"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;12.08.2019&quot;,&#10;Betreff: &quot;Rahmenvertrag versandt&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Rahmenvertrag wurde an die Legal Abteilung des Kunden versandt.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Warte auf R&amp;uuml;ckmeldung.&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;12.08.2019&quot;,&#10;Betreff: &quot;Rahmenvertrag versandt&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Beschreibung: &quot;&lt;p&gt;Rahmenvertrag wurde an die Legal Abteilung des Kunden versandt.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Warte auf R&amp;uuml;ckmeldung.&lt;/p&gt;&#10;&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;6a92df58-2b98-40da-ba6a-d0ddb1fde234&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;6a92df58-2b98-40da-ba6a-d0ddb1fde234&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T08:57:28"/>
-      <column name="DESCRIPTION" value="Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Kategorie: &quot;MAIL                                &quot; geändert."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:57:28"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T09:00:14"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;29271db0-4253-46c9-b7c2-5e25376b9d19&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;9c22ba51-8a09-40f1-b6b8-9787fe43b141&quot;,&#10;Objekt: &quot;29271db0-4253-46c9-b7c2-5e25376b9d19&quot;,&#10;Art: &quot;Person&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="d1a33dfd-92c8-4d66-bd21-8a81fbddba06"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d1a33dfd-92c8-4d66-bd21-8a81fbddba06"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T09:00:14"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Anforderer: &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Status: &quot;zugewiesen&quot;,&#10;Bearbeiter: &quot;Herr Herbert Obermeier | meine Firma&quot;,&#10;Beginn: &quot;15.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Beschreibung: &quot;Verpackung der Ware hat bei Zustellung äußerliche Beschädigungen aufgewiesen. An den gleichen Stellen ist die Ware ebenfalls beshädigt.&quot;,&#10;Fällig: &quot;22.11.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Beschädigte Ware&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Anforderer: &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Status: &quot;zugewiesen&quot;,&#10;Bearbeiter: &quot;Herr Herbert Obermeier | meine Firma&quot;,&#10;Beginn: &quot;15.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Beschreibung: &quot;Verpackung der Ware hat bei Zustellung äußerliche Beschädigungen aufgewiesen. An den gleichen Stellen ist die Ware ebenfalls beshädigt.&quot;,&#10;Fällig: &quot;22.11.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Beschädigte Ware&quot; eingefügt."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Task Id: &quot;46164eac-62d1-4dbb-a252-93ac49429855&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Task Id: &quot;46164eac-62d1-4dbb-a252-93ac49429855&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="TASKLINK"/>
-      <column name="TABLENAMEID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Type: &quot;Fehler&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Type: &quot;Fehler&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Modul group: &quot;Produkt&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Modul group: &quot;Produkt&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
-      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Cause: &quot;Lieferprobleme&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Ticket / Support / Cause: &quot;Lieferprobleme&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;Anforderungen Bilderdokumentation&quot;,&#10;Parent Id: &quot;634ad7a8-9c68-4ea4-8385-f5bb37224482&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Kategorie: &quot;PHONE                               &quot;,&#10;Richtung: &quot;o                                   &quot;,&#10;Parent context: &quot;SupportTicket&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;Anforderungen Bilderdokumentation&quot;,&#10;Parent Id: &quot;634ad7a8-9c68-4ea4-8385-f5bb37224482&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Kategorie: &quot;PHONE                               &quot;,&#10;Richtung: &quot;o                                   &quot;,&#10;Parent context: &quot;SupportTicket&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;b8067a42-d059-4d86-88b0-485a194faa36&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;b8067a42-d059-4d86-88b0-485a194faa36&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T11:12:57"/>
-      <column name="DESCRIPTION" value="Name: &quot;Erstkontakt ADITO&quot;,&#10;Dokumentvorlage: &quot;Erstkontakt ADITO&quot;,&#10;Betreff: &quot;Email Vorlage Erstkontakt&quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Name: &quot;Erstkontakt ADITO&quot;,&#10;Dokumentvorlage: &quot;Erstkontakt ADITO&quot;,&#10;Betreff: &quot;Email Vorlage Erstkontakt&quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="TABLENAME" value="BULKMAIL"/>
-      <column name="TABLENAMEID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:12:57"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T12:39:16"/>
-      <column name="DESCRIPTION" value="Bezeichnung: &quot;Ersatzteil 3&quot;,&#10;Menge: &quot;50&quot;,&#10;Einheit: &quot;Stück&quot;,&#10;UmsSt. in %: &quot;19.00&quot;,&#10;Einzelpreis: &quot;1060.00&quot;,&#10;Position: &quot;1&quot;,&#10;Warengruppe: &quot;Ersatzteile&quot;,&#10;Artikel: &quot;6e52e636-284d-454b-978c-8f58844c5c5b&quot;,&#10;Optional: &quot;Nein&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
-      <column name="SOURCE_TABLENAMEID" value="3d9a18ac-2182-4cd5-a2c4-140674466821"/>
+      <column name="DESCRIPTION" value="Bezeichnung: &quot;Ersatzteil 3&quot;,&#10;Menge: &quot;50&quot;,&#10;Einheit: &quot;Stück&quot;,&#10;UmsSt. in %: &quot;19.00&quot;,&#10;Einzelpreis: &quot;1060.00&quot;,&#10;Position: &quot;1&quot;,&#10;Warengruppe: &quot;Ersatzteile&quot;,&#10;Artikel: &quot;6e52e636-284d-454b-978c-8f58844c5c5b&quot;,&#10;Optional: &quot;Nein&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="SOURCE_TABLENAMEID" value="3d9a18ac-2182-4cd5-a2c4-140674466821"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T12:39:16"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T12:39:16"/>
-      <column name="DESCRIPTION" value="Betrag netto: von &quot;0.00&quot; auf &quot;53000&quot;,&#10;UmsSt.: von &quot;0.00&quot; auf &quot;10070&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;0.00&quot; auf &quot;53000&quot;,&#10;UmsSt.: von &quot;0.00&quot; auf &quot;10070&quot; geändert."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T12:39:16"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T12:40:52"/>
-      <column name="DESCRIPTION" value="Kopftext: &quot;Gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Verknüpfung: &quot;Herr Markus Altinger | Industrial Steel AG&quot;,&#10;Datum: &quot;15.11.2019&quot;,&#10;Belegnummer: &quot;1016&quot;,&#10;Vers.-Nr.: &quot;1&quot;,&#10;Währung: &quot;EUR                                 &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Kopftext: &quot;Gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Verknüpfung: &quot;Herr Markus Altinger | Industrial Steel AG&quot;,&#10;Datum: &quot;15.11.2019&quot;,&#10;Belegnummer: &quot;1016&quot;,&#10;Vers.-Nr.: &quot;1&quot;,&#10;Währung: &quot;EUR                                 &quot; eingefügt."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T12:40:52"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T12:40:52"/>
-      <column name="DESCRIPTION" value="Betrag netto: &quot;0&quot;,&#10;UmsSt.: &quot;0&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: &quot;0&quot;,&#10;UmsSt.: &quot;0&quot; geändert."/>
       <column name="TABLENAME" value="SALESORDER"/>
-      <column name="TABLENAMEID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T12:40:52"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
-      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;fällig&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Entry date: &quot;15.11.2019&quot;,&#10;Betreff: &quot;fällig&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Richtung: &quot;o                                   &quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Art: &quot;Salesproject&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Art: &quot;Salesproject&quot; eingefügt."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="d0e0ddd2-1b8f-4e1f-aa47-47a72086245e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d0e0ddd2-1b8f-4e1f-aa47-47a72086245e"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T01:06:15"/>
-      <column name="DESCRIPTION" value="Phase: von &quot;MQC&quot; auf &quot;SQO&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Phase: von &quot;MQC&quot; auf &quot;SQO&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT"/>
-      <column name="TABLENAMEID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T01:06:15"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-15T01:06:15"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Date start: &quot;15.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Date start: &quot;15.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="d51e2f85-5767-4cfb-9252-b314813152ed"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d51e2f85-5767-4cfb-9252-b314813152ed"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T01:06:15"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T09:22:34"/>
-      <column name="DESCRIPTION" value="Firma: &quot;privat&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Firma: &quot;privat&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:22:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T09:22:34"/>
-      <column name="DESCRIPTION" value="Nachname: &quot;Leierseder&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Nachname: &quot;Leierseder&quot; eingefügt."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="54e015f0-e626-484e-9c55-931d3210d1e9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="54e015f0-e626-484e-9c55-931d3210d1e9"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:22:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T09:22:44"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gering&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gering&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:22:44"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T09:27:18"/>
-      <column name="DESCRIPTION" value="Nachname: &quot;Leierseder&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Nachname: &quot;Leierseder&quot; gelöscht."/>
       <column name="TABLENAME" value="PERSON"/>
-      <column name="TABLENAMEID" value="54e015f0-e626-484e-9c55-931d3210d1e9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="54e015f0-e626-484e-9c55-931d3210d1e9"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:27:18"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T09:27:18"/>
-      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Firma: &quot;privat&quot;,&#10;Status: &quot;Aktiv&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Firma: &quot;privat&quot;,&#10;Status: &quot;Aktiv&quot; gelöscht."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:27:18"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T10:00:18"/>
-      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;neu&quot;,&#10;Bearbeiter: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: &quot;25.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Fällig: &quot;02.12.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Controlling Termin Vorbereiten&quot;,&#10;Geschützt: &quot;Nein&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;neu&quot;,&#10;Bearbeiter: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: &quot;25.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Fällig: &quot;02.12.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Controlling Termin Vorbereiten&quot;,&#10;Geschützt: &quot;Nein&quot; eingefügt."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="eadbfbc2-3664-49c8-bda1-b6f8e15e5f21"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="eadbfbc2-3664-49c8-bda1-b6f8e15e5f21"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T10:00:18"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T10:01:00"/>
-      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;neu&quot;,&#10;Bearbeiter: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: &quot;26.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Fällig: &quot;02.12.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Rückruf Herr. Feldner&quot;,&#10;Geschützt: &quot;Nein&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Anforderer: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Status: &quot;neu&quot;,&#10;Bearbeiter: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: &quot;26.11.2019&quot;,&#10;Fortschritt: &quot;0%&quot;,&#10;Fällig: &quot;02.12.2019&quot;,&#10;Priorität: &quot;niedrig&quot;,&#10;Betreff: &quot;Rückruf Herr. Feldner&quot;,&#10;Geschützt: &quot;Nein&quot; eingefügt."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T10:01:00"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T01:27:33"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:27:33"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
-      <column name="DESCRIPTION" value="Firma: &quot;Firmengruppe Matthias Bogen&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Firma: &quot;Firmengruppe Matthias Bogen&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
-      <column name="DESCRIPTION" value="Ort: &quot;Geisenhausen&quot;,&#10;Adresstyp: &quot;Privatadresse&quot;,&#10;Adresse: &quot;Konrad&quot;,&#10;Land: &quot;Deutschland&quot;,&#10;postcode: &quot;84144&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="SOURCE_TABLENAME" value="ADDRESS"/>
-      <column name="SOURCE_TABLENAMEID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
+      <column name="DESCRIPTION" value="Ort: &quot;Geisenhausen&quot;,&#10;Adresstyp: &quot;Privatadresse&quot;,&#10;Adresse: &quot;Konrad&quot;,&#10;Land: &quot;Deutschland&quot;,&#10;postcode: &quot;84144&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="SOURCE_TABLENAMEID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
-      <column name="DESCRIPTION" value="Kommunikation Mobil: &quot;+49 176 48525800&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Kommunikation Mobil: &quot;+49 176 48525800&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Handel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Handel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Service&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Service&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Maschinenbau&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:25:13"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:25:13"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Logistik&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:26:47"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:26:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;gross&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: &quot;mittel&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
-      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: &quot;Bauwesen&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:29:30"/>
-      <column name="DESCRIPTION" value="Name: &quot;Serienmail - Newsletter&quot;,&#10;Betreff: &quot;Newsletter 2020&quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Name: &quot;Serienmail - Newsletter&quot;,&#10;Betreff: &quot;Newsletter 2020&quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="TABLENAME" value="BULKMAIL"/>
-      <column name="TABLENAMEID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:29:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:30:20"/>
-      <column name="DESCRIPTION" value="Name: &quot;Produktinformationen&quot;,&#10;Betreff: &quot;Produktinformationen &quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Name: &quot;Produktinformationen&quot;,&#10;Betreff: &quot;Produktinformationen &quot;,&#10;Sender: &quot;tadmin@meine-firma.de&quot; eingefügt."/>
       <column name="TABLENAME" value="BULKMAIL"/>
-      <column name="TABLENAMEID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:30:20"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:31:13"/>
-      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;Weihnachtskarte&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;Weihnachtskarte&quot; eingefügt."/>
       <column name="TABLENAME" value="SERIALLETTER"/>
-      <column name="TABLENAMEID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:31:13"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:31:56"/>
-      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;Einladung Kundentag&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;Einladung Kundentag&quot; eingefügt."/>
       <column name="TABLENAME" value="SERIALLETTER"/>
-      <column name="TABLENAMEID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:31:56"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:32:35"/>
-      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;VIP Kundeneinladungen&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Geschaeftspapiere&quot;,&#10;Titel: &quot;VIP Kundeneinladungen&quot; eingefügt."/>
       <column name="TABLENAME" value="SERIALLETTER"/>
-      <column name="TABLENAMEID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:32:35"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:38:18"/>
-      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Erstkontakt meineFirma&quot;,&#10;Betreff: von &quot;Newsletter 2020&quot; auf &quot;Erstkontakt meineFirma&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Erstkontakt meineFirma&quot;,&#10;Betreff: von &quot;Newsletter 2020&quot; auf &quot;Erstkontakt meineFirma&quot; geändert."/>
       <column name="TABLENAME" value="BULKMAIL"/>
-      <column name="TABLENAMEID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:38:18"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T06:39:20"/>
-      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Erstkontakt ADITO&quot;,&#10;Betreff: von &quot;Produktinformationen &quot; auf &quot;Email Vorlage Erstkontakt&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Dokumentvorlage: &quot;Erstkontakt ADITO&quot;,&#10;Betreff: von &quot;Produktinformationen &quot; auf &quot;Email Vorlage Erstkontakt&quot; geändert."/>
       <column name="TABLENAME" value="BULKMAIL"/>
-      <column name="TABLENAMEID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T06:39:20"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:17:08"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;13e60843-5d6d-45ee-88c7-46db41874138&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;3cee0474-504f-43cc-844a-715f1a0db271&quot;,&#10;Object relation type 2: &quot;fa879afd-b2c5-4eee-9799-d63c6764b348&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;13e60843-5d6d-45ee-88c7-46db41874138&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;3cee0474-504f-43cc-844a-715f1a0db271&quot;,&#10;Object relation type 2: &quot;fa879afd-b2c5-4eee-9799-d63c6764b348&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
-      <column name="TABLENAMEID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:17:08"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:17:20"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
-      <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:17:20"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:17:47"/>
-      <column name="DESCRIPTION" value="Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object 1 row Id: &quot;b043cd42-058c-48bd-8326-4c92e0e74c48&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot; gelöscht."/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
-      <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:17:47"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:18:26"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;62175b31-b432-4ec6-932f-8e69033884c6&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;62175b31-b432-4ec6-932f-8e69033884c6&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot;,&#10;Object relation type 2: &quot;0795a3cd-295b-421b-aed1-decc09b05362&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
-      <column name="TABLENAMEID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:18:26"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:19:02"/>
-      <column name="DESCRIPTION" value="Object 1 row Id: &quot;97b66b3c-a9f5-4dc4-902e-850d69973d1d&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;c9b7ce6b-1100-46f6-8498-2da6ac24189e&quot;,&#10;Object relation type 2: &quot;259babbd-7827-44d4-b9ec-8245d27b5f70&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Object 1 row Id: &quot;97b66b3c-a9f5-4dc4-902e-850d69973d1d&quot;,&#10;Object 2 row Id: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Object relation type 1: &quot;c9b7ce6b-1100-46f6-8498-2da6ac24189e&quot;,&#10;Object relation type 2: &quot;259babbd-7827-44d4-b9ec-8245d27b5f70&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_OBJECTRELATION"/>
-      <column name="TABLENAMEID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:19:02"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:26:48"/>
-      <column name="DESCRIPTION" value="Funktion: &quot;Vertriebsleiter&quot;,&#10;Abteilung: &quot;Vertrieb&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Funktion: &quot;Vertriebsleiter&quot;,&#10;Abteilung: &quot;Vertrieb&quot; geändert."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:26:48"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
-      <column name="DESCRIPTION" value="Firma: &quot;Skyscraper Bau GmbH&quot;,&#10;Funktion: &quot;Koordinator&quot;,&#10;Abteilung: &quot;Produktion&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Firma: &quot;Skyscraper Bau GmbH&quot;,&#10;Funktion: &quot;Koordinator&quot;,&#10;Abteilung: &quot;Produktion&quot;,&#10;Status: &quot;Aktiv&quot;,&#10;Sprache: &quot;deu&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
-      <column name="DESCRIPTION" value="Ort: &quot;Landshut&quot;,&#10;Adresstyp: &quot;Privatadresse&quot;,&#10;Adresse: &quot;Innere Münchner Straße&quot;,&#10;Land: &quot;Deutschland&quot;,&#10;postcode: &quot;84028&quot;,&#10;Hausnummer: &quot;3&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
       <column name="SOURCE_TABLENAME" value="ADDRESS"/>
-      <column name="SOURCE_TABLENAMEID" value="98652f91-7775-4e96-bc90-034669fceeac"/>
+      <column name="DESCRIPTION" value="Ort: &quot;Landshut&quot;,&#10;Adresstyp: &quot;Privatadresse&quot;,&#10;Adresse: &quot;Innere Münchner Straße&quot;,&#10;Land: &quot;Deutschland&quot;,&#10;postcode: &quot;84028&quot;,&#10;Hausnummer: &quot;3&quot; eingefügt."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
+      <column name="SOURCE_TABLENAMEID" value="98652f91-7775-4e96-bc90-034669fceeac"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T08:28:23"/>
-      <column name="DESCRIPTION" value="Funktion: von &quot;Vertriebsleiter&quot; auf &quot;Berater&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Funktion: von &quot;Vertriebsleiter&quot; auf &quot;Berater&quot; geändert."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:28:23"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;2c63e0de-f21c-474f-89d7-bff8ba1dbf43&quot;,&#10;Art: &quot;Organisation&quot; gelöscht."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
-      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Art: &quot;Salesproject&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Activity Id: &quot;c7c29526-3138-4264-8eb4-c6876797f8fe&quot;,&#10;Objekt: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Art: &quot;Salesproject&quot; gelöscht."/>
       <column name="TABLENAME" value="ACTIVITYLINK"/>
-      <column name="TABLENAMEID" value="d0e0ddd2-1b8f-4e1f-aa47-47a72086245e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d0e0ddd2-1b8f-4e1f-aa47-47a72086245e"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
-      <column name="DESCRIPTION" value="Richtung: &quot;o                                   &quot;,&#10;Entry date: &quot;15.11.2019&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Betreff: &quot;fällig&quot; gelöscht."/>
       <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Richtung: &quot;o                                   &quot;,&#10;Entry date: &quot;15.11.2019&quot;,&#10;Verantwortlich: &quot;c7ddf982-0e58-4152-b82b-8f5673b0b729&quot;,&#10;Betreff: &quot;fällig&quot; gelöscht."/>
       <column name="TABLENAME" value="ACTIVITY"/>
-      <column name="TABLENAMEID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:30"/>
-      <column name="DESCRIPTION" value="Phase: von &quot;SQO&quot; auf &quot;MQC&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Phase: von &quot;SQO&quot; auf &quot;MQC&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT"/>
-      <column name="TABLENAMEID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:30"/>
-      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:30"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:31"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;ef7f4726-4476-4f59-97c2-706dc1e0046f&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;ef7f4726-4476-4f59-97c2-706dc1e0046f&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:31"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
-      <column name="DESCRIPTION" value="Phase: von &quot;SQO&quot; auf &quot;SAL&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Phase: von &quot;SQO&quot; auf &quot;SAL&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT"/>
-      <column name="TABLENAMEID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
-      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;d422ad81-717f-42b0-bd64-fc892744aac7&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;d422ad81-717f-42b0-bd64-fc892744aac7&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="e33c0567-8085-4a1e-a7f6-131353297ebf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e33c0567-8085-4a1e-a7f6-131353297ebf"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:43:46"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:45:12"/>
-      <column name="DESCRIPTION" value="Status: von &quot;neu&quot; auf &quot;in Bearbeitung&quot;,&#10;Fortschritt: von &quot;0%&quot; auf &quot;50%&quot;,&#10;Priorität: von &quot;niedrig&quot; auf &quot;hoch&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Status: von &quot;neu&quot; auf &quot;in Bearbeitung&quot;,&#10;Fortschritt: von &quot;0%&quot; auf &quot;50%&quot;,&#10;Priorität: von &quot;niedrig&quot; auf &quot;hoch&quot; geändert."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:45:12"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:45:24"/>
-      <column name="DESCRIPTION" value="Status: von &quot;in Bearbeitung&quot; auf &quot;abgeschlossen&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Status: von &quot;in Bearbeitung&quot; auf &quot;abgeschlossen&quot; geändert."/>
       <column name="TABLENAME" value="TASK"/>
-      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:45:24"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
-      <column name="DESCRIPTION" value="Phase: von &quot;Negotiation&quot; auf &quot;Angebot&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Phase: von &quot;Negotiation&quot; auf &quot;Angebot&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT"/>
-      <column name="TABLENAMEID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
-      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Date end: &quot;26.11.2019&quot; geändert."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;7e2680f6-a438-45aa-956a-787363f85923&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;7e2680f6-a438-45aa-956a-787363f85923&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="8fb45194-7ced-475f-be58-7780c359dd0f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8fb45194-7ced-475f-be58-7780c359dd0f"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:00"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
-      <column name="DESCRIPTION" value="Projektnummer: &quot;1007&quot;,&#10;Roll Out: &quot;26.11.2020&quot;,&#10;Projekttitel: &quot;Projekt 123&quot;,&#10;Projektstart: &quot;26.11.2019&quot;,&#10;Firma: &quot;Glob Group&quot;,&#10;Phase: &quot;NQC&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Projektnummer: &quot;1007&quot;,&#10;Roll Out: &quot;26.11.2020&quot;,&#10;Projekttitel: &quot;Projekt 123&quot;,&#10;Projektstart: &quot;26.11.2019&quot;,&#10;Firma: &quot;Glob Group&quot;,&#10;Phase: &quot;NQC&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT"/>
-      <column name="TABLENAMEID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="97ac26df-2333-461c-958e-83fbc6f743ed"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="97ac26df-2333-461c-958e-83fbc6f743ed"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
-      <column name="DESCRIPTION" value="Salesproject Id: &quot;ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Salesproject Id: &quot;ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba&quot;,&#10;Date start: &quot;26.11.2019&quot; eingefügt."/>
       <column name="TABLENAME" value="SALESPROJECT_MILESTONE"/>
-      <column name="TABLENAMEID" value="ba8d15aa-3851-451b-9230-70eb7fb4ed6c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ba8d15aa-3851-451b-9230-70eb7fb4ed6c"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
-      <column name="DESCRIPTION" value="Eigenschaft Project type: &quot;Bestandskunde&quot; eingefügt."/>
       <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Project type: &quot;Bestandskunde&quot; eingefügt."/>
       <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
-      <column name="TABLENAMEID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T12:48:39"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T01:00:57"/>
-      <column name="DESCRIPTION" value="Funktion: von &quot;Vertriebsmitarbeiter&quot; auf &quot;Einkaufsleiter&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Funktion: von &quot;Vertriebsmitarbeiter&quot; auf &quot;Einkaufsleiter&quot; geändert."/>
       <column name="TABLENAME" value="CONTACT"/>
-      <column name="TABLENAMEID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T01:00:57"/>
     </insert>
     <insert tableName="ab_loghistory">
-      <column name="DATE_NEW" valueDate="2019-11-26T01:01:24"/>
-      <column name="DESCRIPTION" value="Funktion: von &quot;Einkaufsleiter&quot; auf &quot;Vertriebsleiter&quot; geändert."/>
       <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Funktion: von &quot;Einkaufsleiter&quot; auf &quot;Vertriebsleiter&quot; geändert."/>
       <column name="TABLENAME" value="CONTACT"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="TABLENAMEID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T01:01:24"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;15.11.2019&quot; auf &quot;15.09.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:19:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;15.11.2019&quot; auf &quot;16.09.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:20:13"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;13.11.2019&quot; auf &quot;11.09.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:21:09"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Campaign&quot;,&#10;Aktivitäten ID: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;680de39f-7f1c-4dca-8c67-9c16c3395c3f&quot; gelöscht."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8d91fe31-c2de-433a-b8ab-691a8970f7e6"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:22:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Campaign&quot;,&#10;Aktivitäten ID: &quot;c42c23ef-3921-4a10-bb9a-040178f28bd2&quot;,&#10;Objekt: &quot;996b8af6-13f4-4606-a303-69f941cf6f13&quot; gelöscht."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62db9cd0-b240-4009-822e-a40cb81b671f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:22:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Betreff: &quot;Einladungen gehen 18.09 raus&quot;,&#10;Eingangsdatum: &quot;04.09.2019&quot;,&#10;Verantwortlich: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beschreibung: &quot;[BLOB]&#10;&quot;,&#10;Richtung: &quot;Intern&quot; gelöscht."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:22:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;04.09.2019&quot; auf &quot;08.07.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:22:38"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;12.08.2019&quot; auf &quot;10.06.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:23:05"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;23.05.2019&quot; auf &quot;21.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:23:24"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;17.05.2019&quot; auf &quot;15.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:24:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;15.05.2019&quot; auf &quot;06.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:24:27"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;17.04.2019&quot; auf &quot;08.04.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:24:40"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;08.04.2019&quot; auf &quot;06.04.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:25:06"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;08.04.2019&quot; auf &quot;02.04.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:25:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;29.03.2019&quot; auf &quot;27.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:25:29"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;29.03.2019&quot; auf &quot;26.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:25:39"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;28.03.2019&quot; auf &quot;24.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:25:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;26.03.2019&quot; auf &quot;24.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:00"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;22.03.2019&quot; auf &quot;19.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:09"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;22.03.2019&quot; auf &quot;19.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:17"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;22.03.2019&quot; auf &quot;20.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:26"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;21.03.2019&quot; auf &quot;19.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;20.03.2019&quot; auf &quot;18.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:45"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;13.03.2019&quot; auf &quot;11.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:26:55"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;13.03.2019&quot; auf &quot;11.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:03"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;12.03.2019&quot; auf &quot;10.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:11"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;11.03.2019&quot; auf &quot;09.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:27"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;11.03.2019&quot; auf &quot;09.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:37"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;05.03.2019&quot; auf &quot;03.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:46"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;01.03.2019&quot; auf &quot;28.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:27:57"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;25.02.2019&quot; auf &quot;24.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:28:11"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;19.02.2019&quot; auf &quot;18.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:28:22"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;18.02.2019&quot; auf &quot;17.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:28:33"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;08.02.2019&quot; auf &quot;07.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:28:41"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;04.02.2019&quot; auf &quot;03.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:28:52"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;04.02.2019&quot; auf &quot;03.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:01"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;28.01.2019&quot; auf &quot;27.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:10"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;22.01.2019&quot; auf &quot;21.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:23"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;18.01.2019&quot; auf &quot;17.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:32"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;14.01.2019&quot; auf &quot;13.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;14.01.2019&quot; auf &quot;13.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:29:52"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;14.01.2019&quot; auf &quot;13.01.2020&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:01"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;12.08.2018&quot; auf &quot;09.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:15"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;11.08.2018&quot; auf &quot;09.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:26"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;09.08.2018&quot; auf &quot;08.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:37"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;06.08.2018&quot; auf &quot;06.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:46"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;04.08.2018&quot; auf &quot;02.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:30:56"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;04.08.2018&quot; auf &quot;02.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:31:06"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;03.08.2018&quot; auf &quot;02.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:31:46"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;03.08.2018&quot; auf &quot;02.08.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:32:01"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;31.07.2018&quot; auf &quot;30.07.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:32:12"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;03.06.2018&quot; auf &quot;31.05.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:32:26"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;22.02.2018&quot; auf &quot;21.02.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:32:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;03.06.2018&quot; auf &quot;31.05.2019&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:32:56"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: von &quot;13.04.2017&quot; auf &quot;12.04.2018&quot; geändert."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:33:05"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;25.11.2019&quot; auf &quot;23.11.2020&quot;,&#10;Fällig: von &quot;02.12.2019&quot; auf &quot;02.12.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="eadbfbc2-3664-49c8-bda1-b6f8e15e5f21"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:34:03"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: von &quot;22.05.2019&quot; auf &quot;20.05.2020&quot;,&#10;Fällig: von &quot;13.11.2019&quot; auf &quot;11.11.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:34:27"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Beginn: von &quot;22.05.2019&quot; auf &quot;20.05.2020&quot;,&#10;Fällig: von &quot;01.10.2019&quot; auf &quot;01.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:34:57"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: von &quot;11.03.2019&quot; auf &quot;09.03.2020&quot;,&#10;Fällig: von &quot;21.06.2019&quot; auf &quot;19.06.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:35:29"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Beginn: von &quot;23.05.2019&quot; auf &quot;21.05.2020&quot;,&#10;Fällig: von &quot;30.05.2019&quot; auf &quot;29.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:36:52"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beginn: von &quot;23.05.2019&quot; auf &quot;21.05.2020&quot;,&#10;Fällig: von &quot;30.05.2019&quot; auf &quot;28.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:37:21"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;11.02.2019&quot; auf &quot;30.09.2020&quot;,&#10;Fällig: von &quot;29.05.2019&quot; auf &quot;30.09.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:37:50"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;22.05.2019&quot; auf &quot;21.10.2020&quot;,&#10;Fällig: von &quot;29.05.2019&quot; auf &quot;12.11.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:38:21"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;17.05.2019&quot; auf &quot;14.10.2020&quot;,&#10;Fällig: von &quot;24.05.2019&quot; auf &quot;28.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:38:40"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Beginn: von &quot;17.05.2019&quot; auf &quot;21.10.2020&quot;,&#10;Fällig: von &quot;24.05.2019&quot; auf &quot;30.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:39:02"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;22.05.2019&quot; auf &quot;27.10.2020&quot;,&#10;Fällig: von &quot;24.05.2019&quot; auf &quot;27.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:39:39"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Beginn: von &quot;17.05.2019&quot; auf &quot;26.10.2020&quot;,&#10;Fällig: von &quot;22.05.2019&quot; auf &quot;30.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:40:05"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Birgit Leicht | meine Firma&quot;,&#10;Beginn: von &quot;08.05.2019&quot; auf &quot;22.12.2020&quot;,&#10;Fällig: von &quot;15.05.2019&quot; auf &quot;22.12.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="783f38b6-db71-42b5-9117-848553905c93"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:40:33"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Bearbeiter: von &quot;undefined&quot; auf &quot;Frau Lisa Sommer | meine Firma&quot;,&#10;Beginn: von &quot;01.04.2019&quot; auf &quot;21.10.2020&quot;,&#10;Fällig: von &quot;05.04.2019&quot; auf &quot;21.10.2020&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:41:05"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Beginn: von &quot;20.01.2019&quot; auf &quot;20.01.2021&quot;,&#10;Fortschritt: von &quot;undefined&quot; auf &quot;0%&quot;,&#10;Fällig: von &quot;20.01.2019&quot; auf &quot;20.01.2021&quot; geändert."/>
+      <column name="TABLENAME" value="TASK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:41:40"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Projektart: &quot;Interessent&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:51:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Wahrscheinlichkeit: von &quot;50 %&quot; auf &quot;25 %&quot;,&#10;Roll Out: von &quot;22.05.2020&quot; auf &quot;22.05.2022&quot;,&#10;Projektstart: von &quot;05.02.2016&quot; auf &quot;05.02.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T06:52:02"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Minimal count: von &quot;1&quot; auf &quot;undefined&quot; geändert."/>
+      <column name="TABLENAME" value="AB_ATTRIBUTEUSAGE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:02:44"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Roll Out: von &quot;16.05.2020&quot; auf &quot;20.05.2021&quot;,&#10;Projektstart: von &quot;16.05.2019&quot; auf &quot;14.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:03:09"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Datum: von &quot;25.03.2019&quot; auf &quot;22.03.2021&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:20:28"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Datum: von &quot;22.03.2021&quot; auf &quot;16.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:20:55"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Verknüpfung: von &quot;Herr Markus Altinger | Industrial Steel AG&quot; auf &quot;Industrial Steel AG&quot;,&#10;Datum: von &quot;25.03.2019&quot; auf &quot;23.03.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:21:09"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Datum: von &quot;17.05.2019&quot; auf &quot;15.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:23:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Datum: von &quot;16.05.2019&quot; auf &quot;14.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:23:47"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Roll Out: von &quot;22.05.2020&quot; auf &quot;22.05.2022&quot;,&#10;Projektstart: von &quot;16.05.2017&quot; auf &quot;13.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:24:34"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Wahrscheinlichkeit: von &quot;undefined&quot; auf &quot;50 %&quot;,&#10;Roll Out: von &quot;26.11.2020&quot; auf &quot;26.11.2021&quot;,&#10;Projektstart: von &quot;26.11.2019&quot; auf &quot;24.11.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:25:53"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Roll Out: von &quot;17.05.2020&quot; auf &quot;17.05.2021&quot;,&#10;Projektstart: von &quot;17.05.2019&quot; auf &quot;15.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:26:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart&quot;,&#10;Datum: von &quot;11.07.2017&quot; auf &quot;06.07.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:30:11"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart&quot;,&#10;Datum: von &quot;17.05.2019&quot; auf &quot;12.08.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:30:32"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart&quot;,&#10;Datum: von &quot;08.03.2019&quot; auf &quot;19.08.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:30:46"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Roll Out: von &quot;17.05.2020&quot; auf &quot;18.05.2022&quot;,&#10;Projektstart: von &quot;17.05.2019&quot; auf &quot;15.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESPROJECT"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:31:18"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen&quot;,&#10;Datum: von &quot;14.08.2018&quot; auf &quot;10.09.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:32:45"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;[BLOB]&quot; auf &quot;Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen&quot;,&#10;Datum: von &quot;22.02.2019&quot; auf &quot;20.05.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:33:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eigenschaft Besuchsplanung / Besuchsfrequenz: &quot;vierteljährlich&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:45:58"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: &quot;16.09.2020&quot;,&#10;Betreff: &quot;telefonischer Austausch&quot;,&#10;Verantwortlich: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Beschreibung: &quot;Gespräch zum Wachstumspotential 2021&#10;&quot;,&#10;Kategorie: &quot;Telefon&quot;,&#10;Richtung: &quot;ausgehend&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Aktivitäten ID: &quot;18ed06df-30b2-4d59-a4b4-a6e646f6f05a&quot;,&#10;Objekt: &quot;438537db-0dc6-4aed-b1d1-813011baf88c&quot;,&#10;Art: &quot;Salesproject&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="388760d2-b575-492f-b249-ab0d1b4cc5b4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Aktivitäten ID: &quot;18ed06df-30b2-4d59-a4b4-a6e646f6f05a&quot;,&#10;Objekt: &quot;dec94545-2487-46d5-978d-26ee0fcf0f5f&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="17ca6ad6-e2d4-47b0-a70f-b824e35298a2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Mahndatum: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Zahlungseingang: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Datum: von &quot;15.11.2019&quot; auf &quot;05.08.2020&quot;,&#10;Zahlungsziel: von &quot;22.11.2019&quot; auf &quot;12.08.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:55"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Lieferadresse: &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Mahnungstext: &quot;Please pay the outstanding amount,this is you first/second reminder.&quot;,&#10;Verbindungstyp: &quot;Vertriebsprojekt&quot;,&#10;Zahlungskondition: &quot;7 Tage netto&quot;,&#10;Fußtext: &quot;Danke sehr:&quot;,&#10;Belegtyp: &quot;Rechnung&quot;,&#10;Verknüpfung: &quot;Industrial Steel AG&quot;,&#10;Abgesagt: &quot;Nein&quot;,&#10;Angebot: &quot;Angebot 1013-1&quot;,&#10;Datum: &quot;16.09.2020&quot;,&#10;Belegnummer: &quot;1017&quot;,&#10;Lieferbedingung: &quot;frei Haus&quot;,&#10;Zahlungsziel: &quot;23.09.2020&quot;,&#10;Verknüpfung: &quot;Vertriebsprojekt 1002 | Erstprojekt&quot;,&#10;Zahlungsadresse: &quot;Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg&quot;,&#10;Währung: &quot;Euro&quot;,&#10;Versendet: &quot;Nein&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:49:48"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einheit: &quot;Stück&quot;,&#10;Einzelpreis: &quot;25000.00&quot;,&#10;Menge: &quot;1.00&quot;,&#10;UmsSt. in %: &quot;19.00&quot;,&#10;Artikel: &quot;895f8caf-8c91-4ba8-9619-44ea6366cbbb&quot;,&#10;Position: &quot;1&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Bezeichnung: &quot;WG2 Produkt 5&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="692f2acd-08b6-45d1-bcdf-6f8e46999039"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:49:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;undefined&quot; auf &quot;25000&quot;,&#10;UmsSt.: von &quot;undefined&quot; auf &quot;4750&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:49:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Mahndatum: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Zahlungseingang: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Bezahlt: von &quot;undefined&quot; auf &quot;29750&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:50:00"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Versendet: von &quot;Nein&quot; auf &quot;Ja&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:50:05"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Eingangsdatum: &quot;02.09.2020&quot;,&#10;Betreff: &quot;Besuch zum umsatz&quot;,&#10;Verantwortlich: &quot;Herr Tim Admin | meine Firma&quot;,&#10;Kategorie: &quot;Besuch&quot;,&#10;Richtung: &quot;eingehend&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="84954c14-f576-400b-8027-f9e66d345cc5"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:58"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Aktivitäten ID: &quot;84954c14-f576-400b-8027-f9e66d345cc5&quot;,&#10;Objekt: &quot;fc465f2f-803b-4a1f-b79d-7b466d7ecff4&quot;,&#10;Art: &quot;Organisation&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="02c0bb4d-8e91-4f7c-abf6-d99696d11e82"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:58"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Aktivitäten ID: &quot;84954c14-f576-400b-8027-f9e66d345cc5&quot;,&#10;Objekt: &quot;6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a&quot;,&#10;Art: &quot;Salesproject&quot; eingefügt."/>
+      <column name="TABLENAME" value="ACTIVITYLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="9d6feb2f-5a69-4bcd-887c-0a2b36c7dd3e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:58"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Lieferadresse: &quot;Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart&quot;,&#10;Mahnungstext: &quot;Please pay the outstanding amount,this is you first/second reminder.&quot;,&#10;Verbindungstyp: &quot;Vertriebsprojekt&quot;,&#10;Zahlungskondition: &quot;7 Tage netto&quot;,&#10;Fußtext: &quot;Danke sehr:&quot;,&#10;Belegtyp: &quot;Rechnung&quot;,&#10;Verknüpfung: &quot;Skyscraper Bau GmbH&quot;,&#10;Abgesagt: &quot;Nein&quot;,&#10;Angebot: &quot;Angebot 1007-1&quot;,&#10;Datum: &quot;03.06.2020&quot;,&#10;Belegnummer: &quot;1018&quot;,&#10;Lieferbedingung: &quot;frei Haus&quot;,&#10;Zahlungsziel: &quot;10.06.2020&quot;,&#10;Verknüpfung: &quot;Vertriebsprojekt 1003 | Skyscraper / Pilotprojekt&quot;,&#10;Zahlungsadresse: &quot;Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart&quot;,&#10;Währung: &quot;Euro&quot;,&#10;Versendet: &quot;Ja&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:54:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einheit: &quot;Stück&quot;,&#10;Einzelpreis: &quot;3500.00&quot;,&#10;Menge: &quot;1.00&quot;,&#10;Artikel: &quot;895f8caf-8c91-4ba8-9619-44ea6366cbbb&quot;,&#10;Position: &quot;1&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Bezeichnung: &quot;Turbolader&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="07ceecff-e3cc-4891-b820-3fb6b977a9cc"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:54:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einheit: &quot;Stück&quot;,&#10;Einzelpreis: &quot;5000.00&quot;,&#10;Menge: &quot;5.00&quot;,&#10;Artikel: &quot;535cec1a-e81c-4833-aad6-1d2348dbc0fb&quot;,&#10;Position: &quot;2&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Bezeichnung: &quot;Klimaanlage 4-Zonen&quot;,&#10;Beschreibung: &quot;4 Zonen Klimaanlage für Mittelklasse Wagen&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="2f409cb9-4d85-4e39-8e78-4838cd9a9224"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:54:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;undefined&quot; auf &quot;28500&quot;,&#10;UmsSt.: von &quot;undefined&quot; auf &quot;0&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:54:42"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Mahndatum: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Zahlungseingang: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Bezahlt: von &quot;undefined&quot; auf &quot;28500&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:54:57"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="SOURCE_TABLENAME" value="ADDRESS"/>
+      <column name="DESCRIPTION" value="Adresse: von &quot;Königstraße&quot; auf &quot;Rathausmarkt&quot;,&#10;Postleitzahl : von &quot;22767 &quot; auf &quot;20095&quot;,&#10;Hausnummer: von &quot;4&quot; auf &quot;1&quot; geändert."/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="SOURCE_TABLENAMEID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:10:32"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="SOURCE_TABLENAME" value="ADDRESS"/>
+      <column name="DESCRIPTION" value="Stadt: von &quot;Stuttgart&quot; auf &quot;Norderstedt&quot;,&#10;Adresse: von &quot;Bolzstraße&quot; auf &quot;Rathausallee&quot;,&#10;Postleitzahl : von &quot;70173&quot; auf &quot;22846&quot;,&#10;Hausnummer: von &quot;64&quot; auf &quot;50&quot;,&#10;Staat: von &quot;Baden-Württemberg&quot; auf &quot;Schleswig-Holstein&quot; geändert."/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="SOURCE_TABLENAMEID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:11:37"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Status: von &quot;Offen&quot; auf &quot;Gewonnen&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:16"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Lieferadresse: &quot;Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen&quot;,&#10;Mahnungstext: &quot;Please pay the outstanding amount,this is you first/second reminder.&quot;,&#10;Verbindungstyp: &quot;Vertriebsprojekt&quot;,&#10;Zahlungskondition: &quot;7 Tage netto&quot;,&#10;Kopftext: &quot;gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Fußtext: &quot;Danke sehr:&quot;,&#10;Belegtyp: &quot;Rechnung&quot;,&#10;Verknüpfung: &quot;Transatlantik Logistics GmbH&quot;,&#10;Abgesagt: &quot;Nein&quot;,&#10;Angebot: &quot;Angebot 1008-1&quot;,&#10;Datum: &quot;01.09.2020&quot;,&#10;Belegnummer: &quot;1019&quot;,&#10;Lieferbedingung: &quot;frei Haus&quot;,&#10;Zahlungsziel: &quot;08.09.2020&quot;,&#10;Verknüpfung: &quot;Vertriebsprojekt 1004 | Transatlantik Initialprojekt&quot;,&#10;Zahlungsadresse: &quot;Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen&quot;,&#10;Währung: &quot;Euro&quot;,&#10;Versendet: &quot;Ja&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einheit: &quot;Stück&quot;,&#10;Einzelpreis: &quot;150000.00&quot;,&#10;Menge: &quot;1.00&quot;,&#10;Artikel: &quot;155ac430-ccfc-4814-95fc-189631779064&quot;,&#10;Rabatt: &quot;5.00&quot;,&#10;Position: &quot;1&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Bezeichnung: &quot;Förderanlage&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="817d0b06-077d-4f71-b983-91cf218ff0f7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einheit: &quot;Kg&quot;,&#10;Einzelpreis: &quot;5000.00&quot;,&#10;Menge: &quot;10.00&quot;,&#10;Artikel: &quot;8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1&quot;,&#10;Position: &quot;2&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Bezeichnung: &quot;Stahlträger Standard&quot;,&#10;Beschreibung: &quot;Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m.&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="35c54c0a-760c-4a6b-a5f1-4d6beaec07ac"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;undefined&quot; auf &quot;192500&quot;,&#10;UmsSt.: von &quot;undefined&quot; auf &quot;0&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Mahndatum: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Zahlungseingang: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Bezahlt: von &quot;undefined&quot; auf &quot;192500&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:10:49"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Währung: &quot;EUR&quot;,&#10;Adresse: &quot;Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg&quot;,&#10;Anschreiben: &quot;Gerne bieten wir Ihnen wie folgt an:&quot;,&#10;Lieferbedingung: &quot;frei Haus&quot;,&#10;Status: &quot;Offen&quot;,&#10;Zahlungskondition: &quot;7 Tage netto&quot;,&#10;Vers.-Nr.: &quot;1&quot;,&#10;Wahrscheinlichkeit: &quot;0%&quot;,&#10;Verknüpfung: &quot;Bucher Unternehmensgruppe&quot;,&#10;Angebotsnummer: &quot;1014&quot;,&#10;Datum: &quot;06.04.2020&quot; eingefügt."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:12:03"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;undefined&quot; auf &quot;0.00&quot;,&#10;gesamte Mehrwertsteuer: von &quot;undefined&quot; auf &quot;0.00&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:12:03"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="OFFERITEM"/>
+      <column name="DESCRIPTION" value="Einzelpreis: &quot;145000&quot;,&#10;Optional: &quot;Nein&quot;,&#10;Position: &quot;1&quot;,&#10;Item sortieren: &quot;1&quot;,&#10;Menge: &quot;1&quot;,&#10;Artikel: &quot;993f6294-f1fc-42d2-8786-1c13274fd133&quot; eingefügt."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="SOURCE_TABLENAMEID" value="76b2aed9-ef76-4682-8dcb-2f042257eedb"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:12:44"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;0.00&quot; auf &quot;145,000.00&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:12:44"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Sprache: &quot;deu&quot;,&#10;Lieferadresse: &quot;Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg&quot;,&#10;Mahnungstext: &quot;Please pay the outstanding amount,this is you first/second reminder.&quot;,&#10;Verbindungstyp: &quot;Vertriebsprojekt&quot;,&#10;Zahlungskondition: &quot;7 Tage netto&quot;,&#10;Fußtext: &quot;Danke sehr:&quot;,&#10;Belegtyp: &quot;Rechnung&quot;,&#10;Verknüpfung: &quot;Bucher Unternehmensgruppe&quot;,&#10;Abgesagt: &quot;Nein&quot;,&#10;Angebot: &quot;Angebot 1014-1&quot;,&#10;Datum: &quot;12.08.2020&quot;,&#10;Belegnummer: &quot;1020&quot;,&#10;Lieferbedingung: &quot;frei Haus&quot;,&#10;Zahlungsziel: &quot;19.08.2020&quot;,&#10;Verknüpfung: &quot;Vertriebsprojekt 1006 | Buchner Neuprojekt&quot;,&#10;Zahlungsadresse: &quot;Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg&quot;,&#10;Währung: &quot;Euro&quot;,&#10;Versendet: &quot;Nein&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:13:30"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="SOURCE_TABLENAME" value="SALESORDERITEM"/>
+      <column name="DESCRIPTION" value="Einzelpreis: &quot;145000.00&quot;,&#10;Menge: &quot;1.00&quot;,&#10;Artikel: &quot;993f6294-f1fc-42d2-8786-1c13274fd133&quot;,&#10;Position: &quot;1&quot;,&#10;Optional: &quot;Nein&quot; eingefügt."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="SOURCE_TABLENAMEID" value="117e49f1-b6ac-4570-9042-ae9d69263cb5"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:13:30"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Betrag netto: von &quot;undefined&quot; auf &quot;145000&quot;,&#10;UmsSt.: von &quot;undefined&quot; auf &quot;0&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:13:30"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Mahndatum: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Zahlungseingang: von &quot;undefined&quot; auf &quot;16.09.2020&quot;,&#10;Bezahlt: von &quot;undefined&quot; auf &quot;145000&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:13:45"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Versendet: von &quot;Nein&quot; auf &quot;Ja&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:13:51"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Datum: von &quot;01.09.2020&quot; auf &quot;11.08.2020&quot;,&#10;Zahlungsziel: von &quot;08.09.2020&quot; auf &quot;18.08.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:16:08"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Datum: von &quot;10.09.2020&quot; auf &quot;06.07.2020&quot; geändert."/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:16:18"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="DESCRIPTION" value="Zahlungseingang: von &quot;16.09.2020&quot; auf &quot;27.08.2020&quot; geändert."/>
+      <column name="TABLENAME" value="SALESORDER"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:18:02"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="U"/>
+      <column name="SOURCE_TABLENAME" value="ADDRESS"/>
+      <column name="DESCRIPTION" value="Stadt: von &quot;München&quot; auf &quot;Geisenhausen&quot;,&#10;Adresse: von &quot;Wilhelm-Straße&quot; auf &quot;Konrad-Zuse-Straße&quot;,&#10;Postleitzahl : von &quot;80807&quot; auf &quot;84144&quot;,&#10;Gebiet: von &quot;undefined&quot; auf &quot;NB&quot;,&#10;Hausnummer: von &quot;2&quot; auf &quot;4&quot; geändert."/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="SOURCE_TABLENAMEID" value="14d03432-985b-4efe-a634-da71ae482907"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:39:36"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Appointment Id: &quot;67c289a4-10fd-4bc6-a0b6-78fddb8ee22e&quot;,&#10;Art: &quot;Organisation&quot;,&#10;Objekt: &quot;null&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fbf92ce7-cb28-4e82-9fcd-43ad6711fd65"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:46:11"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Appointment Id: &quot;67c289a4-10fd-4bc6-a0b6-78fddb8ee22e&quot;,&#10;Art: &quot;Person&quot;,&#10;Objekt: &quot;a8a5f214-8165-4627-bee2-bceb3578147e&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="57391d56-8424-416b-8e5d-9d6ef35f39c3"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:46:11"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Appointment Id: &quot;b8e8cc5c-5d10-4d7f-a918-0a199badc27c&quot;,&#10;Art: &quot;Organisation&quot;,&#10;Objekt: &quot;null&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="502e5bba-e03f-4df8-8f23-05bbd4d606f3"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:46:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="I"/>
+      <column name="DESCRIPTION" value="Appointment Id: &quot;b8e8cc5c-5d10-4d7f-a918-0a199badc27c&quot;,&#10;Art: &quot;Person&quot;,&#10;Objekt: &quot;7a34d9d0-04c7-478c-a8e2-f584fe625c45&quot; eingefügt."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b6258f1d-74b7-430d-83d2-62aa9aec222b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:46:14"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Person&quot;,&#10;Appointment Id: &quot;67c289a4-10fd-4bc6-a0b6-78fddb8ee22e&quot;,&#10;Objekt: &quot;a8a5f214-8165-4627-bee2-bceb3578147e&quot; gelöscht."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="57391d56-8424-416b-8e5d-9d6ef35f39c3"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T11:58:01"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Organisation&quot;,&#10;Appointment Id: &quot;67c289a4-10fd-4bc6-a0b6-78fddb8ee22e&quot;,&#10;Objekt: &quot;null&quot; gelöscht."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="fbf92ce7-cb28-4e82-9fcd-43ad6711fd65"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T11:58:01"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Person&quot;,&#10;Appointment Id: &quot;b8e8cc5c-5d10-4d7f-a918-0a199badc27c&quot;,&#10;Objekt: &quot;7a34d9d0-04c7-478c-a8e2-f584fe625c45&quot; gelöscht."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="b6258f1d-74b7-430d-83d2-62aa9aec222b"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T11:58:06"/>
+    </insert>
+    <insert tableName="ab_loghistory">
+      <column name="LOGTYPE" value="D"/>
+      <column name="DESCRIPTION" value="Art: &quot;Organisation&quot;,&#10;Appointment Id: &quot;b8e8cc5c-5d10-4d7f-a918-0a199badc27c&quot;,&#10;Objekt: &quot;null&quot; gelöscht."/>
+      <column name="TABLENAME" value="AB_APPOINTMENTLINK"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="TABLENAMEID" value="502e5bba-e03f-4df8-8f23-05bbd4d606f3"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T11:58:06"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
index 2daffba38d28510da3fe1d4cc1e3b6311a62797c..cca5228e40acf742f9b3c16e6c978ad3703d3f38 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
@@ -1,97 +1,97 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="c0cb4360-4bf2-4b34-9618-c40d749aa06c">
+  <changeSet author="autogenerated" id="48d17037-2f36-49ea-87f3-0e048ae77786">
     <delete tableName="ab_objectrelation"/>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="AB_OBJECTRELATIONID" value="03c855e5-f236-4e39-b886-91832b3a53fb"/>
+      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="OBJECT1_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
       <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
       <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="AB_OBJECTRELATIONID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONID" value="390cd4d2-8231-4dbc-ac9d-0ea7aecc6ef6"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="OBJECT1_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
       <column name="AB_OBJECTRELATIONID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
       <column name="OBJECT1_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
-      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
+      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="OBJECT1_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
-      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
       <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
+      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
       <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
+      <column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
       <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
+      <column name="OBJECT2_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
       <column name="OBJECT1_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="OBJECT2_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="AB_OBJECTRELATIONID" value="c8aa4abb-a274-43d6-a067-ee935c443bfb"/>
+      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="OBJECT1_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="AB_OBJECTRELATIONID" value="cfbbce3e-1c0d-4d05-9ccf-8232f7eaaf02"/>
+      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
       <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
-      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="AB_OBJECTRELATIONID" value="d4454686-8d4e-42d9-9df8-61f19c69ce93"/>
+      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
       <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
     </insert>
     <insert tableName="ab_objectrelation">
+      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="AB_OBJECTRELATIONID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
+      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
-      <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
       <column name="OBJECT1_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
index 0dc682a20fd4453118694d54bf7be15d9b72f05e..2231334c01502ed21cf8303321b6825dc57b0af3 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -1,159 +1,159 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="0ddffe30-5446-4abb-b3c9-7bbab4be52fc">
+  <changeSet author="autogenerated" id="2e6f7a94-178b-42e8-9b3f-42433dfe7d07">
     <delete tableName="ab_objectrelationtype"/>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:USER"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="competitor"/>
       <column name="RELATION_TYPE" value="032ebe0a-7204-4eec-82a2-cb13b65850d7"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="competitor"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:USER_CHECK"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="acquainted with"/>
       <column name="RELATION_TYPE" value="84120fad-e7a2-4961-8c29-d00da41efe48"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="acquainted with"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="0a47c346-9b6f-4cdd-8c38-77800d7012f5"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:USERS"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="reports to"/>
       <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="reports to"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="1"/>
       <column name="ICON" value="VAADIN:OFFICE"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="subsidiary"/>
       <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="subsidiary"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="39e73949-c8d9-46a2-a0b5-18be95e7ba11"/>
+      <column name="OBJECT_TYPE" value="PrivatePerson"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
-      <column name="RELATION_TITLE" value="grandparents of"/>
       <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="grandparents of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:INSTITUTION"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="society"/>
       <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="society"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="3d2808bf-397b-4220-a563-36b066b5c9a9"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:INFO_CIRCLE"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supports"/>
       <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="supports"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:HANDSHAKE"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="collaboration with"/>
       <column name="RELATION_TYPE" value="091d866f-67e8-4fd6-afdc-e40d0f2be224"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="collaboration with"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:MEGAFONE"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="solicits"/>
       <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="solicits"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
+      <column name="OBJECT_TYPE" value="PrivatePerson"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
-      <column name="RELATION_TITLE" value="Grandchild of"/>
       <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="Grandchild of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="a51e23c0-d44a-4e39-a79b-7a357fb79cc2"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:INFO_CIRCLE"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supported by"/>
       <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="supported by"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
+      <column name="OBJECT_TYPE" value="PrivatePerson"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
-      <column name="RELATION_TITLE" value="child of"/>
       <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="child of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="b96a36ff-bc43-4159-a6e7-3d53cba67189"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:USERS"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supervisor of"/>
       <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="supervisor of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
+      <column name="OBJECT_TYPE" value="PrivatePerson"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
-      <column name="RELATION_TITLE" value="parent of"/>
       <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="parent of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="1"/>
       <column name="ICON" value="VAADIN:OFFICE"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="parent company"/>
       <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
-      <column name="SIDE" valueNumeric="1"/>
+      <column name="RELATION_TITLE" value="parent company"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:MEGAFONE"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="promotion target of"/>
       <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="promotion target of"/>
     </insert>
     <insert tableName="ab_objectrelationtype">
+      <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:INSTITUTION"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="member"/>
       <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
-      <column name="SIDE" valueNumeric="2"/>
+      <column name="RELATION_TITLE" value="member"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
index 8262731b75b6a2217d60e0be416960aadf233864..59f4e4f76053aa64612ada91be60b7a737b90c33 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
@@ -1,808 +1,847 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="0c84b337-a2ed-47cf-aed6-86b0b430b596">
+  <changeSet author="autogenerated" id="f82bf9de-6506-4d33-8c68-b083cbfc8671">
     <delete tableName="activity"/>
     <insert tableName="activity">
-      <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="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."/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:42:24"/>
+      <column name="ACTIVITYID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
+      <column name="ENTRYDATE" valueDate="2019-01-15T05:42:00"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T05:43:23"/>
+      <column name="INFO" value="&lt;p&gt;Produktinformationen zu Produkt 1 runtergeladen.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="inx"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T07:55:37"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
-      <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;&#10;&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;unsere Firma hat Interesse an ihren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bitte kontaktieren sie mich f&amp;uuml;r weitere Besprechungen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Kontaktaufnahme über Kontaktformular"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
+      <column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
+      <column name="ENTRYDATE" valueDate="2018-12-26T08:55:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T07:55:37"/>
+      <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;&#10;&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;unsere Firma hat Interesse an ihren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bitte kontaktieren sie mich f&amp;uuml;r weitere Besprechungen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
+      <column name="SUBJECT" value="Erste Planung für die Kampagne gelaufen"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-09-04T09:19:40"/>
-      <column name="DIRECTION" value="x"/>
+      <column name="ACTIVITYID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
       <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"/>
-      <column name="SUBJECT" value="Erste Planung für die Kampagne gelaufen"/>
-      <column name="USER_NEW" value="Admin"/>
+      <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="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Technischer Workshop bzgl. Produktanforderungen"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:17:47"/>
       <column name="ACTIVITYID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="ENTRYDATE" valueDate="2020-03-24T08:17:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:25:44"/>
       <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:44:03"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:17:47"/>
-      <column name="DIRECTION" value="o"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="SUBJECT" value="Technischer Workshop bzgl. Produktanforderungen"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
+    </insert>
+    <insert tableName="activity">
+      <column name="SUBJECT" value="telefonischer Austausch"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:47:03"/>
+      <column name="ACTIVITYID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
+      <column name="ENTRYDATE" valueDate="2020-09-16T07:47:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Gespr&amp;auml;ch zum Wachstumspotential 2021&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Einladung zum GfK-Abend"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
+      <column name="ENTRYDATE" valueDate="2019-08-09T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:30:20"/>
       <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Einladung zum GfK-Abend"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
-      <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:11:16"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:21:44"/>
-      <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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Austausch zur aktuellen Situation "/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:21:44"/>
+      <column name="ACTIVITYID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
+      <column name="ENTRYDATE" valueDate="2020-02-18T05:21:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:16"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Hier liegt die Kampagne für die Hannovermesse"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T05:57:51"/>
       <column name="ACTIVITYID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
+      <column name="ENTRYDATE" valueDate="2020-07-08T05:57:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:22:31"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T05:57:51"/>
-      <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"/>
-      <column name="SUBJECT" value="Hier liegt die Kampagne für die Hannovermesse"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:32:04"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:27:23"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-03-22T09:27:00"/>
-      <column name="INFO" value="&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Informationen an Frau Lindner weitergegeben."/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:27:23"/>
+      <column name="ACTIVITYID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="ENTRYDATE" valueDate="2020-03-19T09:27:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:04"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Produktspezifiskationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;&#10;&lt;p&gt;Intern wird gepr&amp;uuml;ft ob das Produkt bis zum Zeitpunkt X an den potentiellen Kunden geliefert werden kann.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:10:08"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Besuch auf der Messe"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
+      <column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="ENTRYDATE" valueDate="2020-02-03T07:57:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:47"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:54:52"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:57:17"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Produkt-Terminplanung"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:57:17"/>
+      <column name="ACTIVITYID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
+      <column name="ENTRYDATE" valueDate="2020-03-27T08:57:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:25:21"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <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="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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:48:15"/>
+      <column name="ACTIVITYID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
+      <column name="ENTRYDATE" valueDate="2019-05-10T10:48:00"/>
+      <column name="DATE_EDIT" valueDate="2019-05-17T10:49:17"/>
+      <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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
+      <column name="SUBJECT" value="Kickoff Meeting am 1. Oktober"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-09-04T05:59:27"/>
-      <column name="DIRECTION" value="x"/>
+      <column name="ACTIVITYID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
       <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"/>
-      <column name="SUBJECT" value="Kickoff Meeting am 1. Oktober"/>
-      <column name="USER_NEW" value="Admin"/>
+      <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="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:44:51"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T02:38:27"/>
-      <column name="DIRECTION" value="i"/>
-      <column name="ENTRYDATE" valueDate="2019-04-17T02:38:00"/>
-      <column name="INFO" value="&lt;p&gt;Hr. von Alpenhorn 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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Rückmeldung zum Angebot "/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T02:38:27"/>
+      <column name="ACTIVITYID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
+      <column name="ENTRYDATE" valueDate="2020-04-08T02:38:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:24:35"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Hr. von Alpenhorn 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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:32:32"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
-      <column name="DIRECTION" value="o"/>
-      <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;Tim Admin&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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Unser Angebot"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
+      <column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="ENTRYDATE" valueDate="2020-03-24T07:49:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:25:55"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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;Tim Admin&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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Einladung Messe"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
+      <column name="ENTRYDATE" valueDate="2019-08-02T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:30:51"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
       <column name="INFO" value="&lt;p&gt;Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="Admin"/>
-      <column name="SUBJECT" value="Einladung Messe"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
+      <column name="SUBJECT" value="War auf unserer Webseite - Website Tracking"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:40:13"/>
-      <column name="DIRECTION" value="i"/>
+      <column name="ACTIVITYID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
       <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"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:43:27"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:08:29"/>
-      <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 Alpenhorn,&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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Referenzen - Zu unserem Produkt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:08:29"/>
+      <column name="ACTIVITYID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="ENTRYDATE" valueDate="2020-02-17T08:08:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:28"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr von Alpenhorn,&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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:51:51"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:53:02"/>
-      <column name="DIRECTION" value="o"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Termin vor Ort"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:53:02"/>
+      <column name="ACTIVITYID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="ENTRYDATE" valueDate="2020-03-03T05:53:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:27:40"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Prüfung durchgeführt"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
+      <column name="ENTRYDATE" valueDate="2019-08-06T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:30:42"/>
       <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Prüfung durchgeführt"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Webinar: Transparentes Kampagnen- und Veranstaltungsmanagement"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
+      <column name="ENTRYDATE" valueDate="2019-08-02T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:31:11"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="INFO" valueClobFile="activity/INFO/clobFiles/efe9f361ec5970ad019a0dd191e88d1e.txt"/>
       <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
-      <column name="INFO" valueClobFile="activity/INFO/clobFiles/83aed38de7ea30e68b0ea8c99f40342c.txt"/>
-      <column name="RESPONSIBLE" value="Admin                               "/>
-      <column name="SUBJECT" value="Webinar: Transparentes Kampagnen- und Veranstaltungsmanagement"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:53:44"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:47:30"/>
-      <column name="DIRECTION" value="x"/>
-      <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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:47:30"/>
+      <column name="ACTIVITYID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
+      <column name="ENTRYDATE" valueDate="2019-03-14T08:47:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:53:44"/>
+      <column name="INFO" value="&lt;p&gt;Haben weitere Informationen zu unseren Produkten runtergeladen.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:13:07"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
-      <column name="INFO" value="&lt;p&gt;Automatischer Import:&lt;/p&gt;&#10;&#10;&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Infobrochüre runtergeladen"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
+      <column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
+      <column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:13:07"/>
+      <column name="INFO" value="&lt;p&gt;Automatischer Import:&lt;/p&gt;&#10;&#10;&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:43:47"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:15:11"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Präsentation"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:15:11"/>
+      <column name="ACTIVITYID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="ENTRYDATE" valueDate="2020-03-11T08:15:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:49"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:55:35"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:49:26"/>
-      <column name="DIRECTION" value="x"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung abgeschlossen"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:49:26"/>
+      <column name="ACTIVITYID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
+      <column name="ENTRYDATE" valueDate="2019-04-25T10:49:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:55:35"/>
+      <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="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:43:38"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:12:04"/>
-      <column name="DIRECTION" value="o"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Vor Ort Termin"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:12:04"/>
+      <column name="ACTIVITYID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
+      <column name="ENTRYDATE" valueDate="2020-02-28T08:12:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:27:50"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <column name="INFO" value="&lt;p&gt;Konnten Vor-Ort Termin mit den Ansprechpartnern ausmachen.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:32:59"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:05:47"/>
-      <column name="DIRECTION" value="x"/>
-      <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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Konditionen und Preise verhandelt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:05:47"/>
+      <column name="ACTIVITYID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
+      <column name="ENTRYDATE" valueDate="2020-04-02T05:05:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:25:11"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <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="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:56:02"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T02:30:16"/>
-      <column name="DIRECTION" value="x"/>
-      <column name="ENTRYDATE" valueDate="2019-06-11T02:30:16"/>
-      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Rahmenvertrag"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T02:30:16"/>
+      <column name="ACTIVITYID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+      <column name="ENTRYDATE" valueDate="2019-06-11T02:30:16"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:56:02"/>
+      <column name="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Auswahlprozess"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
       <column name="ACTIVITYID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="ENTRYDATE" valueDate="2020-01-27T07:56:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:04"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:08:49"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
-      <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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="SUBJECT" value="Auswahlprozess"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
+    </insert>
+    <insert tableName="activity">
+      <column name="SUBJECT" value="Besuch zum umsatz"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:21"/>
+      <column name="ACTIVITYID" value="84954c14-f576-400b-8027-f9e66d345cc5"/>
+      <column name="ENTRYDATE" valueDate="2020-09-02T07:52:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:39:34"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
-      <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 gemietet.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produkt gemietet."/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
+      <column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="ENTRYDATE" valueDate="2020-03-09T05:01:00"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:27:32"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:54:19"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:56:11"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-03-21T08:56:00"/>
-      <column name="INFO" value="&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Messebesuch"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:56:11"/>
+      <column name="ACTIVITYID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="ENTRYDATE" valueDate="2020-03-19T08:56:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:31"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <column name="INFO" value="&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;uns&amp;nbsp;Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:43:11"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:46:08"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Erstkontakt mit dem Interessenten"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:46:08"/>
+      <column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="ENTRYDATE" valueDate="2020-02-03T03:46:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:56"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Daten-update"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
+      <column name="ENTRYDATE" valueDate="2019-08-02T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:31:55"/>
       <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Daten-update"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:57:25"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:56:26"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-08-12T07:56:00"/>
-      <column name="INFO" value="&lt;p&gt;Rahmenvertrag wurde an die Legal Abteilung des Kunden versandt.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Warte auf R&amp;uuml;ckmeldung.&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Rahmenvertrag versandt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:56:26"/>
+      <column name="ACTIVITYID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="ENTRYDATE" valueDate="2020-06-10T07:56:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:22:58"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Rahmenvertrag wurde an die Legal Abteilung des Kunden versandt.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Warte auf R&amp;uuml;ckmeldung.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Webinar-Aufzeichnung"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
+      <column name="ENTRYDATE" valueDate="2019-07-30T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:32:06"/>
       <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Webinar-Aufzeichnung"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Präsentation: Terminvorschlag"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
+      <column name="ENTRYDATE" valueDate="2019-08-09T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:30:06"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i"/>
-      <column name="ENTRYDATE" valueDate="2018-08-12T02:02:52"/>
       <column name="INFO" value="&lt;p&gt;Terminvorschlag gesendet. Aufgabe gestellt&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="Admin"/>
-      <column name="SUBJECT" value="Präsentation: Terminvorschlag"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
-      <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="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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:51:27"/>
+      <column name="ACTIVITYID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
+      <column name="ENTRYDATE" valueDate="2020-05-15T10:51:00"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:24:05"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <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="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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:46:27"/>
+      <column name="ACTIVITYID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
+      <column name="ENTRYDATE" valueDate="2019-05-01T10:46:00"/>
+      <column name="DATE_EDIT" valueDate="2019-05-17T10:48:04"/>
+      <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="DIRECTION" value="inx"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:05:49"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
-      <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.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten seine R&amp;uuml;ckfragen zu unserem Produkt erstmal kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Telefonat"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
+      <column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="ENTRYDATE" valueDate="2020-01-13T07:55:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:37"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Kurzes Gespr&amp;auml;ch gef&amp;uuml;hrt mit Herr Altinger.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten seine R&amp;uuml;ckfragen zu unserem Produkt erstmal kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:28:33"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:29:25"/>
-      <column name="DIRECTION" value="i"/>
-      <column name="ENTRYDATE" valueDate="2019-03-20T09:29:00"/>
-      <column name="INFO" value="&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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."/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:29:25"/>
+      <column name="ACTIVITYID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="ENTRYDATE" valueDate="2020-03-18T09:29:00"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:41"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <column name="INFO" value="&lt;p&gt;Marketing:&lt;/p&gt;&#10;&#10;&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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="CATEGORY" value="VISIT"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:11:43"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
-      <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;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Produktpräsentation"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
+      <column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="ENTRYDATE" valueDate="2020-02-24T04:59:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:00"/>
+      <column name="CATEGORY" value="VISIT"/>
+      <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;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Angebot nachfassen"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ENTRYDATE" valueDate="2019-05-31T02:41:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:32:17"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="&lt;p&gt;Angebot nachfassen, wir liegen vor Wettbewerb&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="Admin"/>
-      <column name="SUBJECT" value="Angebot nachfassen"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:55:47"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:50:46"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="2. Phase der Produkt-Planung startet"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:50:46"/>
+      <column name="ACTIVITYID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="ENTRYDATE" valueDate="2020-05-21T10:50:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:23:14"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="weiterer Vertrag"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
+      <column name="ENTRYDATE" valueDate="2019-08-02T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:31:02"/>
       <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="weiterer Vertrag"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:30:22"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
-      <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.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Angebot erstellen"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
+      <column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="ENTRYDATE" valueDate="2020-03-19T09:06:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:12"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T11:04:50"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-11-15T11:04:50"/>
       <column name="PARENT_CONTEXT" value="SupportTicket"/>
-      <column name="PARENT_ID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Anforderungen Bilderdokumentation"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:04:50"/>
+      <column name="ACTIVITYID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
+      <column name="ENTRYDATE" valueDate="2020-09-15T10:04:00"/>
+      <column name="PARENT_ID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:19:29"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
+      <column name="SUBJECT" value="Wichtige Teilnehmer einladen"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-09-04T09:15:52"/>
-      <column name="DIRECTION" value="x"/>
+      <column name="ACTIVITYID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
       <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"/>
-      <column name="SUBJECT" value="Wichtige Teilnehmer einladen"/>
-      <column name="USER_NEW" value="Admin"/>
+      <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="DIRECTION" value="x"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Standortwechsel"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
+      <column name="ENTRYDATE" valueDate="2019-08-08T02:02:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:30:32"/>
       <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Standortwechsel"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <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="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"/>
-      <column name="SUBJECT" value="Einladungen gehen 18.09 raus"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="SUBJECT" value="fällig"/>
       <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="activity">
-      <column name="ACTIVITYID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
       <column name="DATE_NEW" valueDate="2019-11-15T01:03:22"/>
-      <column name="DIRECTION" value="o"/>
+      <column name="ACTIVITYID" value="c7c29526-3138-4264-8eb4-c6876797f8fe"/>
       <column name="ENTRYDATE" valueDate="2019-11-15T01:03:22"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="SUBJECT" value="fällig"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:53:04"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:56:06"/>
-      <column name="DIRECTION" value="i"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="2. Ansprechpartner kennengelernt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:56:06"/>
+      <column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="ENTRYDATE" valueDate="2020-03-09T05:56:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:27:16"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Herr Morgenstern ist der verantwortliche Vertriebsleiter bei Transatlantik Logistics.&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:46:36"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:45:25"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-11-15T08:45:25"/>
-      <column name="INFO" value="&lt;p&gt;Spezifikationen wurden so mit dem Kunden besprochen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Er erh&amp;auml;lt in den ersten zwei Jahren 10 % Nachlass.&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Rahmenvertrag an den neuen Kunden versandt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:45:25"/>
+      <column name="ACTIVITYID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
+      <column name="ENTRYDATE" valueDate="2020-09-16T07:45:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:20:03"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Spezifikationen wurden so mit dem Kunden besprochen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Er erh&amp;auml;lt in den ersten zwei Jahren 10 % Nachlass.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:51:00"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:45:42"/>
-      <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="RESPONSIBLE" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="SUBJECT" value="Telefonat mit Frau Decker für den Außendienst vereinbart."/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:45:42"/>
+      <column name="ACTIVITYID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="ENTRYDATE" valueDate="2020-01-21T05:45:00"/>
+      <column name="RESPONSIBLE" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:15"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:06:09"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:52:31"/>
-      <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 Tim Admin gehabt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktinformationen werden versandt.&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Erster Kontakt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:52:31"/>
+      <column name="ACTIVITYID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="ENTRYDATE" valueDate="2020-01-13T03:52:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:56"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <column name="INFO" value="&lt;p&gt;Hatte ersten Kontakt mit dem Projektzust&amp;auml;ndigen Tim Admin gehabt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktinformationen werden versandt.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <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="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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="activity">
-      <column name="ACTIVITYID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:55:01"/>
+      <column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
+      <column name="ENTRYDATE" valueDate="2020-03-10T08:55:00"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:27:07"/>
       <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:50:41"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:44:17"/>
+      <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="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="RESPONSIBLE" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+    </insert>
+    <insert tableName="activity">
       <column name="SUBJECT" value="Nachgefasst - Laut Leadmanagement"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:44:17"/>
+      <column name="ACTIVITYID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="ENTRYDATE" valueDate="2020-01-17T05:44:00"/>
+      <column name="RESPONSIBLE" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:28"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:27:43"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
-      <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;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Geheimhaltungsvereinbarung unterzeichnen"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
+      <column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="ENTRYDATE" valueDate="2020-03-11T07:59:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:59"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <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;&#10;&lt;p&gt;dazu bekommen wir in den n&amp;auml;chsten Tagen die Geheimhaltungsvereinbarung&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:44:25"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:16:32"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-03-29T08:16:00"/>
-      <column name="INFO" value="&lt;p&gt;Hallo Herr von Alpenhorn,&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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Stellungnahme"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:16:32"/>
+      <column name="ACTIVITYID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="ENTRYDATE" valueDate="2020-03-26T08:16:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:25:34"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Hallo Herr von Alpenhorn,&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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Nachfassen"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ENTRYDATE" valueDate="2018-04-12T02:41:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:33:00"/>
       <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <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"/>
-      <column name="SUBJECT" value="Nachfassen"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Kauf der Maschine von KUKA, Augsburg"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
+      <column name="ENTRYDATE" valueDate="2019-02-21T03:41:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:32:35"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="i"/>
-      <column name="ENTRYDATE" valueDate="2018-02-22T03:41:22"/>
       <column name="INFO" value="&lt;p&gt;erworben von Roboterabteilung&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="Admin"/>
-      <column name="SUBJECT" value="Kauf der Maschine von KUKA, Augsburg"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
+      <column name="SUBJECT" value="Muster"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="ACTIVITYID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ENTRYDATE" valueDate="2019-05-31T02:41:00"/>
+      <column name="RESPONSIBLE" value="Admin                               "/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:32:51"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="&lt;p&gt;Spezifikation ausgefüllt und abgeschickt&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="Admin"/>
-      <column name="SUBJECT" value="Muster"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="CATEGORY" value="ONLINE-MEETING"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:55:12"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:48:08"/>
-      <column name="DIRECTION" value="o"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung gestartet"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:48:08"/>
+      <column name="ACTIVITYID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="ENTRYDATE" valueDate="2020-04-06T10:48:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:24:59"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:37:59"/>
-      <column name="DATE_NEW" valueDate="2019-11-13T11:06:30"/>
-      <column name="DIRECTION" value="o"/>
-      <column name="ENTRYDATE" valueDate="2019-11-13T11:06:30"/>
-      <column name="INFO" value="&lt;p&gt;Produktinformationen zu produkt C versandt.&lt;/p&gt;&#10;"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Neuer Kontaktpunkt zum Produkt C"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="activity">
-      <column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="DATE_NEW" valueDate="2019-11-13T11:06:30"/>
+      <column name="ACTIVITYID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="ENTRYDATE" valueDate="2020-09-11T10:06:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:20:59"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:34:06"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
+      <column name="INFO" value="&lt;p&gt;Produktinformationen zu produkt C versandt.&lt;/p&gt;&#10;"/>
       <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;So wie besprochen mit den korrigierten Produktpreisen.&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;Tim Admin&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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+    </insert>
+    <insert tableName="activity">
       <column name="SUBJECT" value="Angebot an Interessenten versandt"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
+      <column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="ENTRYDATE" valueDate="2020-05-06T05:13:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:24:22"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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;So wie besprochen mit den korrigierten Produktpreisen.&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;Tim Admin&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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:51:31"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:47:36"/>
-      <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="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="SUBJECT" value="Gespräch mit Frau Decken"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:47:36"/>
+      <column name="ACTIVITYID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="ENTRYDATE" valueDate="2020-02-07T05:47:00"/>
+      <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:28:37"/>
+      <column name="CATEGORY" value="PHONE"/>
+      <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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:06:00"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
-      <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;Tim Admin&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="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="SUBJECT" value="Information Produkt A"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
+      <column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="ENTRYDATE" valueDate="2020-01-13T04:57:00"/>
+      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:47"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <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;Tim Admin&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="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:29:35"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
-      <column name="DIRECTION" value="i"/>
-      <column name="ENTRYDATE" valueDate="2019-03-22T08:56:00"/>
-      <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Admin,&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"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
+      <column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="ENTRYDATE" valueDate="2020-03-20T08:56:00"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:21"/>
+      <column name="CATEGORY" value="MAIL"/>
+      <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Admin,&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="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
-      <column name="ACTIVITYID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:53:25"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:57:18"/>
-      <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 Decken&amp;nbsp;nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat bzgl. offener Fragen"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:57:18"/>
+      <column name="ACTIVITYID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
+      <column name="ENTRYDATE" valueDate="2019-03-14T05:57:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:53:25"/>
+      <column name="INFO" value="&lt;p&gt;Herr Morgenstern hat differenziert von Frau Decken&amp;nbsp;nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;"/>
+      <column name="DIRECTION" value="i"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/83aed38de7ea30e68b0ea8c99f40342c.txt b/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/83aed38de7ea30e68b0ea8c99f40342c.txt
deleted file mode 100644
index ed03740997fc4fc1e20bc306f533fa1150446237..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activity/INFO/clobFiles/83aed38de7ea30e68b0ea8c99f40342c.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-	<body>
-		<h1>Headertest</h1>
-		<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. 
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-	</body>
-</html>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
index 4baba39a61134a4829273810fa5e5775a3b7c334..51685d850add04ebcd58f6396a40af906c5f87b0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
@@ -1,1256 +1,1272 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="a0c9431e-da00-4e2f-a27e-345291b8efee">
+  <changeSet author="autogenerated" id="ab7f3a5c-7555-4017-a5fa-49c1d475ff83">
     <delete tableName="activitylink"/>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="00264d5a-5533-46d1-bd15-38108dcca3c5"/>
-      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:14:22"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="ACTIVITYLINKID" value="00264d5a-5533-46d1-bd15-38108dcca3c5"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:14:22"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+    </insert>
+    <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="84954c14-f576-400b-8027-f9e66d345cc5"/>
+      <column name="ACTIVITYLINKID" value="02c0bb4d-8e91-4f7c-abf6-d99696d11e82"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:58"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="04eabfbc-b143-4eba-ab09-2bb6341bb194"/>
-      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:37:04"/>
-      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="ACTIVITYLINKID" value="04eabfbc-b143-4eba-ab09-2bb6341bb194"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:37:04"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="05ccef04-86cd-4b29-96b7-e106c015a82f"/>
-      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="ACTIVITYLINKID" value="05ccef04-86cd-4b29-96b7-e106c015a82f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="0aaad19f-daa1-44d3-b7df-cba2a88b2745"/>
-      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:56:54"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="ACTIVITYLINKID" value="0aaad19f-daa1-44d3-b7df-cba2a88b2745"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:56:54"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="0ac144ee-7d34-4ecc-a28d-2a000beb4a97"/>
-      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:16:17"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="ACTIVITYLINKID" value="0ac144ee-7d34-4ecc-a28d-2a000beb4a97"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:16:17"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="0b760b2d-f773-4433-b256-787fb42dd519"/>
-      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="ACTIVITYLINKID" value="0b760b2d-f773-4433-b256-787fb42dd519"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="0ccf9e70-5bb3-4fdf-9fde-62e839494be4"/>
-      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="ACTIVITYLINKID" value="0ccf9e70-5bb3-4fdf-9fde-62e839494be4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="0d77b784-2f73-44e3-bded-e68ff077b80e"/>
-      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
+      <column name="ACTIVITYLINKID" value="0d77b784-2f73-44e3-bded-e68ff077b80e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="10aa8b38-509c-4385-bfe0-775ab92571a8"/>
-      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="ACTIVITYLINKID" value="10aa8b38-509c-4385-bfe0-775ab92571a8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="10b9499b-2f14-4251-8001-ac9e838c59a8"/>
-      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="ACTIVITYLINKID" value="10b9499b-2f14-4251-8001-ac9e838c59a8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="113968f6-088d-4669-99e3-8afdae03725b"/>
-      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:12:00"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
+      <column name="ACTIVITYLINKID" value="113968f6-088d-4669-99e3-8afdae03725b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:12:00"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="1151600f-f65c-4881-8a86-960794ce5077"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:30:43"/>
+      <column name="ACTIVITYLINKID" value="1151600f-f65c-4881-8a86-960794ce5077"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="OBJECT_TYPE" value="Person"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:30:43"/>
+    </insert>
+    <insert tableName="activitylink">
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
+      <column name="ACTIVITYLINKID" value="17ca6ad6-e2d4-47b0-a70f-b824e35298a2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="18cd806d-67fc-4d6b-87d4-dfec5669859f"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:55:40"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="ACTIVITYLINKID" value="18cd806d-67fc-4d6b-87d4-dfec5669859f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T07:55:40"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="1e3fb9e1-e3fd-4cff-8a03-f808072a9694"/>
-      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:04:16"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="ACTIVITYLINKID" value="1e3fb9e1-e3fd-4cff-8a03-f808072a9694"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:04:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="20432bd9-a207-4864-bbba-4d24a71287b8"/>
-      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="ACTIVITYLINKID" value="20432bd9-a207-4864-bbba-4d24a71287b8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
-      <column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
+      <column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="25a8fe8a-f75e-4696-970b-660b11540967"/>
-      <column name="ACTIVITY_ID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:23:40"/>
-      <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
+      <column name="ACTIVITYLINKID" value="25a8fe8a-f75e-4696-970b-660b11540967"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:23:40"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="26b0f97e-30fc-4808-85a1-5d95cd5f6b34"/>
-      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
+      <column name="ACTIVITYLINKID" value="26b0f97e-30fc-4808-85a1-5d95cd5f6b34"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
-      <column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
+      <column name="ACTIVITYLINKID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="2b119bee-7d89-42fd-87ac-32544355b3b4"/>
-      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="ACTIVITYLINKID" value="2b119bee-7d89-42fd-87ac-32544355b3b4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="2de91976-7c5e-4676-87e6-1869381235b0"/>
-      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="ACTIVITYLINKID" value="2de91976-7c5e-4676-87e6-1869381235b0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="2e4494d3-0160-4e9a-a78a-54884dd465f7"/>
-      <column name="ACTIVITY_ID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
+      <column name="ACTIVITYLINKID" value="2e4494d3-0160-4e9a-a78a-54884dd465f7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="2f81f33a-1af7-4ecb-86f9-50d98555c909"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
-      <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="ACTIVITYLINKID" value="2f81f33a-1af7-4ecb-86f9-50d98555c909"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="32644960-e2ff-435b-bd73-7d527a816389"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T08:59:23"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:58:30"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITYLINKID" value="32644960-e2ff-435b-bd73-7d527a816389"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:58:30"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="34b909b3-0d16-4e0a-ae58-0397c68abf20"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
+      <column name="ACTIVITYLINKID" value="34b909b3-0d16-4e0a-ae58-0397c68abf20"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
+    </insert>
+    <insert tableName="activitylink">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
+      <column name="ACTIVITYLINKID" value="388760d2-b575-492f-b249-ab0d1b4cc5b4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="3c33950e-ee13-4eb4-a03c-2d8084da4519"/>
-      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="ACTIVITYLINKID" value="3c33950e-ee13-4eb4-a03c-2d8084da4519"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="3d6a37b4-33bb-4641-a62a-daed1216f43a"/>
-      <column name="ACTIVITY_ID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
-      <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="0eec5c89-272c-4675-b8a3-3a17e5cc2907"/>
+      <column name="ACTIVITYLINKID" value="3d6a37b4-33bb-4641-a62a-daed1216f43a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:20:53"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="3f48b2c2-26f2-475d-810d-b8e991172af1"/>
-      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:00:09"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="ACTIVITYLINKID" value="3f48b2c2-26f2-475d-810d-b8e991172af1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:00:09"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="3f532259-0500-4455-b56b-8da80e81294b"/>
-      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="ACTIVITYLINKID" value="3f532259-0500-4455-b56b-8da80e81294b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4247ff5e-db95-4114-a1e6-21bbea86098e"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITYLINKID" value="4247ff5e-db95-4114-a1e6-21bbea86098e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="44ae4bcc-ccec-493c-a0db-32b136c450bc"/>
-      <column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:07:31"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
+      <column name="ACTIVITYLINKID" value="44ae4bcc-ccec-493c-a0db-32b136c450bc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:07:31"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="45e9e831-b60c-4d26-88ed-e975c9b9b412"/>
-      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T03:45:43"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="ACTIVITYLINKID" value="45e9e831-b60c-4d26-88ed-e975c9b9b412"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:45:43"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
-      <column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
+      <column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="48c168f0-fad5-43e0-ad13-63717350459b"/>
-      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:11:16"/>
-      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="ACTIVITYLINKID" value="48c168f0-fad5-43e0-ad13-63717350459b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:11:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="49792d42-40ca-486a-b838-b739e79f90ad"/>
-      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:05:16"/>
-      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="ACTIVITYLINKID" value="49792d42-40ca-486a-b838-b739e79f90ad"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:05:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="49a99e27-41ed-47fc-9bc3-bcf1bdf133dc"/>
-      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="ACTIVITYLINKID" value="49a99e27-41ed-47fc-9bc3-bcf1bdf133dc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4c526e91-a6b1-4d53-8ecc-a79418c81941"/>
-      <column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:03:18"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="ACTIVITYLINKID" value="4c526e91-a6b1-4d53-8ecc-a79418c81941"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:03:18"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4c80eb6c-9a22-4f20-8117-58b657c9c02f"/>
-      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:19:00"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="ACTIVITYLINKID" value="4c80eb6c-9a22-4f20-8117-58b657c9c02f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:19:00"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4c9fc29d-261b-4165-9109-94bfabd71544"/>
-      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:05:11"/>
-      <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="ACTIVITYLINKID" value="4c9fc29d-261b-4165-9109-94bfabd71544"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:05:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4d12c3fe-358a-440b-9008-33c58b235502"/>
-      <column name="ACTIVITY_ID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
-      <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="22924044-c41d-4130-b9c2-de51e3c9e928"/>
+      <column name="ACTIVITYLINKID" value="4d12c3fe-358a-440b-9008-33c58b235502"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="4f1c387a-7bb0-4c0c-a6be-e8708a172d40"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T11:18:03"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="ACTIVITYLINKID" value="4f1c387a-7bb0-4c0c-a6be-e8708a172d40"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T11:18:03"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="504c4ed6-74a5-4f50-9721-24ce8532b218"/>
-      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:19:17"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="ACTIVITYLINKID" value="504c4ed6-74a5-4f50-9721-24ce8532b218"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:19:17"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="51f74731-d8fe-4ffe-b305-5c4b7e526af0"/>
-      <column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
-      <column name="OBJECT_ROWID" value="5fcfa9a9-2f3d-43f0-8be0-21241a5f2ec3"/>
       <column name="OBJECT_TYPE" value="Contract"/>
+      <column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+      <column name="ACTIVITYLINKID" value="51f74731-d8fe-4ffe-b305-5c4b7e526af0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="5fcfa9a9-2f3d-43f0-8be0-21241a5f2ec3"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="5227d415-240d-4465-89f6-3209ac5a9142"/>
-      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:08:12"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="ACTIVITYLINKID" value="5227d415-240d-4465-89f6-3209ac5a9142"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:08:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="557a8ef1-209f-4d0b-9ca9-b779ccf6ce8c"/>
-      <column name="ACTIVITY_ID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
-      <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="38a20ed1-f75e-439d-957a-53cbb815a9fe"/>
+      <column name="ACTIVITYLINKID" value="557a8ef1-209f-4d0b-9ca9-b779ccf6ce8c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="55dbf18a-fefa-4d79-827a-2685abf5ecc5"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
+      <column name="ACTIVITYLINKID" value="55dbf18a-fefa-4d79-827a-2685abf5ecc5"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="565f3c19-3a81-4af6-b2ae-5b4fdccb87eb"/>
-      <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="ACTIVITYLINKID" value="565f3c19-3a81-4af6-b2ae-5b4fdccb87eb"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="56a7cd53-73dd-4de3-b06b-a95892e65c07"/>
-      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="ACTIVITYLINKID" value="56a7cd53-73dd-4de3-b06b-a95892e65c07"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="586ced54-a9f0-40a5-a819-eac94e096f3b"/>
-      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:06:07"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
+      <column name="ACTIVITYLINKID" value="586ced54-a9f0-40a5-a819-eac94e096f3b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:06:07"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="5a4672ac-99ff-4a2e-a4ca-aad217bef144"/>
-      <column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
+      <column name="ACTIVITYLINKID" value="5a4672ac-99ff-4a2e-a4ca-aad217bef144"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
-      <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
+      <column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
-      <column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
+      <column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="5cea1d66-072b-4c22-831f-1266f1e3690b"/>
-      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:16:44"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="ACTIVITYLINKID" value="5cea1d66-072b-4c22-831f-1266f1e3690b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:16:44"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
-      <column name="ACTIVITY_ID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
+      <column name="ACTIVITYLINKID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="62db9cd0-b240-4009-822e-a40cb81b671f"/>
-      <column name="ACTIVITY_ID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:17:36"/>
-      <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6384b045-a331-4623-8dcb-adf07c9d78c2"/>
-      <column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
-      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="ACTIVITYLINKID" value="6384b045-a331-4623-8dcb-adf07c9d78c2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6485e531-5162-4367-bc23-a211920a38a7"/>
-      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:09:10"/>
-      <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="ACTIVITYLINKID" value="6485e531-5162-4367-bc23-a211920a38a7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:09:10"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="64a8a937-2c3f-4cc7-9615-5f1ba58cc04b"/>
-      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T11:04:09"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="ACTIVITYLINKID" value="64a8a937-2c3f-4cc7-9615-5f1ba58cc04b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T11:04:09"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6980ec3a-c04e-4b7d-8e60-1acc6b9915d1"/>
-      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
-      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="ACTIVITYLINKID" value="6980ec3a-c04e-4b7d-8e60-1acc6b9915d1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
-      <column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
+      <column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6cec10a8-78f0-4074-95c8-f7b69520b2c9"/>
-      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
+      <column name="ACTIVITYLINKID" value="6cec10a8-78f0-4074-95c8-f7b69520b2c9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6e0b4cc4-6784-4952-8bf9-c3d644c6a38c"/>
-      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:03:11"/>
-      <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="ACTIVITYLINKID" value="6e0b4cc4-6784-4952-8bf9-c3d644c6a38c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:03:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6f5a0639-b26f-476c-a89f-b4747a405b68"/>
-      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="ACTIVITYLINKID" value="6f5a0639-b26f-476c-a89f-b4747a405b68"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="6ff14060-7fca-4c8f-9ab8-1c04c15aac61"/>
-      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T11:37:40"/>
-      <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="ACTIVITYLINKID" value="6ff14060-7fca-4c8f-9ab8-1c04c15aac61"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T11:37:40"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="75b42e7c-4748-41ca-9a23-3436b55cadf6"/>
-      <column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
+      <column name="ACTIVITYLINKID" value="75b42e7c-4748-41ca-9a23-3436b55cadf6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="777ed544-bcb2-43b2-914f-31bfa684e5c3"/>
-      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="ACTIVITYLINKID" value="777ed544-bcb2-43b2-914f-31bfa684e5c3"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="782102cd-3a58-449e-b604-97d89ccae5a5"/>
-      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:13:11"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="ACTIVITYLINKID" value="782102cd-3a58-449e-b604-97d89ccae5a5"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:13:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="7a4b1e70-1773-4529-8506-3243c9349ebc"/>
-      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
+      <column name="ACTIVITYLINKID" value="7a4b1e70-1773-4529-8506-3243c9349ebc"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
-      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:48:02"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
+      <column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:48:02"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
-      <column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
+      <column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
-      <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
+      <column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="844fe831-bc5a-4810-9245-8f5e6b41c790"/>
-      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="ACTIVITYLINKID" value="844fe831-bc5a-4810-9245-8f5e6b41c790"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="85301f7f-7f22-41a1-afc9-8114b9385a25"/>
-      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="ACTIVITYLINKID" value="85301f7f-7f22-41a1-afc9-8114b9385a25"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="869c8987-7239-4f61-a0dc-b2f9e83ab2db"/>
-      <column name="ACTIVITY_ID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:47:38"/>
-      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
+      <column name="ACTIVITYLINKID" value="869c8987-7239-4f61-a0dc-b2f9e83ab2db"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:47:38"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="896faed6-bf20-439a-8fd4-9f497bd5fd63"/>
-      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="ACTIVITYLINKID" value="896faed6-bf20-439a-8fd4-9f497bd5fd63"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="8b9e3e53-f74f-4da1-9184-ed449608195f"/>
-      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:17:29"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="ACTIVITYLINKID" value="8b9e3e53-f74f-4da1-9184-ed449608195f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:17:29"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="8d136835-b822-49a2-a516-87d4af34e8e1"/>
-      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="ACTIVITYLINKID" value="8d136835-b822-49a2-a516-87d4af34e8e1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="8d2ff9ea-5416-47ac-839f-3f7c7b517129"/>
-      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
+      <column name="ACTIVITYLINKID" value="8d2ff9ea-5416-47ac-839f-3f7c7b517129"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
-      <column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
+      <column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="8d91fe31-c2de-433a-b8ab-691a8970f7e6"/>
-      <column name="ACTIVITY_ID" value="c42c23ef-3921-4a10-bb9a-040178f28bd2"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:24:17"/>
-      <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="918ec650-9e5a-430b-b6a7-d0f5e9780935"/>
-      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="ACTIVITYLINKID" value="918ec650-9e5a-430b-b6a7-d0f5e9780935"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="93c76b23-fc2c-4544-9e18-2422b2721860"/>
-      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:16:16"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="ACTIVITYLINKID" value="93c76b23-fc2c-4544-9e18-2422b2721860"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:16:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="943a31a0-5bd4-47d7-ba85-0388ce270bb1"/>
-      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
-      <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
+      <column name="ACTIVITYLINKID" value="943a31a0-5bd4-47d7-ba85-0388ce270bb1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="94ed9437-9050-4358-975b-c07988c36117"/>
-      <column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
+      <column name="ACTIVITYLINKID" value="94ed9437-9050-4358-975b-c07988c36117"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="9715d82b-5239-46c3-a651-fdc7ca4c1d0e"/>
-      <column name="ACTIVITY_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:51:50"/>
-      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
+      <column name="ACTIVITYLINKID" value="9715d82b-5239-46c3-a651-fdc7ca4c1d0e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:51:50"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="98b3e278-c3c8-4423-aafe-2b66f66b5426"/>
-      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:17:16"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="ACTIVITYLINKID" value="98b3e278-c3c8-4423-aafe-2b66f66b5426"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:17:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="9a8abf3a-5659-42ac-85d0-f6709f59be3f"/>
-      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:16:44"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
+      <column name="ACTIVITYLINKID" value="9a8abf3a-5659-42ac-85d0-f6709f59be3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:16:44"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="9c293971-0553-4068-902d-3ba36befd710"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
+      <column name="ACTIVITYLINKID" value="9c293971-0553-4068-902d-3ba36befd710"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="OBJECT_ROWID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="OBJECT_TYPE" value="Person"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:08:05"/>
+    </insert>
+    <insert tableName="activitylink">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="84954c14-f576-400b-8027-f9e66d345cc5"/>
+      <column name="ACTIVITYLINKID" value="9d6feb2f-5a69-4bcd-887c-0a2b36c7dd3e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T07:52:58"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="9f20ee40-22b8-440a-93e3-749bc6d6e273"/>
-      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="ACTIVITYLINKID" value="9f20ee40-22b8-440a-93e3-749bc6d6e273"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="a0ace23b-6de7-4d40-99d7-236f79e3bd30"/>
-      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:15:50"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
+      <column name="ACTIVITYLINKID" value="a0ace23b-6de7-4d40-99d7-236f79e3bd30"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:15:50"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
-      <column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="a5b68737-689c-42e8-a4e3-aee7d4a40fb9"/>
-      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="ACTIVITYLINKID" value="a5b68737-689c-42e8-a4e3-aee7d4a40fb9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="a631ea8d-c09a-4bff-83ab-4573df6dbe4f"/>
-      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="ACTIVITYLINKID" value="a631ea8d-c09a-4bff-83ab-4573df6dbe4f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="a7c8ec07-0d09-4d16-beb6-c5e5a44e20a2"/>
-      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="ACTIVITYLINKID" value="a7c8ec07-0d09-4d16-beb6-c5e5a44e20a2"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="aa944406-61f4-4044-9f69-51a42b270113"/>
-      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
+      <column name="ACTIVITYLINKID" value="aa944406-61f4-4044-9f69-51a42b270113"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="ac4ae135-4996-4f4c-a110-2caddd90eaec"/>
-      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T08:09:10"/>
-      <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="ACTIVITYLINKID" value="ac4ae135-4996-4f4c-a110-2caddd90eaec"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T08:09:10"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b0df24a5-a162-40aa-b240-04c03845f896"/>
-      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:37:32"/>
-      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="ACTIVITYLINKID" value="b0df24a5-a162-40aa-b240-04c03845f896"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:37:32"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
-      <column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
+      <column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
-      <column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b1a9bcbf-2b76-4377-b41b-12aab911a093"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:53:18"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
+      <column name="ACTIVITYLINKID" value="b1a9bcbf-2b76-4377-b41b-12aab911a093"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T07:53:18"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b25aa59c-50e1-4236-bd17-adeda3ed1157"/>
-      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:12:40"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="ACTIVITYLINKID" value="b25aa59c-50e1-4236-bd17-adeda3ed1157"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:12:40"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="b65b384e-dfd6-4633-8a0b-f9382a03a495"/>
-      <column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
-      <column name="OBJECT_ROWID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
       <column name="OBJECT_TYPE" value="Contract"/>
+      <column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
+      <column name="ACTIVITYLINKID" value="b65b384e-dfd6-4633-8a0b-f9382a03a495"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
-      <column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
+      <column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="bac8559e-b9b1-499e-b6ce-910ead665b21"/>
-      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:04:58"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
+      <column name="ACTIVITYLINKID" value="bac8559e-b9b1-499e-b6ce-910ead665b21"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:04:58"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="bc86224f-8266-4c8a-950b-b8cb9e1a5569"/>
-      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
+      <column name="ACTIVITYLINKID" value="bc86224f-8266-4c8a-950b-b8cb9e1a5569"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="bd8df5fe-5aec-4f85-a12b-36a1225955da"/>
-      <column name="ACTIVITY_ID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
-      <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
+      <column name="ACTIVITYLINKID" value="bd8df5fe-5aec-4f85-a12b-36a1225955da"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:16:41"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="bfa9b8c3-2750-45fe-a121-99280e5077f6"/>
-      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T03:57:16"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
+      <column name="ACTIVITYLINKID" value="bfa9b8c3-2750-45fe-a121-99280e5077f6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:57:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c23d8381-4cf5-48ac-be27-d132bef9127b"/>
-      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:54:21"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
+      <column name="ACTIVITYLINKID" value="c23d8381-4cf5-48ac-be27-d132bef9127b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T07:54:21"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c3261b97-a07d-4aa8-8767-065b6934108e"/>
-      <column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T11:38:18"/>
-      <column name="OBJECT_ROWID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
       <column name="OBJECT_TYPE" value="Contract"/>
+      <column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
+      <column name="ACTIVITYLINKID" value="c3261b97-a07d-4aa8-8767-065b6934108e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T11:38:18"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c3751fb7-ae77-402b-8716-3e3a477dc813"/>
-      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T04:58:50"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="ACTIVITYLINKID" value="c3751fb7-ae77-402b-8716-3e3a477dc813"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T04:58:50"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c402a4cf-49c9-4ba6-98f7-11b831994b2a"/>
-      <column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:56:20"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
+      <column name="ACTIVITYLINKID" value="c402a4cf-49c9-4ba6-98f7-11b831994b2a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T07:56:20"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c419929e-2b07-4cc4-9c7d-b0cf8b47b252"/>
-      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
+      <column name="ACTIVITYLINKID" value="c419929e-2b07-4cc4-9c7d-b0cf8b47b252"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="c79c3685-9e36-4166-913c-e11a7cfd5abd"/>
-      <column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
+      <column name="ACTIVITYLINKID" value="c79c3685-9e36-4166-913c-e11a7cfd5abd"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
-      <column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
+      <column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="ce3be28a-35d9-41de-b7ca-e54b8dcb4ddf"/>
-      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:14:46"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
+      <column name="ACTIVITYLINKID" value="ce3be28a-35d9-41de-b7ca-e54b8dcb4ddf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:14:46"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="cfb3f5f6-c148-42c9-b86c-14900e8d30c9"/>
-      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
+      <column name="ACTIVITYLINKID" value="cfb3f5f6-c148-42c9-b86c-14900e8d30c9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d1a33dfd-92c8-4d66-bd21-8a81fbddba06"/>
-      <column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T09:00:14"/>
-      <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="ACTIVITYLINKID" value="d1a33dfd-92c8-4d66-bd21-8a81fbddba06"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T09:00:14"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d1cfe415-bf05-4ee0-98b6-56ba560a39b6"/>
-      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:00:39"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
+      <column name="ACTIVITYLINKID" value="d1cfe415-bf05-4ee0-98b6-56ba560a39b6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:00:39"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d3ee6fb5-78e6-444c-bc1e-99e3eac16986"/>
-      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
+      <column name="ACTIVITYLINKID" value="d3ee6fb5-78e6-444c-bc1e-99e3eac16986"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d519df27-bcd6-4a8a-9004-3ecae7821208"/>
-      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:02:50"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="ACTIVITYLINKID" value="d519df27-bcd6-4a8a-9004-3ecae7821208"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:02:50"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d5417a0e-0dc3-414b-8450-a642d75be6e3"/>
-      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:16:02"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
+      <column name="ACTIVITYLINKID" value="d5417a0e-0dc3-414b-8450-a642d75be6e3"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:16:02"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d65a47ca-7357-43d9-896b-030bb8e3f170"/>
-      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:56:51"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="ACTIVITYLINKID" value="d65a47ca-7357-43d9-896b-030bb8e3f170"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-05-28T07:56:51"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d6940bd2-2a33-4586-9184-1cb53dc891d4"/>
-      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
+      <column name="ACTIVITYLINKID" value="d6940bd2-2a33-4586-9184-1cb53dc891d4"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d6d5a0a5-201d-4b5e-8f56-8f31a6106f88"/>
-      <column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
+      <column name="ACTIVITYLINKID" value="d6d5a0a5-201d-4b5e-8f56-8f31a6106f88"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="d8c58d4b-8c3b-42e9-bb23-af49ef0535d5"/>
-      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
-      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
+      <column name="ACTIVITYLINKID" value="d8c58d4b-8c3b-42e9-bb23-af49ef0535d5"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="da68ccb2-09c8-4a63-9dc3-16bec0777ad6"/>
-      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="ACTIVITYLINKID" value="da68ccb2-09c8-4a63-9dc3-16bec0777ad6"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="db2e4998-3b57-412c-aaed-b12340028903"/>
-      <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
-      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
+      <column name="ACTIVITYLINKID" value="db2e4998-3b57-412c-aaed-b12340028903"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="dbe766e2-3920-4e23-8b11-d92f20d9d77e"/>
-      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
+      <column name="ACTIVITYLINKID" value="dbe766e2-3920-4e23-8b11-d92f20d9d77e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="dd6edda8-eefa-46cd-ac09-276ca1772023"/>
-      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
+      <column name="ACTIVITYLINKID" value="dd6edda8-eefa-46cd-ac09-276ca1772023"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="de20465b-6524-44d4-a01e-1db9d9c8bb05"/>
-      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
+      <column name="ACTIVITYLINKID" value="de20465b-6524-44d4-a01e-1db9d9c8bb05"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="dfcd0e72-a1fa-44bb-9dce-1ab30bad1993"/>
-      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
-      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
+      <column name="ACTIVITYLINKID" value="dfcd0e72-a1fa-44bb-9dce-1ab30bad1993"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e090084f-d2e4-42e5-b524-7e79dafcb78e"/>
-      <column name="ACTIVITY_ID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:49:00"/>
-      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
+      <column name="ACTIVITYLINKID" value="e090084f-d2e4-42e5-b524-7e79dafcb78e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:49:00"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e4337f16-291b-4623-a603-3acc5f70ceb9"/>
-      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
+      <column name="ACTIVITYLINKID" value="e4337f16-291b-4623-a603-3acc5f70ceb9"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e6dc6017-6843-4b08-8aa5-1f34b9fc0434"/>
-      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:12:20"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
+      <column name="ACTIVITYLINKID" value="e6dc6017-6843-4b08-8aa5-1f34b9fc0434"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:12:20"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e76219f5-9b6a-48c1-a3ea-42a25e03c821"/>
-      <column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
-      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
+      <column name="ACTIVITYLINKID" value="e76219f5-9b6a-48c1-a3ea-42a25e03c821"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e763809c-f612-4879-be39-6c3f08339093"/>
-      <column name="ACTIVITY_ID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:23:56"/>
-      <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="OBJECT_TYPE" value="Campaign"/>
+      <column name="ACTIVITY_ID" value="be9c6fd3-a401-4696-9382-442a20da6266"/>
+      <column name="ACTIVITYLINKID" value="e763809c-f612-4879-be39-6c3f08339093"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:23:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="e80cdefe-ff46-49f9-84ce-393882730337"/>
-      <column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
-      <column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+      <column name="ACTIVITYLINKID" value="e80cdefe-ff46-49f9-84ce-393882730337"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="ef66f553-93f4-4df5-a97c-d7a93b57ae6a"/>
-      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
+      <column name="ACTIVITYLINKID" value="ef66f553-93f4-4df5-a97c-d7a93b57ae6a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
-      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
-      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
+      <column name="ACTIVITYLINKID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f20857e3-3191-4fdf-b803-9ffd1a0668d7"/>
-      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
+      <column name="ACTIVITYLINKID" value="f20857e3-3191-4fdf-b803-9ffd1a0668d7"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f3517f18-7473-4263-9236-7b3262e5ae1e"/>
-      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:07:26"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
+      <column name="ACTIVITYLINKID" value="f3517f18-7473-4263-9236-7b3262e5ae1e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:07:26"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f37c2f14-27ce-4782-a7d4-c9f6d6fbcecd"/>
-      <column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
+      <column name="ACTIVITYLINKID" value="f37c2f14-27ce-4782-a7d4-c9f6d6fbcecd"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f43ce26b-e728-41cd-9a93-745718b98972"/>
-      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
+      <column name="ACTIVITYLINKID" value="f43ce26b-e728-41cd-9a93-745718b98972"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f473cdce-4fea-49c1-8922-ecfa2b4e1949"/>
-      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T04:15:09"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
+      <column name="ACTIVITYLINKID" value="f473cdce-4fea-49c1-8922-ecfa2b4e1949"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T04:15:09"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f7b42c68-cdc0-4a47-81f8-7a2c5f3d661a"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
+      <column name="ACTIVITYLINKID" value="f7b42c68-cdc0-4a47-81f8-7a2c5f3d661a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f91f6e28-01f1-4b45-98f5-b0fb42ac3c38"/>
-      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
-      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
+      <column name="ACTIVITYLINKID" value="f91f6e28-01f1-4b45-98f5-b0fb42ac3c38"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="f9492518-d54d-40a7-99b1-8a89b648d15e"/>
-      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T03:58:04"/>
-      <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
+      <column name="ACTIVITYLINKID" value="f9492518-d54d-40a7-99b1-8a89b648d15e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:58:04"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="fa4f065e-3bf5-43ca-950c-e7f5f2124e9a"/>
-      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T03:36:11"/>
-      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
+      <column name="ACTIVITYLINKID" value="fa4f065e-3bf5-43ca-950c-e7f5f2124e9a"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:36:11"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="fb08245a-d14b-4a41-bfb3-973aa560d079"/>
-      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
-      <column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
+      <column name="ACTIVITYLINKID" value="fb08245a-d14b-4a41-bfb3-973aa560d079"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="fbd5ad75-92ac-48e2-ae11-d2f6e135123e"/>
-      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
+      <column name="ACTIVITYLINKID" value="fbd5ad75-92ac-48e2-ae11-d2f6e135123e"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
-      <column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
+      <column name="ACTIVITYLINKID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
     </insert>
     <insert tableName="activitylink">
-      <column name="ACTIVITYLINKID" value="ffa179e7-a704-440f-ac23-2fdf9eb10acf"/>
-      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="DATE_NEW" valueDate="2019-06-05T03:44:22"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
+      <column name="ACTIVITYLINKID" value="ffa179e7-a704-440f-ac23-2fdf9eb10acf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:44:22"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
index 30f5bc836e26a654835dca620a7b2455c3ff6adc..b918e33801c95e7537f36863ea64e99d9258d0f7 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/address.xml
@@ -1,546 +1,553 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="18ded44b-8224-42c5-b6a3-7cec027650e0">
+  <changeSet author="autogenerated" id="9824a41d-faa5-4e6e-90a6-2bec526a17d8">
     <delete tableName="address"/>
     <insert tableName="address">
+      <column name="ZIP" value="18074"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Rudolstaedter Strasse"/>
-      <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="77"/>
       <column name="CITY" value="Heinrichsthal"/>
+      <column name="LON" valueNumeric="9.34425430"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Bayern"/>
       <column name="PROVINCE" value="Freistaat Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="18074"/>
-      <column name="LAT" valueNumeric="50.0711647"/>
-      <column name="LON" valueNumeric="9.3442543"/>
+      <column name="BUILDINGNO" value="77"/>
+      <column name="DISTRICT" value="Bayern"/>
+      <column name="LAT" valueNumeric="50.07116470"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84034"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Neustadt"/>
-      <column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
+      <column name="LON" valueNumeric="12.15381090"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Niederbayern"/>
       <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="12"/>
+      <column name="DISTRICT" value="Niederbayern"/>
       <column name="REGION" value="Niederbayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84034"/>
-      <column name="LAT" valueNumeric="48.5352758"/>
-      <column name="LON" valueNumeric="12.1538109"/>
+      <column name="LAT" valueNumeric="48.53527580"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="90419"/>
+      <column name="COUNTRY" value="DE"/>
       <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="BUILDINGNO" value="25"/>
       <column name="CITY" value="Nürnberg"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="LON" valueNumeric="11.08920230"/>
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Nürnberg"/>
       <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="25"/>
+      <column name="DISTRICT" value="Nürnberg"/>
       <column name="REGION" value="Mittelfranken"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="90419"/>
-      <column name="LAT" valueNumeric="49.4554978"/>
-      <column name="LON" valueNumeric="11.0892023"/>
+      <column name="LAT" valueNumeric="49.45549780"/>
     </insert>
     <insert tableName="address">
-      <column name="ADDRESS" value="Wilhelm-Straße"/>
-      <column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
-      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="ZIP" value="84144"/>
+      <column name="COUNTRY" value="DE"/>
+      <column name="ADDRESS" value="Konrad-Zuse-Straße"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="2"/>
-      <column name="CITY" value="München"/>
+      <column name="CITY" value="Geisenhausen"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="LON" valueNumeric="12.24404810"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="80807"/>
-      <column name="LAT" valueNumeric="48.15795955"/>
-      <column name="LON" valueNumeric="11.58301632"/>
+      <column name="BUILDINGNO" value="4"/>
+      <column name="DISTRICT" value="Oberbayern"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T09:39:05"/>
+      <column name="REGION" value="NB"/>
+      <column name="LAT" valueNumeric="48.47726030"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="01159"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Freiberger Str."/>
-      <column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="Dresden"/>
+      <column name="LON" valueNumeric="13.70498290"/>
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:28"/>
       <column name="PROVINCE" value="Sachsen"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="01159"/>
-      <column name="LAT" valueNumeric="51.0433705"/>
-      <column name="LON" valueNumeric="13.7049829"/>
+      <column name="BUILDINGNO" value="45"/>
+      <column name="LAT" valueNumeric="51.04337050"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="85055"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Regensburger Straße"/>
-      <column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="Ingolstadt"/>
+      <column name="LON" valueNumeric="11.44332360"/>
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:41"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="85055"/>
-      <column name="LAT" valueNumeric="48.7677535"/>
-      <column name="LON" valueNumeric="11.4433236"/>
+      <column name="BUILDINGNO" value="45"/>
+      <column name="LAT" valueNumeric="48.76775350"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84034"/>
+      <column name="COUNTRY" value="DE"/>
       <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="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1 "/>
+      <column name="LON" valueNumeric="12.12398208"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:45:53"/>
       <column name="PROVINCE" value="Bayern "/>
+      <column name="BUILDINGNO" value="48"/>
       <column name="REGION" value="Niederbayern "/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84034"/>
       <column name="LAT" valueNumeric="48.53621870"/>
-      <column name="LON" valueNumeric="12.12398208"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84144"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Landshuter Str."/>
-      <column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Geisenhausen"/>
+      <column name="LON" valueNumeric="12.25215110"/>
       <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:01"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84144"/>
-      <column name="LAT" valueNumeric="48.4763188"/>
-      <column name="LON" valueNumeric="12.2521511"/>
+      <column name="BUILDINGNO" value="32"/>
+      <column name="LAT" valueNumeric="48.47631880"/>
     </insert>
     <insert tableName="address">
-      <column name="ADDRESS" value="Bolzstraße"/>
-      <column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="ZIP" value="22846"/>
+      <column name="COUNTRY" value="DE"/>
+      <column name="ADDRESS" value="Rathausallee"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="64"/>
-      <column name="CITY" value="Stuttgart"/>
+      <column name="CITY" value="Norderstedt"/>
+      <column name="LON" valueNumeric="9.99346230"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="PROVINCE" value="Baden-Württemberg"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="70173"/>
-      <column name="LAT" valueNumeric="48.7802679"/>
-      <column name="LON" valueNumeric="9.1771426"/>
+      <column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
+      <column name="PROVINCE" value="Schleswig-Holstein"/>
+      <column name="BUILDINGNO" value="50"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T08:11:11"/>
+      <column name="LAT" valueNumeric="53.70799670"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="10115"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Torstraße"/>
-      <column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="78"/>
       <column name="CITY" value="Berlin"/>
+      <column name="LON" valueNumeric="13.38846270"/>
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:21"/>
       <column name="PROVINCE" value="Berlin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="10115"/>
-      <column name="LAT" valueNumeric="52.5274079"/>
-      <column name="LON" valueNumeric="13.3884627"/>
+      <column name="BUILDINGNO" value="78"/>
+      <column name="LAT" valueNumeric="52.52740790"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84034"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Neustadt"/>
-      <column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
       <column name="ADDR_TYPE" value="DELIVERADDR"/>
-      <column name="BUILDINGNO" value="13"/>
       <column name="CITY" value="Landshut"/>
+      <column name="LON" valueNumeric="12.15381090"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Niederbayern"/>
       <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="13"/>
+      <column name="DISTRICT" value="Niederbayern"/>
       <column name="REGION" value="Niederbayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84034"/>
-      <column name="LAT" valueNumeric="48.5352758"/>
-      <column name="LON" valueNumeric="12.1538109"/>
+      <column name="LAT" valueNumeric="48.53527580"/>
     </insert>
     <insert tableName="address">
-      <column name="ADDRESS" value="Königstraße"/>
-      <column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
+      <column name="ZIP" value="20095"/>
+      <column name="COUNTRY" value="DE"/>
+      <column name="ADDRESS" value="Rathausmarkt"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="4"/>
       <column name="CITY" value="Hamburg"/>
+      <column name="LON" valueNumeric="9.99256091"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
       <column name="PROVINCE" value="Hamburg"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="22767 "/>
-      <column name="LAT" valueNumeric="53.549853"/>
-      <column name="LON" valueNumeric="9.9542231"/>
+      <column name="BUILDINGNO" value="1"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T08:09:43"/>
+      <column name="LAT" valueNumeric="53.55034310"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="85230"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Büsingstrasse"/>
-      <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Bergkirchen"/>
+      <column name="LON" valueNumeric="11.13586210"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="85230"/>
-      <column name="LAT" valueNumeric="48.1740741"/>
-      <column name="LON" valueNumeric="11.1358621"/>
+      <column name="BUILDINGNO" value="32"/>
+      <column name="DISTRICT" value="Oberbayern"/>
+      <column name="LAT" valueNumeric="48.17407410"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="90443"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Sandstraße"/>
-      <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
-      <column name="ADDRIDENTIFIER" value="Tor 1"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="3"/>
       <column name="CITY" value="Nürnberg"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="LON" valueNumeric="11.06877420"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="90443"/>
+      <column name="BUILDINGNO" value="3"/>
+      <column name="DISTRICT" value="Oberbayern"/>
       <column name="LAT" valueNumeric="49.44684405"/>
-      <column name="LON" valueNumeric="11.06877420"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="88046"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Friedrichshafen"/>
-      <column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Friedrichshafen"/>
+      <column name="LON" valueNumeric="9.49441404"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
       <column name="PROVINCE" value="Baden-Württemberg"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="88046"/>
+      <column name="BUILDINGNO" value="12"/>
       <column name="LAT" valueNumeric="47.66121225"/>
-      <column name="LON" valueNumeric="9.49441404"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="67700"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Grosse Praesidenten Str."/>
-      <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Niederkirchen"/>
+      <column name="LON" valueNumeric="7.69555650"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="PROVINCE" value="Rheinland-Pfalz"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="67700"/>
-      <column name="LAT" valueNumeric="49.5784546"/>
-      <column name="LON" valueNumeric="7.6955565"/>
+      <column name="BUILDINGNO" value="48"/>
+      <column name="LAT" valueNumeric="49.57845460"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="93047"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Steinstraße"/>
-      <column name="ADDRESSID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="Regensburg"/>
+      <column name="LON" valueNumeric="12.12251710"/>
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:43"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="93047"/>
-      <column name="LAT" valueNumeric="49.0135924"/>
-      <column name="LON" valueNumeric="12.1225171"/>
+      <column name="BUILDINGNO" value="35"/>
+      <column name="LAT" valueNumeric="49.01359240"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="18074"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Kurfürstendamm"/>
-      <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="95"/>
       <column name="CITY" value="Rostock"/>
+      <column name="LON" valueNumeric="12.12861270"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Mecklenburg-Vorpommern"/>
       <column name="PROVINCE" value="Mecklenburg-Vorpommern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="18074"/>
-      <column name="LAT" valueNumeric="54.0924445"/>
-      <column name="LON" valueNumeric="12.1286127"/>
+      <column name="BUILDINGNO" value="95"/>
+      <column name="DISTRICT" value="Mecklenburg-Vorpommern"/>
+      <column name="LAT" valueNumeric="54.09244450"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="71229"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Fliederstraße"/>
-      <column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="4"/>
       <column name="CITY" value="Leonberg"/>
+      <column name="LON" valueNumeric="9.02484430"/>
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:30"/>
       <column name="PROVINCE" value="Baden-Württemberg"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="71229"/>
-      <column name="LAT" valueNumeric="48.7956487"/>
-      <column name="LON" valueNumeric="9.0248443"/>
+      <column name="BUILDINGNO" value="4"/>
+      <column name="LAT" valueNumeric="48.79564870"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="86949"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Hauptstraße"/>
-      <column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="110"/>
       <column name="CITY" value="Windach"/>
+      <column name="LON" valueNumeric="10.98941420"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="110"/>
+      <column name="DISTRICT" value="Oberbayern"/>
       <column name="REGION" value="Landsberg am Lech"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="86949"/>
-      <column name="LAT" valueNumeric="48.0642437"/>
-      <column name="LON" valueNumeric="10.9894142"/>
+      <column name="LAT" valueNumeric="48.06424370"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="86150"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Augsburger Straße"/>
-      <column name="ADDRESSID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Augsburg"/>
+      <column name="LON" valueNumeric="10.87471185"/>
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="86150"/>
-      <column name="LAT" valueNumeric="48.3641223"/>
-      <column name="LON" valueNumeric="10.87471185"/>
+      <column name="BUILDINGNO" value="6"/>
+      <column name="LAT" valueNumeric="48.36412230"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="80456"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Landsberger Allee"/>
-      <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="83"/>
       <column name="CITY" value="München"/>
+      <column name="LON" valueNumeric="11.53675920"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="80456"/>
-      <column name="LAT" valueNumeric="48.1394721"/>
-      <column name="LON" valueNumeric="11.5367592"/>
+      <column name="BUILDINGNO" value="83"/>
+      <column name="DISTRICT" value="Oberbayern"/>
+      <column name="LAT" valueNumeric="48.13947210"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="60318"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Oeder Weg"/>
-      <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
-      <column name="ADDRIDENTIFIER" value="Tor 1"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Frankfurt am Main"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="LON" valueNumeric="8.67988090"/>
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="PROVINCE" value="Hessen"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="60318"/>
-      <column name="LAT" valueNumeric="50.1186864"/>
-      <column name="LON" valueNumeric="8.6798809"/>
+      <column name="BUILDINGNO" value="6"/>
+      <column name="LAT" valueNumeric="50.11868640"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84034"/>
+      <column name="COUNTRY" value="DE"/>
       <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="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
+      <column name="ADDRIDENTIFIER" value="Tor 1"/>
+      <column name="LON" valueNumeric="12.12398208"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="DATE_EDIT" valueDate="2019-06-07T02:44:48"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84034"/>
+      <column name="BUILDINGNO" value="48"/>
+      <column name="DISTRICT" value="Oberbayern"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:44:48"/>
       <column name="LAT" valueNumeric="48.53621870"/>
-      <column name="LON" valueNumeric="12.12398208"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84028"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Innere Münchner Straße"/>
-      <column name="ADDRESSID" value="98652f91-7775-4e96-bc90-034669fceeac"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="3"/>
       <column name="CITY" value="Landshut"/>
+      <column name="LON" valueNumeric="12.16404283"/>
       <column name="CONTACT_ID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="PROVINCE" value="Bayern"/>
-      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84028"/>
+      <column name="ADDRESSID" value="98652f91-7775-4e96-bc90-034669fceeac"/>
+      <column name="DATE_NEW" valueDate="2019-11-26T08:28:01"/>
+      <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="3"/>
       <column name="LAT" valueNumeric="48.53814234"/>
-      <column name="LON" valueNumeric="12.16404283"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84144"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Konrad"/>
-      <column name="ADDRESSID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="CITY" value="Geisenhausen"/>
+      <column name="LON" valueNumeric="12.24404810"/>
       <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84144"/>
-      <column name="LAT" valueNumeric="48.4772603"/>
-      <column name="LON" valueNumeric="12.2440481"/>
+      <column name="ADDRESSID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
+      <column name="LAT" valueNumeric="48.47726030"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84034"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Neustadt"/>
-      <column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
+      <column name="LON" valueNumeric="12.15381090"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DISTRICT" value="Niederbayern"/>
       <column name="PROVINCE" value="Bayern"/>
+      <column name="BUILDINGNO" value="12"/>
+      <column name="DISTRICT" value="Niederbayern"/>
       <column name="REGION" value="Niederbayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84034"/>
-      <column name="LAT" valueNumeric="48.5352758"/>
-      <column name="LON" valueNumeric="12.1538109"/>
+      <column name="LAT" valueNumeric="48.53527580"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="84028"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Am Alten Viehmarkt"/>
-      <column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
       <column name="ADDR_TYPE" value="DELIVERADDR"/>
-      <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Landshut"/>
+      <column name="LON" valueNumeric="12.15732140"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="84028"/>
-      <column name="LAT" valueNumeric="48.5391499"/>
-      <column name="LON" valueNumeric="12.1573214"/>
+      <column name="BUILDINGNO" value="6"/>
+      <column name="LAT" valueNumeric="48.53914990"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="86150"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Karlstraße"/>
-      <column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="2"/>
       <column name="CITY" value="Augsburg"/>
+      <column name="LON" valueNumeric="10.89760900"/>
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="86150"/>
-      <column name="LAT" valueNumeric="48.370795"/>
-      <column name="LON" valueNumeric="10.897609"/>
+      <column name="BUILDINGNO" value="2"/>
+      <column name="LAT" valueNumeric="48.37079500"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="28103"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Bogenallee"/>
-      <column name="ADDRESSID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Bremen"/>
+      <column name="LON" valueNumeric="7.95765380"/>
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
       <column name="PROVINCE" value="Bremen"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="28103"/>
-      <column name="LAT" valueNumeric="51.5033219"/>
-      <column name="LON" valueNumeric="7.9576538"/>
+      <column name="BUILDINGNO" value="6"/>
+      <column name="LAT" valueNumeric="51.50332190"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="22765"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Julius-Leber-Straße"/>
-      <column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="5"/>
       <column name="CITY" value="Hamburg"/>
+      <column name="LON" valueNumeric="9.93639880"/>
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:50:42"/>
       <column name="PROVINCE" value="Hamburg"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="22765"/>
-      <column name="LAT" valueNumeric="53.555812"/>
-      <column name="LON" valueNumeric="9.9363988"/>
+      <column name="BUILDINGNO" value="5"/>
+      <column name="LAT" valueNumeric="53.55581200"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="93055"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Blumenstraße"/>
-      <column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="11"/>
       <column name="CITY" value="Regensburg"/>
+      <column name="LON" valueNumeric="12.11305452"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="DATE_EDIT" valueDate="2019-06-07T02:49:33"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:04:16"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="93055"/>
+      <column name="BUILDINGNO" value="11"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:49:33"/>
       <column name="LAT" valueNumeric="49.01276075"/>
-      <column name="LON" valueNumeric="12.11305452"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="33739"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Spresstrasse"/>
-      <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
       <column name="ADDR_TYPE" value="HOMEADDR"/>
-      <column name="BUILDINGNO" value="67"/>
       <column name="CITY" value="Bielefeld"/>
+      <column name="LON" valueNumeric="8.52114562"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="COUNTRY" value="DE"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
       <column name="PROVINCE" value="Nordrhein-Westfalen"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="33739"/>
+      <column name="BUILDINGNO" value="67"/>
       <column name="LAT" valueNumeric="52.08547342"/>
-      <column name="LON" valueNumeric="8.52114562"/>
     </insert>
     <insert tableName="address">
+      <column name="ZIP" value="80689"/>
+      <column name="COUNTRY" value="DE"/>
       <column name="ADDRESS" value="Gotthardstraße"/>
-      <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
-      <column name="ADDRIDENTIFIER" value="Tor 4"/>
       <column name="ADDR_TYPE" value="OFFICEADDR"/>
-      <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="München"/>
+      <column name="ADDRIDENTIFIER" value="Tor 4"/>
+      <column name="LON" valueNumeric="11.49639750"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="COUNTRY" value="DE"/>
-      <column name="DATE_EDIT" valueDate="2019-06-07T02:50:21"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="DISTRICT" value="Oberbayern"/>
       <column name="PROVINCE" value="Bayern"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="ZIP" value="80689"/>
-      <column name="LAT" valueNumeric="48.1358663"/>
-      <column name="LON" valueNumeric="11.4963975"/>
+      <column name="BUILDINGNO" value="35"/>
+      <column name="DISTRICT" value="Oberbayern"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:50:21"/>
+      <column name="LAT" valueNumeric="48.13586630"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmail.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmail.xml
index cfc8ad63174daa7070536fab61e8a180bfb815e2..b3142a2cae6c09150008a62cdf5495ed7369e04f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmail.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmail.xml
@@ -1,34 +1,34 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="02a2a6c0-7702-404b-b01d-8493fa3a9435">
+  <changeSet author="autogenerated" id="f94e77db-7363-48ae-9a3b-b2ce36687f63">
     <delete tableName="bulkmail"/>
     <insert tableName="bulkmail">
-      <column name="BULKMAILID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
       <column name="CREATEACTIVITIES" valueNumeric="1"/>
+      <column name="BULKMAILID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
+      <column name="SENDER" value="tadmin@meine-firma.de"/>
+      <column name="SUBJECT" value="Erstkontakt meineFirma"/>
       <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
       <column name="NAME" value="Serienmail - Newsletter"/>
-      <column name="SENDER" value="tadmin@meine-firma.de"/>
       <column name="STATUS" value="BULKMAILNOTSENT"/>
-      <column name="SUBJECT" value="Erstkontakt meineFirma"/>
     </insert>
     <insert tableName="bulkmail">
-      <column name="BULKMAILID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
       <column name="CREATEACTIVITIES" valueNumeric="1"/>
+      <column name="BULKMAILID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
+      <column name="SENDER" value="tadmin@meine-firma.de"/>
+      <column name="SUBJECT" value="Email Vorlage Erstkontakt"/>
       <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
       <column name="NAME" value="Produktinformationen"/>
-      <column name="SENDER" value="tadmin@meine-firma.de"/>
       <column name="STATUS" value="BULKMAILNOTSENT"/>
-      <column name="SUBJECT" value="Email Vorlage Erstkontakt"/>
     </insert>
     <insert tableName="bulkmail">
-      <column name="BULKMAILID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
       <column name="CREATEACTIVITIES" valueNumeric="1"/>
-      <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
-      <column name="NAME" value="Erstkontakt ADITO"/>
+      <column name="BULKMAILID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
       <column name="SENDER" value="tadmin@meine-firma.de"/>
-      <column name="STATUS" value="BULKMAILNOTSENT"/>
       <column name="SUBJECT" value="Email Vorlage Erstkontakt"/>
+      <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="NAME" value="Erstkontakt ADITO"/>
       <column name="USE_TEMPLATE_ATTACHMENTS" valueNumeric="1"/>
+      <column name="STATUS" value="BULKMAILNOTSENT"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmailrecipient.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmailrecipient.xml
index b7d80e478722e100c0fc08599ee9441989568970..341cc9ce866d96dd7dc114da6af8a42a64de6183 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmailrecipient.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/bulkmailrecipient.xml
@@ -1,200 +1,200 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="14caa5f4-e01c-47f6-abad-faf139ddc1f0">
+  <changeSet author="autogenerated" id="4d396410-7295-49a1-a84c-231cc04b23e8">
     <delete tableName="bulkmailrecipient"/>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="103cd20e-63d5-4915-acc1-64ff3e8dfe81"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="BULKMAILRECIPIENTID" value="103cd20e-63d5-4915-acc1-64ff3e8dfe81"/>
       <column name="EMAIL_ADDRESS" value="lsommer@meine-firma.de"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="119b5628-fb77-45ef-9310-17d54cf0e9de"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
+      <column name="BULKMAILRECIPIENTID" value="119b5628-fb77-45ef-9310-17d54cf0e9de"/>
       <column name="EMAIL_ADDRESS" value="psolano@industrial-steel.de"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="1261ad16-5031-4c5b-b3c4-be33778f34bb"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="BULKMAILRECIPIENTID" value="1261ad16-5031-4c5b-b3c4-be33778f34bb"/>
       <column name="EMAIL_ADDRESS" value="fmüller@meine-firma.de"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="1b79925d-8c51-48cc-8201-874c43b122b0"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="BULKMAILRECIPIENTID" value="1b79925d-8c51-48cc-8201-874c43b122b0"/>
       <column name="EMAIL_ADDRESS" value="alindner@industrial-steel.de"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="2eeac840-1cad-4f15-9601-a1d8c6561f6a"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="BULKMAILRECIPIENTID" value="2eeac840-1cad-4f15-9601-a1d8c6561f6a"/>
       <column name="EMAIL_ADDRESS" value="lkanzler@web.de"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="5738d88f-7870-4515-ae4c-51eabd4da745"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="BULKMAILRECIPIENTID" value="5738d88f-7870-4515-ae4c-51eabd4da745"/>
       <column name="EMAIL_ADDRESS" value="jgrüner@web.de"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="59e5eadd-f516-4681-be19-41643d9d78aa"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="BULKMAILRECIPIENTID" value="59e5eadd-f516-4681-be19-41643d9d78aa"/>
       <column name="EMAIL_ADDRESS" value="bleicht@meine-firma.de"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="5b58d59e-3303-4286-9e49-3004c95e6dca"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="BULKMAILRECIPIENTID" value="5b58d59e-3303-4286-9e49-3004c95e6dca"/>
       <column name="EMAIL_ADDRESS" value="amorgenstern@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="5d756301-9d3d-4053-9e1b-b6fbaffdbb66"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="BULKMAILRECIPIENTID" value="5d756301-9d3d-4053-9e1b-b6fbaffdbb66"/>
       <column name="EMAIL_ADDRESS" value="lkanzler@web.de"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="69177b63-1775-4517-a430-d561850523a4"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
+      <column name="BULKMAILRECIPIENTID" value="69177b63-1775-4517-a430-d561850523a4"/>
       <column name="EMAIL_ADDRESS" value="azweisstein@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="772718f6-ee76-47cc-ae4f-015f93cd394f"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
+      <column name="BULKMAILRECIPIENTID" value="772718f6-ee76-47cc-ae4f-015f93cd394f"/>
       <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="80a7616c-cb51-49c0-8887-40d6fd36f591"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="BULKMAILRECIPIENTID" value="80a7616c-cb51-49c0-8887-40d6fd36f591"/>
       <column name="EMAIL_ADDRESS" value="atannenbaum@industiral-steel.de"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="80e2e6e1-13d2-4cb6-b6c9-0d26e0fe7d4a"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="BULKMAILRECIPIENTID" value="80e2e6e1-13d2-4cb6-b6c9-0d26e0fe7d4a"/>
       <column name="EMAIL_ADDRESS" value="cdecker@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="8584fb30-c1c1-47a9-b0c0-1677d850da9f"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="BULKMAILRECIPIENTID" value="8584fb30-c1c1-47a9-b0c0-1677d850da9f"/>
       <column name="EMAIL_ADDRESS" value="hsmith@meine-firma.de"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="8ebef004-1beb-4d35-bc6b-efa067948d09"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="BULKMAILRECIPIENTID" value="8ebef004-1beb-4d35-bc6b-efa067948d09"/>
       <column name="EMAIL_ADDRESS" value="lmatterhorn@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="a2d869c1-dd77-4b4b-8836-dbf903a970d3"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="BULKMAILRECIPIENTID" value="a2d869c1-dd77-4b4b-8836-dbf903a970d3"/>
       <column name="EMAIL_ADDRESS" value="dvortrefflich@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="b0bdd111-6e24-461c-86cc-1332ee1d127e"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="BULKMAILRECIPIENTID" value="b0bdd111-6e24-461c-86cc-1332ee1d127e"/>
       <column name="EMAIL_ADDRESS" value="mericson@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="b8ee064e-91dc-4cb9-91b7-19a3bc180ee4"/>
       <column name="BULKMAIL_ID" value="bbb832fe-8ae4-403a-816a-b24d496933f2"/>
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
+      <column name="BULKMAILRECIPIENTID" value="b8ee064e-91dc-4cb9-91b7-19a3bc180ee4"/>
       <column name="EMAIL_ADDRESS" value="psteiger@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="c44dcedb-01d3-4255-bd2c-3d2e26f60530"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="BULKMAILRECIPIENTID" value="c44dcedb-01d3-4255-bd2c-3d2e26f60530"/>
       <column name="EMAIL_ADDRESS" value="tmosby@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="c74338d9-13a0-4e0e-8295-1407950cfca4"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="BULKMAILRECIPIENTID" value="c74338d9-13a0-4e0e-8295-1407950cfca4"/>
       <column name="EMAIL_ADDRESS" value="pmacher@industrial-steel.de"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="d0a54123-6cfb-412d-9602-2ec2b74d33c9"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="BULKMAILRECIPIENTID" value="d0a54123-6cfb-412d-9602-2ec2b74d33c9"/>
       <column name="EMAIL_ADDRESS" value="alindner@industrial-steel.de"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="d7c58f98-0748-4a9a-bf9e-19d0a77eead4"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="BULKMAILRECIPIENTID" value="d7c58f98-0748-4a9a-bf9e-19d0a77eead4"/>
       <column name="EMAIL_ADDRESS" value="slustig@meine-firma.de"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="dbac2f4d-3f7a-48fb-a146-689e02805147"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="BULKMAILRECIPIENTID" value="dbac2f4d-3f7a-48fb-a146-689e02805147"/>
       <column name="EMAIL_ADDRESS" value="jgrüner@web.de"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="de7d0c8d-dc45-41d8-92ba-762c1e261a92"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="BULKMAILRECIPIENTID" value="de7d0c8d-dc45-41d8-92ba-762c1e261a92"/>
       <column name="EMAIL_ADDRESS" value="bleicht@meine-firma.de"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="f3a01713-c4ce-4f40-80cc-78fe76be992c"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="BULKMAILRECIPIENTID" value="f3a01713-c4ce-4f40-80cc-78fe76be992c"/>
       <column name="EMAIL_ADDRESS" value="cdecker@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="f6072449-afe9-4f98-a87e-4191dbfccfdf"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="BULKMAILRECIPIENTID" value="f6072449-afe9-4f98-a87e-4191dbfccfdf"/>
       <column name="EMAIL_ADDRESS" value="gfk@meine-firma.de"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="f692608f-6672-4b7b-a08f-22493b25844b"/>
       <column name="BULKMAIL_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="BULKMAILRECIPIENTID" value="f692608f-6672-4b7b-a08f-22493b25844b"/>
       <column name="EMAIL_ADDRESS" value="mericson@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
     <insert tableName="bulkmailrecipient">
-      <column name="BULKMAILRECIPIENTID" value="fd25aa0e-484e-49c8-86a8-8159c35ea704"/>
       <column name="BULKMAIL_ID" value="2acfd3da-e986-414f-87cf-7ad2b46e5c59"/>
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="BULKMAILRECIPIENTID" value="fd25aa0e-484e-49c8-86a8-8159c35ea704"/>
       <column name="EMAIL_ADDRESS" value="maltinger@industrial-steel.de"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="STATUS" value="EMAILPENDING"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaign.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaign.xml
index 4325860e610d648af7e2cd15dccb125aa4093043..4bdc811fe652602fe92bcf750b233dc5a9745f6d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaign.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaign.xml
@@ -1,48 +1,48 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="be45a6f1-dbfc-4798-ae3e-1529f201916c">
+  <changeSet author="autogenerated" id="dbd6db5d-707a-4f87-a1e9-e0dc07f323ce">
     <delete tableName="campaign"/>
     <insert tableName="campaign">
       <column name="CAMPAIGNID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <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="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
+      <column name="DESCRIPTION" value="Prüfung unserer Software durch Teilnehmer"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+      <column name="STATUS" value="PLANNING"/>
     </insert>
     <insert tableName="campaign">
       <column name="CAMPAIGNID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="NAME" value="Vertriebsmesse"/>
       <column name="DESCRIPTION" value="Messe um neue Kontakte zu akquirieren."/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="NAME" value="Vertriebsmesse"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="NAME" value="Hannovermesse"/>
       <column name="DESCRIPTION" value="Zweijährige Messe."/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="NAME" value="Hannovermesse"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="NAME" value="Interner Kundentag"/>
       <column name="DESCRIPTION" value="An unsererem  Kundentag können sich bestehende Kunden und Interessenten  austauschen."/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="NAME" value="Interner Kundentag"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="STATUS" value="PLANNING"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaigncost.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaigncost.xml
index e69675be11c23b35cd6b055ace9e0aa7dd08fb4d..7c46aee3ca65a0cbc1cc6d74a55427a7a4390e5a 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaigncost.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaigncost.xml
@@ -1,82 +1,82 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="418393ec-e9b2-4988-993f-496b24790501">
+  <changeSet author="autogenerated" id="509a936f-d4fe-4f0c-9341-c7be3ba3ad2f">
     <delete tableName="campaigncost"/>
     <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="250.00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaigncost">
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="250.00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="1000.00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaigncost">
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="500.00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="250.00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="1000.00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="500.00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaigncost">
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="100.00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaigncost">
       <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="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="NET" valueNumeric="150.00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipant.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipant.xml
index 0fff301b1de269c2f2f3153faa780f3378343fd8..fdb05e13043c4a8c28b80275272c6606633731ef 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipant.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipant.xml
@@ -1,504 +1,504 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="d6d6ff73-b506-4ee5-b7dc-eccb8a8820c6">
+  <changeSet author="autogenerated" id="7e59c896-5f76-4ed5-97a6-128e83c93e36">
     <delete tableName="campaignparticipant"/>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="0047c8e1-9057-4a4f-9947-940f38b7d8b1"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="05ba3507-4fc8-4cec-9a45-77773d87984a"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="11bd8015-2a0a-4205-8bd1-400c9f7fbafd"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="182044a9-a2a5-4362-bf00-0f7be031cb1c"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="1c330b1d-f122-4dfc-8450-255141f0c55c"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="28dba2e2-2650-4c2d-a019-87a0df11afb7"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="2a3411ce-ec3c-4d41-8337-bcabf173f580"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="2d40c1c0-975c-4d40-b480-481576d5deb2"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="2e151173-a299-4321-841c-74925273a6b2"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="2f961bb2-5800-44af-8579-02bb6c937b67"/>
       <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="3713db33-4ab3-415e-b4a0-a5856faadbf5"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="3918a273-298d-4e76-a2bb-fe69a1fde114"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="3e2bfe4d-67d6-4ce3-bbd1-277ef02d1ea2"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="41db6815-b3e0-48f2-8aa7-76374bfbe25f"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="47f88082-377a-4e97-beb9-0200a416b715"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="47f8b7ce-e9fc-483a-a66c-c8aa412afdf1"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="4efd91e9-25a5-4033-a48c-dcaca8b64f23"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="50c49ea7-18aa-4a7b-8a11-c022bb833d1b"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="5a9ddff5-27e0-4de5-bda9-792679edfe82"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="5f399c51-6d82-440b-9fc0-aeada3782cb7"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="5f7c3fa5-72f6-4842-82aa-7bb7a7625d21"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="685468f6-16d8-429c-8d0d-87d16cb95c18"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="68ea57cd-3132-4606-830c-4f7d7154d443"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="73b14dcd-7005-4379-919c-4ce00fb7f314"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="75ce2f86-dcc2-422d-b110-e57ed2125d8b"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="78f36ab2-5ea6-4126-9049-caf0dfe61b14"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="7b1dd5e1-1cc5-4859-aa6f-823bbd368cc9"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="7f42aa41-c91a-43e6-8875-d5645b6177ca"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="848c2ae9-021a-4c70-bdc6-6e8215ec12d5"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="8b76598e-2ebb-4b07-91b3-a3e1dad583fb"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="8ba9bb82-9310-4ef2-bfb0-775e7f374298"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="8d5eb011-faca-460a-bf33-6f5b76c4aca0"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="8d7effb5-a0ab-409a-bfa4-9576aadc60fc"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="8f32f702-837e-4332-801e-e5daec1bade3"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="92eb3bbe-6030-494b-a802-c7b52e193da1"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="97e5d00f-fa77-4fc4-866c-450597f86974"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="98ca7aae-5352-49f1-9365-5fbebe0f24fc"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="ab2746b9-b687-42be-8643-b1f4e191947e"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="b3217cc7-ffa5-474b-a77a-b87438360f54"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="b54989b2-b67b-46d6-9c4f-3e0acdd6cd58"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="b7d53313-3ca1-47f8-aabe-a2d53ef5ff73"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="b9337d42-9a31-49b4-b961-38d2db4c87ae"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="be9dfe30-14a1-44ea-999c-0934fffa55ad"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="c65fa845-7868-42b5-a744-4fe4b378cab7"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d18242c8-3620-4fbc-be7c-50345f5bbdff"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d542bbe2-6f42-488b-926e-fcf1ff3b5d3c"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d57b5b8c-17ac-46ed-beda-e0d8f327a1f4"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d77a2d30-7982-4190-bad5-37bae77c1aeb"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d83bee3d-bbb3-475b-848d-75e37f94b7b3"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="d8e9d060-2307-4966-998e-99b44b555faf"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="e152db82-5600-46ed-be22-bd9af66e50d4"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="e416fde5-f569-4a18-94a5-8c115af28dfa"/>
       <column name="CAMPAIGNSTEP_ID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="e49b0fa7-dbd5-43d2-997b-322a1efa4580"/>
       <column name="CAMPAIGNSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="f0ece45a-0132-449f-a2bc-63511f481670"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="f34bb261-3b50-439e-bfeb-53067993434b"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="f6b57495-4fdc-44d3-ab08-524c85965493"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="f7ba637f-8361-4f04-a503-2654879887c5"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="fccb6945-6a16-4c63-862c-8bb2e7b2f246"/>
       <column name="CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="fe3bbdb5-63ce-4e25-b55e-eaa03066b190"/>
       <column name="CAMPAIGNSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="campaignparticipant">
       <column name="CAMPAIGNPARTICIPANTID" value="ffa48b3f-5566-48e4-843c-4b0542d27597"/>
       <column name="CAMPAIGNSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
index 55d609e113cfa43d2c4d013d5758a8e1f4cdd644..8f666897cd8ff96ba52ef7c8684416d2ec39e3af 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
@@ -1,59 +1,59 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="2600ead6-2b88-45da-9a64-a1a016886ea3">
+  <changeSet author="autogenerated" id="369a9d96-94c9-4067-83d9-da62eab9117b">
     <delete tableName="campaignparticipantlog"/>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="655e9fde-aa16-4d9d-968b-23567c023232"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="11bd8015-2a0a-4205-8bd1-400c9f7fbafd"/>
-      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
-      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
     </insert>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
       <column name="CAMPAIGN_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
     </insert>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="8257e0ed-d762-42b3-9ddd-b3acd59c955f"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="2a3411ce-ec3c-4d41-8337-bcabf173f580"/>
-      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
-      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
     </insert>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="98ff5478-5f88-4711-9223-3b7637c7b72a"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="28dba2e2-2650-4c2d-a019-87a0df11afb7"/>
-      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
-      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
     </insert>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="ac8b9ecf-197c-4917-84a2-89ed05b6f2b2"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="2d40c1c0-975c-4d40-b480-481576d5deb2"/>
-      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
-      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
     </insert>
     <insert tableName="campaignparticipantlog">
+      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="CAMPAIGNPARTICIPANTLOGID" value="f2a7688a-0def-4f8c-b7dd-7f00e7d5f2a3"/>
       <column name="CAMPAIGNPARTICIPANT_ID" value="2f961bb2-5800-44af-8579-02bb6c937b67"/>
-      <column name="CAMPAIGNSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
       <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
-      <column name="PREVIOUS_CAMPAIGNSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T09:13:56"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignstep.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignstep.xml
index ae0ae1dbbb10d980700280ac9c16ee2b18ff4beb..941fd17debb44c527bef9e43f65f7774b21033c5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignstep.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignstep.xml
@@ -1,193 +1,193 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="6cd5f2d8-a3ab-47e9-91c3-6169d20f4d10">
+  <changeSet author="autogenerated" id="016ccb66-e8d3-4e13-91ce-242a64612dda">
     <delete tableName="campaignstep"/>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="07609efc-170a-451e-907a-6f6b236e0a3c"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-09-30"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-23"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Telefonische Kontaktaufnahme"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
+      <column name="DATE_START" valueDate="2019-09-23"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="NAME" value="Telefonische Kontaktaufnahme"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-09-25"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-04"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Hinzugefügt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+      <column name="DATE_START" valueDate="2019-09-04"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="NAME" value="Hinzugefügt"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="2d89fd53-76e4-4dfa-8941-d0a80b040849"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="35"/>
       <column name="DATE_END" valueDate="2019-10-17"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-10-03"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="35"/>
-      <column name="NAME" value="Nachfassen"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="fd5d676b-94a3-441e-9b55-eceffc2a0b49"/>
+      <column name="DATE_START" valueDate="2019-10-03"/>
       <column name="SORTING" valueNumeric="3"/>
+      <column name="NAME" value="Nachfassen"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
       <column name="DATE_END" valueDate="2019-10-02"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-26"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
-      <column name="NAME" value="Einladung versandt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
+      <column name="DATE_START" valueDate="2019-09-26"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="NAME" value="Einladung versandt"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-09-25"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-04"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Hinzugefügt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+      <column name="DATE_START" valueDate="2019-09-04"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="NAME" value="Hinzugefügt"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="72ea7e64-d5bf-44eb-a523-3f2da411fe6d"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="35"/>
       <column name="DATE_END" valueDate="2019-10-28"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-10-18"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="35"/>
-      <column name="NAME" value="Teilnahme bestätigt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="2d89fd53-76e4-4dfa-8941-d0a80b040849"/>
+      <column name="DATE_START" valueDate="2019-10-18"/>
       <column name="SORTING" valueNumeric="4"/>
+      <column name="NAME" value="Teilnahme bestätigt"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="76295722-96f0-4992-a2d4-8defe962bf9a"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
       <column name="DATE_END" valueDate="2019-10-16"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-10-10"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
-      <column name="NAME" value="Teilnahme bestätigt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="67178f4b-600b-4b56-ae79-5c39ecba5593"/>
+      <column name="DATE_START" valueDate="2019-10-10"/>
       <column name="SORTING" valueNumeric="3"/>
+      <column name="NAME" value="Teilnahme bestätigt"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="963dc8b8-55e4-4e22-8162-a706dbeefa94"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-10-09"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-25"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Telefonisch Nachfassen"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
+      <column name="DATE_START" valueDate="2019-09-25"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="NAME" value="Telefonisch Nachfassen"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNPHONE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="96793400-415d-42a6-b4d1-a52d1b2c5baa"/>
-      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-09-23"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-02"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Hinzugefügt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+      <column name="DATE_START" valueDate="2019-09-02"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="NAME" value="Hinzugefügt"/>
+      <column name="CAMPAIGN_ID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="a91a8a7c-1547-4707-a7aa-cc0ce7056ebe"/>
-      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="15"/>
       <column name="DATE_END" valueDate="2019-10-17"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-10-10"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="15"/>
-      <column name="NAME" value="Bestätigung zugesandt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="963dc8b8-55e4-4e22-8162-a706dbeefa94"/>
+      <column name="DATE_START" valueDate="2019-10-10"/>
       <column name="SORTING" valueNumeric="3"/>
+      <column name="NAME" value="Bestätigung zugesandt"/>
+      <column name="CAMPAIGN_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="caf3aad7-9f9a-44de-abd1-129cd00363cf"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
       <column name="DATE_END" valueDate="2019-09-25"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-04"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="100"/>
-      <column name="NAME" value="Hinzugefügt"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+      <column name="DATE_START" valueDate="2019-09-04"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="NAME" value="Hinzugefügt"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="fbfcf9a2-66b3-404f-a5e6-beef285ceb83"/>
-      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
       <column name="DATE_END" valueDate="2019-10-22"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-10-20"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
-      <column name="NAME" value="Teilgenommen"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="76295722-96f0-4992-a2d4-8defe962bf9a"/>
+      <column name="DATE_START" valueDate="2019-10-20"/>
       <column name="SORTING" valueNumeric="4"/>
+      <column name="NAME" value="Teilgenommen"/>
+      <column name="CAMPAIGN_ID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="campaignstep">
       <column name="CAMPAIGNSTEPID" value="fd5d676b-94a3-441e-9b55-eceffc2a0b49"/>
-      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
+      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
       <column name="DATE_END" valueDate="2019-10-02"/>
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
-      <column name="DATE_START" valueDate="2019-09-25"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
       <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="MAXPARTICIPANTS" valueNumeric="50"/>
-      <column name="NAME" value="E-Mail Einladung aussenden"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
       <column name="PREDECESSORSTEP_ID" value="72bc62eb-41b1-49e5-93b7-28afd8b59416"/>
+      <column name="DATE_START" valueDate="2019-09-25"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="NAME" value="E-Mail Einladung aussenden"/>
+      <column name="CAMPAIGN_ID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="STATUS" value="OPEN"/>
-      <column name="STEPMEDIUM" value="CAMPAIGNEMAIL"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
index a083c7e957cff30050be004082832eeaf65e4886..a8fe8e687375d7e2b2c214668030e7c33d0a6a00 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classification.xml
@@ -1,1816 +1,1791 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="0104519d-ae16-488c-810e-82ed2360da0b">
+  <changeSet author="autogenerated" id="672a95af-b8ef-4555-b9e7-8edc920db771">
     <delete tableName="classification"/>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="028181fe-5687-4904-b7cb-c4a1befe7eed"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="0027e606-7932-4e40-9e20-43717b687a64"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="13771cd8-3694-4a44-8793-cd0fc3fb4b53"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="008ac315-31ab-4320-bf29-6681708eda88"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="13985a1a-1660-4a85-86c1-612bd62df8d7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="00c30050-c850-46b0-8e1d-d70f889655e3"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="166f3484-53a8-4c44-aad7-ef47a268ae71"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="421cdeeb-a5d6-4612-b47b-49db966de27f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
+      <column name="CLASSIFICATIONID" value="028181fe-5687-4904-b7cb-c4a1befe7eed"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="440d25a3-39c1-412e-90c7-c0a6366f0794"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONID" value="02f2f9a4-0d34-472a-b8b2-461fad057c4e"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="81d75e31-673b-426e-827f-c505b386ce0e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="0359b7b8-7526-4165-8b01-e90403b206eb"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c7b46dff-956a-47e1-8a7f-7d3f56c81da1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONID" value="03bb8bbb-0644-4376-99fb-b21fc2807f14"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1743c169-ef67-42b9-81af-99fc753d7a64"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="0423c091-7e65-43eb-9ab3-f5a847350845"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0a7ec07b-d429-4b0a-aebb-0a194e76428e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONID" value="045365c1-9561-4e4f-ad9b-9ce6ef0d0279"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b6d36680-909d-4470-9bf4-0a8b8a7807b1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONID" value="048a95bd-0a82-494d-b7fd-90f5d750f2c7"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="93f4dfdf-b07b-4dc5-91a3-7db80cc314fc"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="051e9f0f-fc99-4046-90b9-6cfb403844e9"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONID" value="0521dd6e-49ca-4a3a-9906-12e8359e3db9"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1180d429-0453-4b67-a805-7dc101e6ead2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONID" value="053f18d1-8fe2-4a79-978d-03cc37454ffe"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b38101bf-3d36-4509-9637-a428beb9999a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="058a9ef7-adca-4278-840a-720665fa3cd3"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c28d914e-ad91-4202-9fe6-0d0d41e53836"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="0759e286-007b-4568-b4d6-0542900d7ba1"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="085d5901-9ab4-4747-a758-660d952a7a2c"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0969044c-33eb-41eb-9aec-fa3795d8c49f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
       <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="0969044c-33eb-41eb-9aec-fa3795d8c49f"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6e187a9b-2e57-4da2-8132-9f576a28d6f7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONID" value="0a7ec07b-d429-4b0a-aebb-0a194e76428e"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4d67d40e-4656-46b0-b5a0-9c299c1ef9d3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="0f77577a-7a45-4c3f-be39-35ec364e8242"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="58642867-f8fc-45c1-a926-06306498a9c8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="CLASSIFICATIONID" value="0fcfa75f-9844-49d7-a088-56e570be4cd0"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6bbe5de0-4302-4467-9f3b-a0292485b214"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONID" value="1180d429-0453-4b67-a805-7dc101e6ead2"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1ec41224-e21c-4adf-8b7c-235eca10801c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONID" value="122116f6-e858-4605-af18-6c8b21da6455"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4164397b-a129-4e37-9586-af6e6133befd"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="12280a78-1bc8-411d-9556-57b6ea12343f"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
-
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6111dd76-4786-43bf-b6ce-74b36415ad03"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="1249cfe4-d2cd-42c2-9df8-93b8f6c1f272"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9cc46dc2-f40a-4c3b-aabd-c77858f5d770"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
+      <column name="CLASSIFICATIONID" value="13771cd8-3694-4a44-8793-cd0fc3fb4b53"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="045365c1-9561-4e4f-ad9b-9ce6ef0d0279"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONID" value="13985a1a-1660-4a85-86c1-612bd62df8d7"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="cd531b73-1390-498e-a83d-a50c964c24ea"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="13f634ef-70ba-440b-91af-e6324cdb20bb"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8f44739a-7103-4dd3-8f1f-25afbae07cd0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="14148c9a-8afb-42ad-a4c5-d1102241e9f8"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="02f2f9a4-0d34-472a-b8b2-461fad057c4e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="14f31249-544a-46f9-a2e4-c3bdcf3e49a3"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3f410195-bca5-41ac-a819-a8d29506f9e5"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="77a11bd3-a521-4701-b564-7f8b07000f0b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+      <column name="CLASSIFICATIONID" value="166f3484-53a8-4c44-aad7-ef47a268ae71"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9aa3789c-bc9d-43cf-a121-2575090c2dc4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
       <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="fbc32ea9-8350-463a-846e-71a30851f15a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3e9b7598-39a6-4ebc-aa49-8ec3a20f9eb4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="80beaf88-415d-49da-ae0b-c4d6528747a2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="053f18d1-8fe2-4a79-978d-03cc37454ffe"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="208c8324-e7f9-41b9-93ec-ac7e7f7262b7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="1743c169-ef67-42b9-81af-99fc753d7a64"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9f85a0f0-6576-4077-99fc-953d8ab53352"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="1897cf27-f472-4d25-88fe-64bd08915817"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c4dc8a62-edc1-4af6-b7c6-f91f6ab700c5"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="19cd3898-cb8e-4fa3-ade8-89cacb181b7d"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="122116f6-e858-4605-af18-6c8b21da6455"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="1a093afe-066e-4bbc-b6c9-b913ab8dfdc0"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3da8549a-762a-438f-9878-271c52943fd2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="1ac75382-0af9-42d2-8fe5-22295a93e8b3"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="28405f79-a635-4ede-8b11-11284c5e7190"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="1af00ea1-11fe-49d7-8a21-29bee4f31991"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="905cae71-9e4b-48f2-9de3-fcb8607d01a1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="1dc7de76-80d9-4240-97ae-cab241301a68"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d33aeb65-0c28-48a1-9a81-105faa882a4c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="da44d022-9ea6-4fcb-9491-c5b7236c642f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONID" value="1ec41224-e21c-4adf-8b7c-235eca10801c"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
-
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3672003e-0624-4a51-bb15-48f93bbd4342"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="20092371-2723-45e2-aae0-3a697b1265fc"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a027bccd-c894-443e-bdde-f32ee0b88285"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="203fb867-ee2f-4c01-8fb5-8e49da32be64"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e10a5ecb-b0f3-4b08-a380-de1a04fbc87f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b7d6e658-96b3-4664-b7db-139b73add7e3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6382b5d7-06a3-4584-8314-e00abdd8e8e9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="94a83ec1-8e6d-4c1b-90a0-54eeac52277b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONID" value="208c8324-e7f9-41b9-93ec-ac7e7f7262b7"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6017fea2-7e31-4220-86f4-cf72123af805"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="218f1794-26e6-45f2-a26d-98185a49bf4f"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="dfaec9c0-d9fa-4362-a955-341addc3a76d"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="22429945-9c82-493c-a0a6-ff31ecaa4b56"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a28dd724-cd0b-48f4-afd5-840ddc611026"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="2314864a-76f7-4fe9-a01f-c5be6ba0669e"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="25bfa0ce-433a-4bb9-992c-df66b02a76da"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b06e62a0-53b0-4046-b024-b00293e632f2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+      <column name="CLASSIFICATIONID" value="25bfa0ce-433a-4bb9-992c-df66b02a76da"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="58671a19-6522-46e6-93ba-8f62bf580048"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2a9353ec-78c3-42ae-836f-dcec0a4cfaad"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="2800c5de-2174-46fb-a50a-d5ae4a28c28d"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2abfbf1f-8f2c-4713-a61b-13ba593d1055"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
+      <column name="CLASSIFICATIONID" value="28405f79-a635-4ede-8b11-11284c5e7190"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a3e22367-c33f-4f2c-ad0c-8f9eb6ab572a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="289cea03-2c65-4557-b0f9-0dd29b26cecc"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="297cc1a1-1813-4f30-ad70-b452292c3371"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
       <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0521dd6e-49ca-4a3a-9906-12e8359e3db9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="297cc1a1-1813-4f30-ad70-b452292c3371"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0fcfa75f-9844-49d7-a088-56e570be4cd0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="08764209-9b5e-4893-96d0-e2a347bccf60"/>
+      <column name="CLASSIFICATIONID" value="2a447c40-23b0-4e45-b932-067c08515da0"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9452b219-64af-4c27-8f35-0ba81210abf3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4e96b522-209b-48ca-b04d-f328416aacdd"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONID" value="2a9353ec-78c3-42ae-836f-dcec0a4cfaad"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f47c0ea2-3a6d-4d7b-8f89-bb2d9799fd0e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e90c4086-db5f-4099-ba26-67799eb25e44"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONID" value="2abfbf1f-8f2c-4713-a61b-13ba593d1055"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="35b79ed1-7002-44f1-af61-891cdf863ac9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8502a2c8-fb7e-44f2-91cb-3d44d2d50d98"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="2b0e75e0-0a36-4397-988d-2ae60e5d2658"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8c133476-7e1a-4120-8127-b45228bd5403"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="2c644b64-0404-4eac-841c-d8579ff25fa6"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="965bd86a-ad6d-4440-a7a3-e4bcf1b0a505"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONID" value="2e3d4c1e-24b2-4362-bee9-b11fa9847d42"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0027e606-7932-4e40-9e20-43717b687a64"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
       <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="3056c0b4-5e4b-4580-ab89-75ac80920415"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2a447c40-23b0-4e45-b932-067c08515da0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="319dec0d-5ed5-40f8-8c98-b912582a8817"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d5db188e-4e30-4179-8c3a-339bc16fa2ab"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="31a22039-ac7d-4bb9-9f36-d1f91c6c4052"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6685c781-a87d-4102-8764-27f0fcb0dc60"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="326d5aff-cb21-4bb6-9c32-7fcac48d175c"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9af237aa-daa0-4195-a301-a815497a75b6"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="55569485-c1f8-4bef-9e94-2b64c9b6bd4e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="32b4f1b2-6cc2-4702-a9e0-0a75184c5698"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2800c5de-2174-46fb-a50a-d5ae4a28c28d"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="342c7c38-ca79-4e46-9677-5da074ceb60b"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="12280a78-1bc8-411d-9556-57b6ea12343f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c9208276-8f53-424d-821b-e37f041f864a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONID" value="3561883e-bec9-4be7-8f0f-985ca694ff04"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="19cd3898-cb8e-4fa3-ade8-89cacb181b7d"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="359fddf8-baae-497f-8ad6-d2cab1438473"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="085d5901-9ab4-4747-a758-660d952a7a2c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONID" value="35b79ed1-7002-44f1-af61-891cdf863ac9"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="fcdedb8a-a863-47a8-93af-379c451fedb0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+      <column name="CLASSIFICATIONID" value="3672003e-0624-4a51-bb15-48f93bbd4342"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+    </insert>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="36b1ed8c-a4d4-4203-aa20-52cf10f8d8a0"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="971cee9d-9b1f-4b57-9635-9bbfdb792958"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="3807eda2-aa0f-4caf-b3ab-0ff341eb887b"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="39dc9940-eb00-4ed5-82ec-521f5cc62239"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="39dc9940-eb00-4ed5-82ec-521f5cc62239"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
-    
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f7f7022f-57a2-4944-a9d3-e092e1be43b3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="CLASSIFICATIONID" value="3cc8a674-7934-4b8f-b200-bd19ddcb4689"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6dadd578-7e24-41cd-ab27-7baa29e4691b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="7e569319-5885-452e-9331-a507f3365236"/>
+      <column name="CLASSIFICATIONID" value="3da8549a-762a-438f-9878-271c52943fd2"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="008ac315-31ab-4320-bf29-6681708eda88"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONID" value="3e9b7598-39a6-4ebc-aa49-8ec3a20f9eb4"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="568cebf1-2494-44e0-9eb8-91bbcf1189eb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONID" value="3f410195-bca5-41ac-a819-a8d29506f9e5"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d3932d83-8afe-47ff-aff9-7d23bd443669"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONID" value="4164397b-a129-4e37-9586-af6e6133befd"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e567dc3e-fb98-4b17-b503-499497b691a6"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="421cdeeb-a5d6-4612-b47b-49db966de27f"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5f0cdce4-81b4-4c05-9011-4d76bdc21b65"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONID" value="440d25a3-39c1-412e-90c7-c0a6366f0794"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1af00ea1-11fe-49d7-8a21-29bee4f31991"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="4444b22f-02d1-4e8f-9073-82d61eba18e0"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f724bcdf-ac46-4296-be41-2febc7747ce1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="445ccf23-4d44-489a-8054-b46194e104e7"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
-    
-      <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="79cc0205-25f8-44a9-b682-a31df2068e3f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONID" value="46065d3f-a811-430d-8fa2-e048aee894c7"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f7118dce-dac9-4821-a709-bb7e9db8170a"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="CLASSIFICATIONID" value="4a61a0fe-394e-4b2f-897a-092fc2c109b2"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="CLASSIFICATIONID" value="4d67d40e-4656-46b0-b5a0-9c299c1ef9d3"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="4e21e953-7146-43dd-a888-92d9f55f561e"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="4e96b522-209b-48ca-b04d-f328416aacdd"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+    </insert>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="522566b0-6eca-40bb-977c-c9a26f730890"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3561883e-bec9-4be7-8f0f-985ca694ff04"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="52c6bccc-1055-48dc-ad5d-311e80a12d2a"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="98d2e3c1-f308-4a7a-a12f-4d24b45d4db9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONID" value="55401dae-a111-4e69-9c26-21fa9badd973"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="bb5ee550-320f-491a-a48f-b1ecf41ef90c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="9ac96400-9c47-4d4f-be5b-e053f92a54ce"/>
+      <column name="CLASSIFICATIONID" value="55569485-c1f8-4bef-9e94-2b64c9b6bd4e"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0759e286-007b-4568-b4d6-0542900d7ba1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="555a280b-a2e4-4eb5-bbec-87bca3987395"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="94bbfbe5-136f-40f2-af1f-8a47e1414a8c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONID" value="568cebf1-2494-44e0-9eb8-91bbcf1189eb"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="84ca4de3-ba44-40b4-8727-c5e23861c2c9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="57a2e5d3-0aa9-48a1-89f8-2db8967ffed6"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="efe87026-b813-4bb7-a3c8-4ef72e2076b8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONID" value="58642867-f8fc-45c1-a926-06306498a9c8"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e14fd7cc-abca-4296-bbd6-d9605d1e6f00"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONID" value="58671a19-6522-46e6-93ba-8f62bf580048"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="597de33c-b223-4d55-bed7-aeb1d161fc2e"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="ddb5083d-9410-4b9c-82a4-496370b868e3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="5a5e780b-01af-4a0f-bcd6-74c0c588210a"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4a61a0fe-394e-4b2f-897a-092fc2c109b2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONID" value="5bb5e000-5bba-4895-a5b8-374c2c5bd3a4"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="55401dae-a111-4e69-9c26-21fa9badd973"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="5bb7b949-cc0b-4724-a5e9-37bfcfe55813"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6048f088-dde7-4134-a101-f5e8f8b70cf5"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
       <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="5c1b2604-da33-4268-8400-5fb4b23c436b"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="ccaea5d2-64c3-4255-9825-c91784ba5f54"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="5ce0c1b0-c040-462e-bd19-c8e109449b8e"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="048a95bd-0a82-494d-b7fd-90f5d750f2c7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="5dd419ab-971f-42fd-9bb6-2247a6b4175b"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8fbd5ec4-bb9a-4c33-aa8d-73185d4b0746"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="5f0cdce4-81b4-4c05-9011-4d76bdc21b65"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1249cfe4-d2cd-42c2-9df8-93b8f6c1f272"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONID" value="6017fea2-7e31-4220-86f4-cf72123af805"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2e3d4c1e-24b2-4362-bee9-b11fa9847d42"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="6048f088-dde7-4134-a101-f5e8f8b70cf5"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8b59888b-ba5c-4a77-b06d-d522037fe3b3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONID" value="6111dd76-4786-43bf-b6ce-74b36415ad03"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="bc4a31b1-f2e2-4caf-8dcd-ac754c1d7290"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="62b9dacc-7d6f-4e05-81f8-6a425e369489"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="813a990d-a17a-4481-a49d-7fb3a9c6513a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="62cc115a-f80e-4a0f-899e-8060e9ed575e"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d6bf1068-83a5-4bcc-9d97-2efc72cc57a8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="6382b5d7-06a3-4584-8314-e00abdd8e8e9"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="65f45f0d-ab41-4a83-b5f7-795dc21d0fd4"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c5d4a548-7a5a-4695-b746-526ef41f5035"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="6685c781-a87d-4102-8764-27f0fcb0dc60"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1897cf27-f472-4d25-88fe-64bd08915817"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="6800e69f-33b1-44ae-b3a2-d7362bfddbf8"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="75fd708e-78a9-442f-8ddb-913b8fd29cdf"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="688cdc0d-d1a7-46ad-95c3-7503c054ee2c"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5bb7b949-cc0b-4724-a5e9-37bfcfe55813"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="6a6dfe13-6fcc-4ae9-b12b-dced4a55daef"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3cc8a674-7934-4b8f-b200-bd19ddcb4689"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="6bbe5de0-4302-4467-9f3b-a0292485b214"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="6d3464fa-eadd-4afd-b4e1-3031726770d5"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="57a2e5d3-0aa9-48a1-89f8-2db8967ffed6"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="6dadd578-7e24-41cd-ab27-7baa29e4691b"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a3081728-77d9-4c92-96b5-6fa21659a33f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
+      <column name="CLASSIFICATIONID" value="6e187a9b-2e57-4da2-8132-9f576a28d6f7"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="342c7c38-ca79-4e46-9677-5da074ceb60b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONID" value="717dfb2c-2e2c-46c8-b72c-8d81e61b94c1"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a3e2d764-bd51-4f06-a0a0-0e5f4b37d41b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="740bcc4c-b621-458e-874e-034cf70965bc"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f7504a50-2748-434a-ae08-cff2f4f8035a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="75fd708e-78a9-442f-8ddb-913b8fd29cdf"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="cea579d4-35fa-4376-b791-8b91cbe05d3a"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="76990230-73ec-4026-8a28-871ac5b4edc6"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    </insert>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="77941d3d-e876-44b3-b824-3a075d7dd398"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c6fe5361-777d-4047-99dd-e8495ebb8c73"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONID" value="77a11bd3-a521-4701-b564-7f8b07000f0b"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="77f0f0bd-eaca-44ef-abfa-9156eac6eb7e"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="aa291e2a-646d-4b73-b826-85bd357fd5c0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="7884869d-85ab-458f-9078-e2dd7234be91"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d70e23a7-bc3c-43ae-8b2c-44d85fc7a2d3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONID" value="79cc0205-25f8-44a9-b682-a31df2068e3f"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4e21e953-7146-43dd-a888-92d9f55f561e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="7d131f29-0430-44ad-b4ec-7044a67e0e3b"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a63b089c-f856-4513-8691-57422e400dc4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONID" value="80beaf88-415d-49da-ae0b-c4d6528747a2"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="813a990d-a17a-4481-a49d-7fb3a9c6513a"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONID" value="81d75e31-673b-426e-827f-c505b386ce0e"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9772b8f6-08c6-40aa-af16-df68bcecb77f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="81deaf11-9f63-4cc8-b83c-8711f5e3f734"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="83537aae-14a3-499f-a94b-9c630745110b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
       <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a1591490-e7c3-46b1-8d7e-843acbe93b41"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="83537aae-14a3-499f-a94b-9c630745110b"/>
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="76990230-73ec-4026-8a28-871ac5b4edc6"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="83d2e0f5-b7f5-4305-8da7-69e27da99f98"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="326d5aff-cb21-4bb6-9c32-7fcac48d175c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="84ca4de3-ba44-40b4-8727-c5e23861c2c9"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8d830242-7eb6-4185-b1cc-3e7977e6c340"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="8502a2c8-fb7e-44f2-91cb-3d44d2d50d98"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
-    
-  <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a5ce852a-83e6-4b0e-b3fa-310ea99c7e87"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+    <insert tableName="classification">
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONID" value="85b54389-50f9-4bd3-838b-d3941bda2cc1"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="fc10831b-65ea-4ecb-b52e-98c6f54b2a9a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="8b59888b-ba5c-4a77-b06d-d522037fe3b3"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="058a9ef7-adca-4278-840a-720665fa3cd3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="8c133476-7e1a-4120-8127-b45228bd5403"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f11eeaac-645d-416e-a50d-259f6ead0c30"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="8c792586-2d2d-41a3-933b-6f679dd4011e"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="cb7df4e3-e15c-4e65-92f4-ecd5cda09f95"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
       <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="8d830242-7eb6-4185-b1cc-3e7977e6c340"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="dccab9b9-5306-4325-896f-99646139b5ba"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="8f44739a-7103-4dd3-8f1f-25afbae07cd0"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="03bb8bbb-0644-4376-99fb-b21fc2807f14"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="8fbd5ec4-bb9a-4c33-aa8d-73185d4b0746"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5ce0c1b0-c040-462e-bd19-c8e109449b8e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="905cae71-9e4b-48f2-9de3-fcb8607d01a1"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a728d498-dd75-4b96-a5e5-cbdccd10b0b2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="91cd0603-ac46-420b-81d4-0e1c72a916bf"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b923621f-e48e-4a77-9f67-f63f5a0b0fbb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="9260ed8f-3b4a-4c5a-9077-0fe59105883b"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9c457191-c7c7-4a4f-bb91-8a48d27add92"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="9286af56-8942-4e30-8ed3-cde6bf2e77d5"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d6d64590-9299-4348-8e21-0cac9f84f51a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
+      <column name="CLASSIFICATIONID" value="93f4dfdf-b07b-4dc5-91a3-7db80cc314fc"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="da16c6c0-3bdf-4af5-b810-e85babe83e69"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONID" value="9452b219-64af-4c27-8f35-0ba81210abf3"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9fcf5382-f070-4698-a011-748c8584733b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="94a737b7-d4f6-4a13-b06b-05a225d9225b"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a0120295-79d1-429f-aef4-b9cce9c92de2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONID" value="94a83ec1-8e6d-4c1b-90a0-54eeac52277b"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="8c792586-2d2d-41a3-933b-6f679dd4011e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="CLASSIFICATIONID" value="94bbfbe5-136f-40f2-af1f-8a47e1414a8c"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="7d131f29-0430-44ad-b4ec-7044a67e0e3b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="95f0f027-799b-48fd-b1b5-49f70760a008"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5c1b2604-da33-4268-8400-5fb4b23c436b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="965bd86a-ad6d-4440-a7a3-e4bcf1b0a505"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="971cee9d-9b1f-4b57-9635-9bbfdb792958"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f25ef82a-6466-49c7-aa35-1f4d750218ca"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONID" value="9772b8f6-08c6-40aa-af16-df68bcecb77f"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="fd0fea13-2322-4664-bf15-8026a91bebd2"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="CLASSIFICATIONID" value="98d2e3c1-f308-4a7a-a12f-4d24b45d4db9"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a7b9862c-6a25-4bbc-92ec-7bfb25cdb6c0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="9aa3789c-bc9d-43cf-a121-2575090c2dc4"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="9af237aa-daa0-4195-a301-a815497a75b6"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="eba1581a-1235-4139-a33a-687513436777"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="9c457191-c7c7-4a4f-bb91-8a48d27add92"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c61069c1-fe41-4585-9d75-cef27d534ceb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONID" value="9cc46dc2-f40a-4c3b-aabd-c77858f5d770"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONID" value="9ea74c40-7732-4d0a-a489-f50bc60caf8b"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="81deaf11-9f63-4cc8-b83c-8711f5e3f734"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONID" value="9ec7bc3e-dc4c-40e4-bcee-bd59ab949d42"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a7d7fd5c-624c-4d64-929b-2b0eb146ab9d"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="9f5975c7-3df6-4fa4-87e4-7a1c0dbd967c"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d3b5f0ad-1a66-4eee-a40d-36daf317d510"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONID" value="9f85a0f0-6576-4077-99fc-953d8ab53352"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="597de33c-b223-4d55-bed7-aeb1d161fc2e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="9fcf5382-f070-4698-a011-748c8584733b"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6d3464fa-eadd-4afd-b4e1-3031726770d5"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="a0120295-79d1-429f-aef4-b9cce9c92de2"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1ac75382-0af9-42d2-8fe5-22295a93e8b3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
+      <column name="CLASSIFICATIONID" value="a027bccd-c894-443e-bdde-f32ee0b88285"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="522566b0-6eca-40bb-977c-c9a26f730890"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="a03201a8-0858-45e0-a0e2-9b70f5a35061"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="caaa6b4e-34e3-4337-b65f-abe761a8c24c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="a1591490-e7c3-46b1-8d7e-843acbe93b41"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e4d83d98-fcf8-402e-9d81-17f374654df7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
+      <column name="CLASSIFICATIONID" value="a28dd724-cd0b-48f4-afd5-840ddc611026"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="62b9dacc-7d6f-4e05-81f8-6a425e369489"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="a3081728-77d9-4c92-96b5-6fa21659a33f"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="77941d3d-e876-44b3-b824-3a075d7dd398"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONID" value="a3e22367-c33f-4f2c-ad0c-8f9eb6ab572a"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a03201a8-0858-45e0-a0e2-9b70f5a35061"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="a3e2d764-bd51-4f06-a0a0-0e5f4b37d41b"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3056c0b4-5e4b-4580-ab89-75ac80920415"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
       <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="a51c9515-80bc-4902-8d9b-115179ab40df"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="00c30050-c850-46b0-8e1d-d70f889655e3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="a5ce852a-83e6-4b0e-b3fa-310ea99c7e87"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="4444b22f-02d1-4e8f-9073-82d61eba18e0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="a63b089c-f856-4513-8691-57422e400dc4"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f5e4ebc2-e0a7-4ab0-b7e1-dc43c2913135"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="a653069f-927d-425a-8956-aeb15a2c4bc8"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b6ed4614-ea3d-4b2d-a9c3-44d146724b71"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="a69faa8d-afaa-40cd-97e6-65a851f5dde1"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e7a7da18-7283-4d75-ab9f-06f62972293c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="a728d498-dd75-4b96-a5e5-cbdccd10b0b2"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d6443737-e23b-42fa-81a8-d5e86636fb79"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="a76fcafb-a84d-4505-8c68-1b221482e292"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="94a737b7-d4f6-4a13-b06b-05a225d9225b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="a7b9862c-6a25-4bbc-92ec-7bfb25cdb6c0"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="319dec0d-5ed5-40f8-8c98-b912582a8817"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="a7d7fd5c-624c-4d64-929b-2b0eb146ab9d"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="22429945-9c82-493c-a0a6-ff31ecaa4b56"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a898ffe5-96ec-4eef-9e0c-6a2622fc74fc"/>
       <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="CLASSIFICATIONID" value="a898ffe5-96ec-4eef-9e0c-6a2622fc74fc"/>
       <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0f77577a-7a45-4c3f-be39-35ec364e8242"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="a8c2d3c5-423f-45fa-a8db-cd2ab59c5045"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="cf051c11-5f8e-401c-8e57-aabc55496eb8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="aa291e2a-646d-4b73-b826-85bd357fd5c0"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d18a0dec-5161-488d-958d-3d9ea88f32f3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="ac0944d2-b184-45f5-983a-6c873aadfb8e"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0359b7b8-7526-4165-8b01-e90403b206eb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+      <column name="CLASSIFICATIONID" value="b06e62a0-53b0-4046-b024-b00293e632f2"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="91cd0603-ac46-420b-81d4-0e1c72a916bf"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="b1cb759c-f17c-4277-bee1-e50717d8934a"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="62cc115a-f80e-4a0f-899e-8060e9ed575e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
+      <column name="CLASSIFICATIONID" value="b38101bf-3d36-4509-9637-a428beb9999a"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="31a22039-ac7d-4bb9-9f36-d1f91c6c4052"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="b3846b7c-e70a-43fe-9637-ea74ed1fe0d7"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="289cea03-2c65-4557-b0f9-0dd29b26cecc"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="b49911f5-fccc-4dba-a46a-32fd56cf8b8f"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="e27e1f4b-bca2-4928-9652-950762723531"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONID" value="b6d36680-909d-4470-9bf4-0a8b8a7807b1"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="95f0f027-799b-48fd-b1b5-49f70760a008"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="b6ed4614-ea3d-4b2d-a9c3-44d146724b71"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="52c6bccc-1055-48dc-ad5d-311e80a12d2a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
+      <column name="CLASSIFICATIONID" value="b7d6e658-96b3-4664-b7db-139b73add7e3"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5dd419ab-971f-42fd-9bb6-2247a6b4175b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="b828dfb2-943a-4f81-b950-fbe4db3d19b7"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="beb7f0ec-3331-49f9-b440-0099f62205c0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="b923621f-e48e-4a77-9f67-f63f5a0b0fbb"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="359fddf8-baae-497f-8ad6-d2cab1438473"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="bb5ee550-320f-491a-a48f-b1ecf41ef90c"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2314864a-76f7-4fe9-a01f-c5be6ba0669e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="bc4a31b1-f2e2-4caf-8dcd-ac754c1d7290"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="203fb867-ee2f-4c01-8fb5-8e49da32be64"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="bc61586b-a63e-4d69-82ad-62b02ea2b28a"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a51c9515-80bc-4902-8d9b-115179ab40df"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="beb7f0ec-3331-49f9-b440-0099f62205c0"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9260ed8f-3b4a-4c5a-9077-0fe59105883b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="c179fe12-4bb0-495d-99d0-0159d0466bc0"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1a093afe-066e-4bbc-b6c9-b913ab8dfdc0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONID" value="c28d914e-ad91-4202-9fe6-0d0d41e53836"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="bc61586b-a63e-4d69-82ad-62b02ea2b28a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
+      <column name="CLASSIFICATIONID" value="c4dc8a62-edc1-4af6-b7c6-f91f6ab700c5"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="c58b5e5a-b4fe-4dec-a93d-79848e564b87"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="051e9f0f-fc99-4046-90b9-6cfb403844e9"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="c5d4a548-7a5a-4695-b746-526ef41f5035"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="32b4f1b2-6cc2-4702-a9e0-0a75184c5698"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
       <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="c61069c1-fe41-4585-9d75-cef27d534ceb"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f5dd89ed-f6ae-4676-aa83-906211570a5b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="CLASSIFICATIONID" value="c6fe5361-777d-4047-99dd-e8495ebb8c73"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b3846b7c-e70a-43fe-9637-ea74ed1fe0d7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONID" value="c7b46dff-956a-47e1-8a7f-7d3f56c81da1"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f60f8fe8-5ee9-43b4-a0cd-50b0f354bf79"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONID" value="c9208276-8f53-424d-821b-e37f041f864a"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="83d2e0f5-b7f5-4305-8da7-69e27da99f98"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="caaa6b4e-34e3-4337-b65f-abe761a8c24c"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="717dfb2c-2e2c-46c8-b72c-8d81e61b94c1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="cb7df4e3-e15c-4e65-92f4-ecd5cda09f95"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="0423c091-7e65-43eb-9ab3-f5a847350845"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="ccaea5d2-64c3-4255-9825-c91784ba5f54"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d9cce938-36d9-4a80-9bc2-9e37e6ed64ce"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
+      <column name="CLASSIFICATIONID" value="cd531b73-1390-498e-a83d-a50c964c24ea"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9ec7bc3e-dc4c-40e4-bcee-bd59ab949d42"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="cea579d4-35fa-4376-b791-8b91cbe05d3a"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="14f31249-544a-46f9-a2e4-c3bdcf3e49a3"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="cf051c11-5f8e-401c-8e57-aabc55496eb8"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="3807eda2-aa0f-4caf-b3ab-0ff341eb887b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="d03c3aa2-c97f-4bd4-b92f-7e09d594cdb8"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="36b1ed8c-a4d4-4203-aa20-52cf10f8d8a0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONID" value="d18a0dec-5161-488d-958d-3d9ea88f32f3"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d74914a9-05f6-4433-9121-87755b724fb4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
+      <column name="CLASSIFICATIONID" value="d33aeb65-0c28-48a1-9a81-105faa882a4c"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a69faa8d-afaa-40cd-97e6-65a851f5dde1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
       <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    
-    <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c179fe12-4bb0-495d-99d0-0159d0466bc0"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="d3932d83-8afe-47ff-aff9-7d23bd443669"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="ed2a3c86-814d-4212-a2da-5875d0d3c598"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="d3b5f0ad-1a66-4eee-a40d-36daf317d510"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="688cdc0d-d1a7-46ad-95c3-7503c054ee2c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
+      <column name="CLASSIFICATIONID" value="d5db188e-4e30-4179-8c3a-339bc16fa2ab"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="77f0f0bd-eaca-44ef-abfa-9156eac6eb7e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="d6443737-e23b-42fa-81a8-d5e86636fb79"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9f5975c7-3df6-4fa4-87e4-7a1c0dbd967c"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="CLASSIFICATIONID" value="d6bf1068-83a5-4bcc-9d97-2efc72cc57a8"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="d03c3aa2-c97f-4bd4-b92f-7e09d594cdb8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="d6d64590-9299-4348-8e21-0cac9f84f51a"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6800e69f-33b1-44ae-b3a2-d7362bfddbf8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONID" value="d70e23a7-bc3c-43ae-8b2c-44d85fc7a2d3"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="218f1794-26e6-45f2-a26d-98185a49bf4f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="d74914a9-05f6-4433-9121-87755b724fb4"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="f738a3d6-b4e0-491e-8d51-a83ce039fbc8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="d9cce938-36d9-4a80-9bc2-9e37e6ed64ce"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a653069f-927d-425a-8956-aeb15a2c4bc8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="da16c6c0-3bdf-4af5-b810-e85babe83e69"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a8c2d3c5-423f-45fa-a8db-cd2ab59c5045"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
+      <column name="CLASSIFICATIONID" value="da44d022-9ea6-4fcb-9491-c5b7236c642f"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="dccab9b9-5306-4325-896f-99646139b5ba"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="fa07168c-6aa5-4b9d-935e-6ece6e1c5bdb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="ddb5083d-9410-4b9c-82a4-496370b868e3"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="14148c9a-8afb-42ad-a4c5-d1102241e9f8"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONID" value="dfaec9c0-d9fa-4362-a955-341addc3a76d"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2b0e75e0-0a36-4397-988d-2ae60e5d2658"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
+      <column name="CLASSIFICATIONID" value="e10a5ecb-b0f3-4b08-a380-de1a04fbc87f"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="CLASSIFICATIONID" value="e14fd7cc-abca-4296-bbd6-d9605d1e6f00"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b828dfb2-943a-4f81-b950-fbe4db3d19b7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="CLASSIFICATIONID" value="e27e1f4b-bca2-4928-9652-950762723531"/>
+      <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5a5e780b-01af-4a0f-bcd6-74c0c588210a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="e4d83d98-fcf8-402e-9d81-17f374654df7"/>
+      <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="1dc7de76-80d9-4240-97ae-cab241301a68"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="e567dc3e-fb98-4b17-b503-499497b691a6"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="a76fcafb-a84d-4505-8c68-1b221482e292"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="e7a7da18-7283-4d75-ab9f-06f62972293c"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9ea74c40-7732-4d0a-a489-f50bc60caf8b"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
+      <column name="CLASSIFICATIONID" value="e90c4086-db5f-4099-ba26-67799eb25e44"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="CLASSIFICATIONID" value="eba1581a-1235-4139-a33a-687513436777"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="2c644b64-0404-4eac-841c-d8579ff25fa6"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
       <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="ed2a3c86-814d-4212-a2da-5875d0d3c598"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="ac0944d2-b184-45f5-983a-6c873aadfb8e"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="CLASSIFICATIONID" value="efe87026-b813-4bb7-a3c8-4ef72e2076b8"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="5bb5e000-5bba-4895-a5b8-374c2c5bd3a4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="CLASSIFICATIONID" value="f11eeaac-645d-416e-a50d-259f6ead0c30"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b49911f5-fccc-4dba-a46a-32fd56cf8b8f"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="CLASSIFICATIONID" value="f25ef82a-6466-49c7-aa35-1f4d750218ca"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+    </insert>
+    <insert tableName="classification">
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONID" value="f47c0ea2-3a6d-4d7b-8f89-bb2d9799fd0e"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="65f45f0d-ab41-4a83-b5f7-795dc21d0fd4"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="CLASSIFICATIONID" value="f5dd89ed-f6ae-4676-aa83-906211570a5b"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="13f634ef-70ba-440b-91af-e6324cdb20bb"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="f5e4ebc2-e0a7-4ab0-b7e1-dc43c2913135"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="555a280b-a2e4-4eb5-bbec-87bca3987395"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
       <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="f60f8fe8-5ee9-43b4-a0cd-50b0f354bf79"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="c58b5e5a-b4fe-4dec-a93d-79848e564b87"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="f7118dce-dac9-4821-a709-bb7e9db8170a"/>
+      <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
     </insert>
-    
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="85b54389-50f9-4bd3-838b-d3941bda2cc1"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="CLASSIFICATIONID" value="f724bcdf-ac46-4296-be41-2febc7747ce1"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="9286af56-8942-4e30-8ed3-cde6bf2e77d5"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="CLASSIFICATIONID" value="f738a3d6-b4e0-491e-8d51-a83ce039fbc8"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="445ccf23-4d44-489a-8054-b46194e104e7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="CLASSIFICATIONID" value="f7504a50-2748-434a-ae08-cff2f4f8035a"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="46065d3f-a811-430d-8fa2-e048aee894c7"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+      <column name="CLASSIFICATIONID" value="f7f7022f-57a2-4944-a9d3-e092e1be43b3"/>
+      <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="7884869d-85ab-458f-9078-e2dd7234be91"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="CLASSIFICATIONID" value="fa07168c-6aa5-4b9d-935e-6ece6e1c5bdb"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="6a6dfe13-6fcc-4ae9-b12b-dced4a55daef"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
+      <column name="CLASSIFICATIONID" value="fbc32ea9-8350-463a-846e-71a30851f15a"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="740bcc4c-b621-458e-874e-034cf70965bc"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="fc10831b-65ea-4ecb-b52e-98c6f54b2a9a"/>
+      <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="20092371-2723-45e2-aae0-3a697b1265fc"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="CLASSIFICATIONID" value="fcdedb8a-a863-47a8-93af-379c451fedb0"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="classification">
-      <column name="CLASSIFICATIONID" value="b1cb759c-f17c-4277-bee1-e50717d8934a"/>
-      <column name="CLASSIFICATIONSCORE_ID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONSCORE_ID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="CLASSIFICATIONID" value="fd0fea13-2322-4664-bf15-8026a91bebd2"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
index ad66344241be6327710070a36e7995a24f0e6ca2..26547da7c1327d6c34e880031f19fb618cffc4c5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgrading.xml
@@ -1,127 +1,126 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="2365bd93-fb40-4701-b3c2-4c7fd483261">
+  <changeSet author="autogenerated" id="93e9cf02-abc4-4e98-9717-c63f1785124c">
     <delete tableName="classificationgrading"/>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="68dd4d91-d472-477d-935c-70cbe5606c51"/>
-      <column name="GRADING" value="A"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONGRADINGID" value="03aa277d-873b-4913-9051-d44aa4f77627"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="9437f368-bea1-47f4-b76e-d6a391af438d"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONGRADINGID" value="14da2618-88be-425c-92c3-68d8584aa0bf"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="CLASSIFICATIONGRADINGID" value="29226adf-eb79-4696-a4b8-7be73c9488e6"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="348a2af8-ec01-4a58-8ff6-5e3a837852a4"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="CLASSIFICATIONGRADINGID" value="348a2af8-ec01-4a58-8ff6-5e3a837852a4"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="9a823957-0ca9-4972-95df-d894d4e4fc25"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONGRADINGID" value="4ef54a02-ddf8-4238-b9fd-f5a043032b7d"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="CLASSIFICATIONGRADINGID" value="5e46e499-00c2-4cc2-9f4c-952290484623"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="4ef54a02-ddf8-4238-b9fd-f5a043032b7d"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="GRADING" value="D"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
+      <column name="CLASSIFICATIONGRADINGID" value="5e5c3ffe-3fa6-41e3-8659-1b03e7e1a1cd"/>
+    </insert>
+    <insert tableName="classificationgrading">
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="CLASSIFICATIONGRADINGID" value="68dd4d91-d472-477d-935c-70cbe5606c51"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="748ef65c-af41-42d8-8ac4-480bc9390591"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="CLASSIFICATIONGRADINGID" value="748ef65c-af41-42d8-8ac4-480bc9390591"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="8e73dd97-4428-4316-882d-7b2af56330ef"/>
-      <column name="GRADING" value="C"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
       <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
-    </insert>
-    <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="76af9750-a714-4a35-bfd2-6eab3c316e5b"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
+      <column name="CLASSIFICATIONGRADINGID" value="76af9750-a714-4a35-bfd2-6eab3c316e5b"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="c021718f-b6ca-4d4d-87f7-e4450d103fe2"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
-    </insert>
-    <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="8f702450-83fc-4085-92c2-ac09f96dcd6b"/>
-      <column name="GRADING" value="B"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
-    </insert>
-    <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="14da2618-88be-425c-92c3-68d8584aa0bf"/>
-      <column name="GRADING" value="C"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="CLASSIFICATIONGRADINGID" value="7afd58ad-6eae-4d6b-8d4b-2ca4bdd177e6"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="5e5c3ffe-3fa6-41e3-8659-1b03e7e1a1cd"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
+      <column name="CLASSIFICATIONGRADINGID" value="8408ca43-a4dc-4767-8127-e52c08276815"/>
     </insert>
-    
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="5e46e499-00c2-4cc2-9f4c-952290484623"/>
-      <column name="GRADING" value="D"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
       <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="GRADING" value="C"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
+      <column name="CLASSIFICATIONGRADINGID" value="8c982beb-bc53-4bcf-8b76-7ee919bbf653"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="8c982beb-bc53-4bcf-8b76-7ee919bbf653"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
       <column name="GRADING" value="C"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="CLASSIFICATIONGRADINGID" value="8e73dd97-4428-4316-882d-7b2af56330ef"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="a89c81df-9380-41b1-9c7c-52d3a1862ac7"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="CLASSIFICATIONGRADINGID" value="8f702450-83fc-4085-92c2-ac09f96dcd6b"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="7afd58ad-6eae-4d6b-8d4b-2ca4bdd177e6"/>
-      <column name="GRADING" value="A"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
+      <column name="GRADING" value="B"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
+      <column name="CLASSIFICATIONGRADINGID" value="9437f368-bea1-47f4-b76e-d6a391af438d"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="8408ca43-a4dc-4767-8127-e52c08276815"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="GRADING" value="D"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="25"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-    </insert>
-    <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="03aa277d-873b-4913-9051-d44aa4f77627"/>
-      <column name="GRADING" value="C"/>
-      <column name="MAXGRADEFORSCORE" valueNumeric="50"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="CLASSIFICATIONGRADINGID" value="9a823957-0ca9-4972-95df-d894d4e4fc25"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="29226adf-eb79-4696-a4b8-7be73c9488e6"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
       <column name="GRADING" value="B"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="75"/>
-      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="CLASSIFICATIONGRADINGID" value="a89c81df-9380-41b1-9c7c-52d3a1862ac7"/>
     </insert>
     <insert tableName="classificationgrading">
-      <column name="CLASSIFICATIONGRADINGID" value="f8e1c5a4-b0d0-4b73-9700-11ff916adfdd"/>
+      <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="GRADING" value="A"/>
       <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONGRADINGID" value="c021718f-b6ca-4d4d-87f7-e4450d103fe2"/>
+    </insert>
+    <insert tableName="classificationgrading">
       <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="GRADING" value="A"/>
+      <column name="MAXGRADEFORSCORE" valueNumeric="100"/>
+      <column name="CLASSIFICATIONGRADINGID" value="f8e1c5a4-b0d0-4b73-9700-11ff916adfdd"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
index 73d7c48a4deb1285b92370ea121501217089f2d6..61598f100b31dec6e1458b4eac98496e5e050524 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationgroup.xml
@@ -1,31 +1,31 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
+  <changeSet author="autogenerated" id="284cc44f-516c-4f51-af74-66aa3b82e011">
     <delete tableName="classificationgroup"/>
     <insert tableName="classificationgroup">
       <column name="CLASSIFICATIONGROUPID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
-      <column name="TITLE" value="1. Classification"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="TITLE" value="1. Classification"/>
     </insert>
     <insert tableName="classificationgroup">
       <column name="CLASSIFICATIONGROUPID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
-      <column name="TITLE" value="2. Classification"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="TITLE" value="2. Classification"/>
     </insert>
     <insert tableName="classificationgroup">
       <column name="CLASSIFICATIONGROUPID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
-      <column name="TITLE" value="3. Classification"/>
       <column name="SORTING" valueNumeric="3"/>
+      <column name="TITLE" value="3. Classification"/>
     </insert>
     <insert tableName="classificationgroup">
       <column name="CLASSIFICATIONGROUPID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
-      <column name="TITLE" value="1. Target group"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="TITLE" value="1. Target group"/>
     </insert>
     <insert tableName="classificationgroup">
       <column name="CLASSIFICATIONGROUPID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-      <column name="TITLE" value="2. Customer value"/>
       <column name="SORTING" valueNumeric="2"/>
-    </insert> 
+      <column name="TITLE" value="2. Customer value"/>
+    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
index 69ade9eca1dc3ec054bef0ae3121314a9c234b2e..c5de6229ea80f6b1c90df74e02bfac79640d1135 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationscore.xml
@@ -1,722 +1,720 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="9a46a079-1622-40db-9d1c-38272b4c4ba0">
+  <changeSet author="autogenerated" id="f340e2da-d636-426a-8662-fa08a3b5f82c">
     <delete tableName="classificationscore"/>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="01840c9d-2856-4882-a12a-303e58fd9d30"/>
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="01840c9d-2856-4882-a12a-303e58fd9d30"/>
       <column name="SORT" valueNumeric="50"/>
       <column name="TITLE" value="Purchasing"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="0803779b-73d8-47b3-9705-f5771c01e6a3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="100-199 D€"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="0803779b-73d8-47b3-9705-f5771c01e6a3"/>
       <column name="SORT" valueNumeric="140"/>
       <column name="TITLE" value="Automotive"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="10419ecc-335b-43c3-a1e3-8ecfbeda6f2b"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="08764209-9b5e-4893-96d0-e2a347bccf60"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="09559e61-09ed-4f85-b0cb-fa7b0c66e488"/>
+      <column name="SORT" valueNumeric="150"/>
+      <column name="TITLE" value="Publishing house"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="0b671383-ecc3-440c-aff4-ff485da2755d"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="10419ecc-335b-43c3-a1e3-8ecfbeda6f2b"/>
       <column name="SORT" valueNumeric="60"/>
       <column name="TITLE" value="Project management"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="11418754-1667-437b-816b-adec4b9291f3"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="107c199b-b315-4093-add5-48c496794bc9"/>
+      <column name="SORT" valueNumeric="110"/>
+      <column name="TITLE" value="Lottery"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="11418754-1667-437b-816b-adec4b9291f3"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="No project planned"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="1bc2b2aa-2582-4b0c-a2f8-04125b82ba33"/>
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="1bc2b2aa-2582-4b0c-a2f8-04125b82ba33"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="Service"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
       <column name="SORT" valueNumeric="70"/>
       <column name="TITLE" value="Consultation"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="2a516661-537d-473e-864a-c2f721b96a42"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="206fd02f-68ec-42f2-83d1-92848f51dc1a"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Switzerland"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
+      <column name="SORT" valueNumeric="120"/>
+      <column name="TITLE" value="Education"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
+      <column name="SORT" valueNumeric="180"/>
+      <column name="TITLE" value="Service"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2745d6c3-fffb-4f72-8bc2-92439a14e919"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="Other"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="0-49 D€"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="2a516661-537d-473e-864a-c2f721b96a42"/>
       <column name="SORT" valueNumeric="180"/>
       <column name="TITLE" value="Service"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="2f3b6088-d78f-4fba-998d-b18a6b981485"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2cd8d11f-ee3f-429b-a16a-7839cf30b62d"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="51-100"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2f3b6088-d78f-4fba-998d-b18a6b981485"/>
       <column name="SORT" valueNumeric="170"/>
       <column name="TITLE" value="Environment"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
       <column name="SORT" valueNumeric="50"/>
       <column name="TITLE" value="0 to 49T"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Germany"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="3035e36e-ee6a-45d1-9d68-920cd3666362"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="3035e36e-ee6a-45d1-9d68-920cd3666362"/>
       <column name="SORT" valueNumeric="70"/>
       <column name="TITLE" value="Student/Internship"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
       <column name="SORT" valueNumeric="80"/>
       <column name="TITLE" value="Food"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
       <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
       <column name="SORT" valueNumeric="50"/>
       <column name="TITLE" value="0 to 49"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
       <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORE" valueNumeric="30.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="251 to 1,000"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
       <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="SCORE" valueNumeric="25.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Yes"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
       <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="SCORE" valueNumeric="12.50"/>
+      <column name="CLASSIFICATIONSCOREID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Standard"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Machinery and equipment"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="50.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
       <column name="SORT" valueNumeric="190"/>
       <column name="TITLE" value="Public"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="41300a6c-8dc7-4b5a-9fb1-cecd3d5cbb8c"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="41300a6c-8dc7-4b5a-9fb1-cecd3d5cbb8c"/>
       <column name="SORT" valueNumeric="160"/>
       <column name="TITLE" value="Electric"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="41d43723-7d19-4a7e-936a-df9013db7dfb"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="50.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="41d43723-7d19-4a7e-936a-df9013db7dfb"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Logistics"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Commodity group 1"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="7.50"/>
+      <column name="CLASSIFICATIONSCOREID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Sales"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="56a56ec0-34c1-419f-81c2-1c1310d685d2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
+      <column name="SORT" valueNumeric="130"/>
+      <column name="TITLE" value="Trade"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="0-50"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Negative"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="101-250"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="56a56ec0-34c1-419f-81c2-1c1310d685d2"/>
       <column name="SORT" valueNumeric="120"/>
       <column name="TITLE" value="Education"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="5ca391a5-9de8-41e6-9792-17cf8deaa7e7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="high"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="5ca391a5-9de8-41e6-9792-17cf8deaa7e7"/>
       <column name="SORT" valueNumeric="90"/>
       <column name="TITLE" value="Energy"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Logistics"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="SCORE" valueNumeric="25.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Individual"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
       <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORE" valueNumeric="30.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Choice"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="6632b510-7094-45d6-b7ef-946e759429a3"/>
+      <column name="SORT" valueNumeric="140"/>
+      <column name="TITLE" value="Automotive"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Management/Sales Manager"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="6d6653ae-024e-444c-aeae-561874d55569"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="6d6653ae-024e-444c-aeae-561874d55569"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="50 to 99T"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="6fe28489-2383-412b-9bbd-4f01a9421775"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="200-349 D€"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Other"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="7e569319-5885-452e-9331-a507f3365236"/>
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="7e569319-5885-452e-9331-a507f3365236"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Overarching"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="50-99 D€"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
+      <column name="SCORE" valueNumeric="0.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="low"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="35.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="8d7bc557-e020-42c9-83d9-ff84fcbd12b7"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Austria"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="101 to 250"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="9a3183db-8a38-4cf1-a234-3e2cf20a4f77"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="904e2dbe-49a1-42a0-a5db-0f274334dd7f"/>
+      <column name="SORT" valueNumeric="160"/>
+      <column name="TITLE" value="Electric"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="9181a683-dcab-47fc-af7b-e282505348d6"/>
+      <column name="SORT" valueNumeric="90"/>
+      <column name="TITLE" value="Energy"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="251-1000"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="92c8f126-b31e-4011-bbf0-cb5e57bfc3e5"/>
+      <column name="SORT" valueNumeric="60"/>
+      <column name="TITLE" value="Finance"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="9a3183db-8a38-4cf1-a234-3e2cf20a4f77"/>
+      <column name="SORT" valueNumeric="40"/>
+      <column name="TITLE" value="IT"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="9ac96400-9c47-4d4f-be5b-e053f92a54ce"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="IT"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
       <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="OnPremise"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="a0fcd2e2-40c8-40b8-8a5b-e591154c248a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="a0fcd2e2-40c8-40b8-8a5b-e591154c248a"/>
       <column name="SORT" valueNumeric="110"/>
       <column name="TITLE" value="Lottery"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORE" valueNumeric="7.50"/>
+      <column name="CLASSIFICATIONSCOREID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="Switzerland"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="a61e3451-296b-4812-a7b2-425963176f80"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="25.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Positive"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="a61e3451-296b-4812-a7b2-425963176f80"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Cloud"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="a7e70abc-4d98-467d-a475-66bbd101de1d"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="a7e70abc-4d98-467d-a475-66bbd101de1d"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Head of IT"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
       <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORE" valueNumeric="30.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="from 1,000"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORE" valueNumeric="30.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Within 6 months"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
+      <column name="SORT" valueNumeric="30"/>
+      <column name="TITLE" value="Commodity group 3"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+      <column name="SCORE" valueNumeric="35.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
+      <column name="SORT" valueNumeric="10"/>
+      <column name="TITLE" value="Germany"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORE" valueNumeric="30.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="200 to 349T"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="bf44ae05-a4c4-4ee9-ad6e-7d64474afeff"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="16.60"/>
+      <column name="CLASSIFICATIONSCOREID" value="bf44ae05-a4c4-4ee9-ad6e-7d64474afeff"/>
       <column name="SORT" valueNumeric="60"/>
       <column name="TITLE" value="Finance"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="Service Manager"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="No date yet"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="c6300eeb-0494-4eba-89b1-23afdbb397e9"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="c6300eeb-0494-4eba-89b1-23afdbb397e9"/>
       <column name="SORT" valueNumeric="150"/>
       <column name="TITLE" value="Publishing house"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="CRM Manager"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="d032f425-5739-4f0c-8103-e102fe0d3ccf"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+      <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="cddaf52d-37b7-426c-b858-c986e58544e6"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="Stagnated"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d032f425-5739-4f0c-8103-e102fe0d3ccf"/>
       <column name="SORT" valueNumeric="50"/>
       <column name="TITLE" value="Skilled workers"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d0f5c576-e1cd-463e-82d2-e09c46ccb2a0"/>
+      <column name="SORT" valueNumeric="20"/>
+      <column name="TITLE" value="medium"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d2a75f81-d0b3-48ce-be97-5e6add962cbb"/>
+      <column name="SORT" valueNumeric="70"/>
+      <column name="TITLE" value="Consultation"/>
+    </insert>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d578aa09-5d14-4ace-8cd0-572c5efcd82e"/>
+      <column name="SORT" valueNumeric="50"/>
+      <column name="TITLE" value="ab 1000"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORE" valueNumeric="15.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Rate"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="d7d807a2-8a97-4a0e-9d1c-fb8c7a703599"/>
       <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="d7d807a2-8a97-4a0e-9d1c-fb8c7a703599"/>
       <column name="SORT" valueNumeric="40"/>
       <column name="TITLE" value="50 to 100"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="e6ab210e-6a26-4a12-9d50-ff8bd392c590"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
+      <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="df7ea293-1fd6-4e98-ba3f-7d975fa8eaeb"/>
+      <column name="SORT" valueNumeric="170"/>
+      <column name="TITLE" value="Environment"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="e6ab210e-6a26-4a12-9d50-ff8bd392c590"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Search"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
       <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="SCORE" valueNumeric="12.50"/>
+      <column name="CLASSIFICATIONSCOREID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="No"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="e824d7e3-dfbe-4f34-a5c7-8f2226aade7e"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="e824d7e3-dfbe-4f34-a5c7-8f2226aade7e"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="100 to 199T"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="e8741cb0-9ada-48dd-89d1-f00a1a755c38"/>
       <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="e8741cb0-9ada-48dd-89d1-f00a1a755c38"/>
       <column name="SORT" valueNumeric="60"/>
       <column name="TITLE" value="Counsellor"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="50.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Building and construction suppliers"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="ecf421ef-66b2-4f9f-98c6-ee8a73e753da"/>
       <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="ecf421ef-66b2-4f9f-98c6-ee8a73e753da"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Austria"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
       <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORE" valueNumeric="50.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="from 350T"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="efec90bd-c99f-49d9-bd52-df0ae6f938a3"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="50.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="efec90bd-c99f-49d9-bd52-df0ae6f938a3"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="Machinery and equipment"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
+      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
+      <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
+      <column name="SORT" valueNumeric="50"/>
+      <column name="TITLE" value="ab 350 D€"/>
+    </insert>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORE" valueNumeric="5.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Marketing"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="f678b3e0-72c4-4b48-90c0-054bf3612dc2"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="f678b3e0-72c4-4b48-90c0-054bf3612dc2"/>
       <column name="SORT" valueNumeric="130"/>
       <column name="TITLE" value="Trade"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="fae1ef0a-5d07-4725-907f-4b2ac5814328"/>
       <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORE" valueNumeric="33.30"/>
+      <column name="CLASSIFICATIONSCOREID" value="fae1ef0a-5d07-4725-907f-4b2ac5814328"/>
       <column name="SORT" valueNumeric="100"/>
       <column name="TITLE" value="Industry"/>
     </insert>
     <insert tableName="classificationscore">
-      <column name="CLASSIFICATIONSCOREID" value="fb8cb769-d95b-468a-ac64-7ee0cefd46a7"/>
       <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORE" valueNumeric="20.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="fb8cb769-d95b-468a-ac64-7ee0cefd46a7"/>
       <column name="SORT" valueNumeric="20"/>
       <column name="TITLE" value="unknown"/>
     </insert>
-    
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="2cd8d11f-ee3f-429b-a16a-7839cf30b62d"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="51-100"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="4d868dc5-747a-4f22-9134-638198d3084a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="0-50"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="92708239-fd7f-4699-8aaa-b6290fedaac0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="SCORE" valueNumeric="15.00"/>
-      <column name="SORT" valueNumeric="40"/>
-      <column name="TITLE" value="251-1000"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="d578aa09-5d14-4ace-8cd0-572c5efcd82e"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="50"/>
-      <column name="TITLE" value="ab 1000"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="51575eb6-4005-42d2-96f3-b35dfd06a86b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-      <column name="SCORE" valueNumeric="25.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="101-250"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="47ca5b54-423f-4bf1-a4d6-a0c55a2488e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="Commodity group 1"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="fd8a348a-dc1f-414b-b95e-b1a6aeb9a8d4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="Commodity group 2"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="b41e180f-db8c-44c3-9fbb-179ab58d5852"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="Commodity group 3"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="206fd02f-68ec-42f2-83d1-92848f51dc1a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="SCORE" valueNumeric="25.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="Switzerland"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="8d7bc557-e020-42c9-83d9-ff84fcbd12b7"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="SCORE" valueNumeric="35.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="Austria"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="2745d6c3-fffb-4f72-8bc2-92439a14e919"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="40"/>
-      <column name="TITLE" value="Other"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="b7b763d4-994d-483d-9a1c-6eb85786d61a"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-      <column name="SCORE" valueNumeric="35.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="Germany"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="9181a683-dcab-47fc-af7b-e282505348d6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="90"/>
-      <column name="TITLE" value="Energy"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="3eb18b76-f51e-4ad2-9080-74b4a603667b"/>
+    <insert tableName="classificationscore">
       <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
       <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="Machinery and equipment"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="618bf0d1-18d4-4a96-900c-80a5a616da9b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="Logistics"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="4c8cfcec-f183-4d82-8a59-ae743ec772b4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="130"/>
-      <column name="TITLE" value="Trade"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="6632b510-7094-45d6-b7ef-946e759429a3"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="140"/>
-      <column name="TITLE" value="Automotive"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="22581c2e-bb4d-43cb-b6b3-80244425e209"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="180"/>
-      <column name="TITLE" value="Service"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
       <column name="CLASSIFICATIONSCOREID" value="fd022500-4cbc-461f-abb9-b0ec3d8e1dd1"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="5.00"/>
       <column name="SORT" valueNumeric="80"/>
       <column name="TITLE" value="Food"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="904e2dbe-49a1-42a0-a5db-0f274334dd7f"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="160"/>
-      <column name="TITLE" value="Electric"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="9ac96400-9c47-4d4f-be5b-e053f92a54ce"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="40"/>
-      <column name="TITLE" value="IT"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="09559e61-09ed-4f85-b0cb-fa7b0c66e488"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="15.00"/>
-      <column name="SORT" valueNumeric="150"/>
-      <column name="TITLE" value="Publishing house"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="d2a75f81-d0b3-48ce-be97-5e6add962cbb"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="15.00"/>
-      <column name="SORT" valueNumeric="70"/>
-      <column name="TITLE" value="Consultation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="92c8f126-b31e-4011-bbf0-cb5e57bfc3e5"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="60"/>
-      <column name="TITLE" value="Finance"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="107c199b-b315-4093-add5-48c496794bc9"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="110"/>
-      <column name="TITLE" value="Lottery"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="df7ea293-1fd6-4e98-ba3f-7d975fa8eaeb"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="170"/>
-      <column name="TITLE" value="Environment"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="2119cb62-b57c-40be-aff8-ace8e40378d4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="120"/>
-      <column name="TITLE" value="Education"/>
-    </insert>
-    
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="4285d598-06c0-435d-bb5e-28dec5f31521"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="SCORE" valueNumeric="15.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="high"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="5564a330-8c13-424f-a24b-5f97185a9036"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="low"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="d0f5c576-e1cd-463e-82d2-e09c46ccb2a0"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="medium"/>
-    </insert>
-      <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="893720f9-3780-4868-af0c-cbef5a564024"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="low"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="0b671383-ecc3-440c-aff4-ff485da2755d"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="medium"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="5be4d454-1f3e-4a3d-b8a4-3eb49ce1bc35"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="high"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="29134094-66f2-4331-9f14-fc6a27ab111e"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="0-49 D€"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="07f21cf8-c369-45f3-88fe-40ca586ed11b"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="100-199 D€"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="733323d6-ff3d-4ccb-b179-ad1fea05dfe8"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="SCORE" valueNumeric="15.00"/>
-      <column name="SORT" valueNumeric="40"/>
-      <column name="TITLE" value="200-349 D€"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="839cd672-5981-4207-8a82-caddd00107e4"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="50-99 D€"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="f02cfd28-5a09-42ca-b805-07b7b38e3363"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="50"/>
-      <column name="TITLE" value="ab 350 D€"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="4982ab85-0961-4d85-8fee-2b55887add96"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="SCORE" valueNumeric="5.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="high"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="08764209-9b5e-4893-96d0-e2a347bccf60"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="SCORE" valueNumeric="20.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="low"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="6fe28489-2383-412b-9bbd-4f01a9421775"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-      <column name="SCORE" valueNumeric="10.00"/>
-      <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="medium"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="cddaf52d-37b7-426c-b858-c986e58544e6"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+    <insert tableName="classificationscore">
+      <column name="CLASSIFICATIONTYPE_ID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
       <column name="SCORE" valueNumeric="10.00"/>
+      <column name="CLASSIFICATIONSCOREID" value="fd8a348a-dc1f-414b-b95e-b1a6aeb9a8d4"/>
       <column name="SORT" valueNumeric="20"/>
-      <column name="TITLE" value="Stagnated"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="4ed5e22f-222a-4a51-83d3-597fa035d2df"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="SCORE" valueNumeric="0.00"/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="Negative"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSCORE">
-      <column name="CLASSIFICATIONSCOREID" value="a60aaf2d-88aa-4c72-9606-0eb3ac9493cf"/>
-      <column name="CLASSIFICATIONTYPE_ID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-      <column name="SCORE" valueNumeric="25.00"/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="Positive"/>
+      <column name="TITLE" value="Commodity group 2"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
index aa7419f65cf9a1919623b21eee01fbba8a344b18..4d76235c4afaff4c17945c195d876a5160ebc07e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationstorage.xml
@@ -1,162 +1,162 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="c71ca120-5de6-4a44-a795-1127653c25df">
-    <delete tableName="CLASSIFICATIONSTORAGE"/>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+  <changeSet author="autogenerated" id="489ad8c4-660a-4043-b5ea-09969fee2252">
+    <delete tableName="classificationstorage"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="04b4ac80-a316-437a-b113-e7de14e181a8"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONVALUE" value="ABB"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+    </insert>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="0adb8953-1685-45cf-bcf7-c2c2098aa215"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="AB"/>
+      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+    </insert>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="1251e4b0-195d-4556-a10e-7942f1b0e337"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="AB"/>
+      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    </insert>
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="166e729d-45c6-4dab-bff2-940d2b618f6b"/>
-      <column name="CLASSIFICATIONVALUE" value="BBB"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONVALUE" value="ADB"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="1aafcbf6-6feb-4916-a4fd-58c138eb8f8f"/>
-      <column name="CLASSIFICATIONVALUE" value="DBA"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONVALUE" value="CBA"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="04b4ac80-a316-437a-b113-e7de14e181a8"/>
-      <column name="CLASSIFICATIONVALUE" value="ABB"/>
-      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="25a1b340-538d-4c4f-8b1e-25126286cd53"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BB"/>
+      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    </insert>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="2ab913d3-e1a8-4fe2-904b-77b02f6be689"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BA"/>
+      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+    </insert>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="3893da8a-f357-46e0-a0b9-65aa58b0dfa6"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="42cc772e-53c6-4849-be29-ebb4e18ab860"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONVALUE" value="ACB"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="7f7dfe1d-cb98-44c8-8106-858d991d2b06"/>
-      <column name="CLASSIFICATIONVALUE" value="ACA"/>
-      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="471aafd5-a348-453f-8b2a-64bb365fd0ee"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="CLASSIFICATIONVALUE" value="ACB"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="4ce62df5-f0ea-4593-a152-6704c61d7cef"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+    </insert>
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="63dd36bb-74b8-487b-811f-521438ef9491"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONVALUE" value="AC"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="4ce62df5-f0ea-4593-a152-6704c61d7cef"/>
-      <column name="CLASSIFICATIONVALUE" value="BD"/>
-      <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="7a4762f5-90a3-4b6c-8a5d-93125381c18a"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="821c7eed-7bee-4879-97ec-44d2014a192b"/>
-      <column name="CLASSIFICATIONVALUE" value="BD"/>
-      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="7b2eb62a-b686-4eaf-bde1-2e1dd1028f65"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BC"/>
+      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="7e59d485-01a8-4e43-9655-ba751d5983a4"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONVALUE" value="BC"/>
       <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="c64c9f31-a108-4df9-b515-6e523b1341c1"/>
-      <column name="CLASSIFICATIONVALUE" value="AC"/>
-      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="7f7dfe1d-cb98-44c8-8106-858d991d2b06"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="CLASSIFICATIONVALUE" value="ACA"/>
+      <column name="OBJECT_ROWID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="1251e4b0-195d-4556-a10e-7942f1b0e337"/>
-      <column name="CLASSIFICATIONVALUE" value="AB"/>
-      <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="80eac6e6-f237-455e-96fd-8484722a79d4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="3893da8a-f357-46e0-a0b9-65aa58b0dfa6"/>
-      <column name="CLASSIFICATIONVALUE" value="BC"/>
-      <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="821c7eed-7bee-4879-97ec-44d2014a192b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="84a92c36-88df-4c06-a36a-650ed92d4d0a"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONVALUE" value="BD"/>
       <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="f451479f-97dc-4570-b342-c8d53f04b493"/>
-      <column name="CLASSIFICATIONVALUE" value="AC"/>
-      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="80eac6e6-f237-455e-96fd-8484722a79d4"/>
-      <column name="CLASSIFICATIONVALUE" value="BD"/>
-      <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="8db70618-5840-4d4b-90e2-66e1919fc6c1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="25a1b340-538d-4c4f-8b1e-25126286cd53"/>
-      <column name="CLASSIFICATIONVALUE" value="BB"/>
-      <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="b4d2847f-0548-4cc8-b002-7723b5fc9184"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="BD"/>
+      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="bbc19466-8d76-4f35-be56-8458f677d4a9"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONVALUE" value="BC"/>
       <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="0adb8953-1685-45cf-bcf7-c2c2098aa215"/>
-      <column name="CLASSIFICATIONVALUE" value="BB"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="b4d2847f-0548-4cc8-b002-7723b5fc9184"/>
-      <column name="CLASSIFICATIONVALUE" value="BD"/>
-      <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="c64c9f31-a108-4df9-b515-6e523b1341c1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="CLASSIFICATIONVALUE" value="AC"/>
+      <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
+    <insert tableName="classificationstorage">
       <column name="CLASSIFICATIONSTORAGEID" value="e2142492-eeab-482d-a37e-b1c8fe7b2545"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="CLASSIFICATIONVALUE" value="BC"/>
       <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="7a4762f5-90a3-4b6c-8a5d-93125381c18a"/>
-      <column name="CLASSIFICATIONVALUE" value="AC"/>
-      <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="f451479f-97dc-4570-b342-c8d53f04b493"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="fc665249-9efc-4d90-839d-cdffb4c3f407"/>
       <column name="CLASSIFICATIONVALUE" value="AC"/>
-      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="7b2eb62a-b686-4eaf-bde1-2e1dd1028f65"/>
-      <column name="CLASSIFICATIONVALUE" value="BC"/>
-      <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
     </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="2ab913d3-e1a8-4fe2-904b-77b02f6be689"/>
-      <column name="CLASSIFICATIONVALUE" value="BB"/>
-      <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+    <insert tableName="classificationstorage">
+      <column name="CLASSIFICATIONSTORAGEID" value="fc665249-9efc-4d90-839d-cdffb4c3f407"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
-    <insert tableName="CLASSIFICATIONSTORAGE">
-      <column name="CLASSIFICATIONSTORAGEID" value="8db70618-5840-4d4b-90e2-66e1919fc6c1"/>
       <column name="CLASSIFICATIONVALUE" value="AC"/>
-      <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
     </insert>
   </changeSet>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
index f758025469ed08e0bb3af66cdd6e83883584e8fd..60482c030a909eb068ae282c7a51d0c2c1fbe4fb 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/classificationtype.xml
@@ -1,127 +1,126 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="de26cf22-891e-4584-97cd-fe877ebc790c">
+  <changeSet author="autogenerated" id="78633039-6630-4bd9-8498-98950ad97aa3">
     <delete tableName="classificationtype"/>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Headquarters"/>
+      <column name="CLASSIFICATIONTYPEID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
+    </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
       <column name="SCORETYPE" value="ScoreCustomizing"/>
+      <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
       <column name="SCORETYPE" value="ScoreStandard"/>
+      <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
       <column name="SCORETYPE" value="ScoreDepartment"/>
+      <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
       <column name="SCORETYPE" value="ScoreUsers"/>
+      <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
       <column name="SCORETYPE" value="ScoreBranch"/>
+      <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Number of employees"/>
+      <column name="CLASSIFICATIONTYPEID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Loyalty"/>
+      <column name="CLASSIFICATIONTYPEID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="00cc7b8f-d99e-46bf-90c3-74e05b5af685"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
       <column name="SCORETYPE" value="ScoreBased"/>
+      <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
       <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+      <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Creditworthiness"/>
+      <column name="CLASSIFICATIONTYPEID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
       <column name="SCORETYPE" value="ScoreCloud"/>
+      <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Business development"/>
+      <column name="CLASSIFICATIONTYPEID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Product preference"/>
+      <column name="CLASSIFICATIONTYPEID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
       <column name="SCORETYPE" value="ScorePosition"/>
+      <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Current supply share"/>
+      <column name="CLASSIFICATIONTYPEID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Industry"/>
+      <column name="CLASSIFICATIONTYPEID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="b2126d9d-8d18-46d4-a48f-1a03fc456ddd"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
       <column name="SCORETYPE" value="ScoreBudget"/>
+      <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
     </insert>
     <insert tableName="classificationtype">
       <column name="CLASSIFICATIONGROUP_ID" value="c1305d16-320e-44f8-95f9-e4cff05d3cfb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
       <column name="SCORETYPE" value="ScoreProjectStart"/>
+      <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
+    </insert>
+    <insert tableName="classificationtype">
+      <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="SCORETYPE" value="Purchasing potential p. a."/>
+      <column name="CLASSIFICATIONTYPEID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
     </insert>
-    
-    <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="4b72857e-863d-4254-accf-25281bb7bb64"/>
-        <column name="SCORETYPE" value="Number of employees"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="970b251c-ca6e-43f4-9162-ebc5d1142a8b"/>
-        <column name="SCORETYPE" value="Product preference"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="037a9de1-fa6d-4895-9db3-82f7769682ae"/>
-        <column name="SCORETYPE" value="Headquarters"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="e3b0a84f-d2a7-4d7c-b734-82ab4b262e84"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="d67397c5-5e05-433b-b61d-12807906aa5a"/>
-        <column name="SCORETYPE" value="Industry"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="80c6ec8b-eb54-4d25-a4f5-0adaf4cdc84e"/>
-        <column name="SCORETYPE" value="Creditworthiness"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="4d878689-15c0-46cc-acc8-3c524463db5c"/>
-        <column name="SCORETYPE" value="Loyalty"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="f581dcb9-db6f-4a82-995c-695d0a7393d3"/>
-        <column name="SCORETYPE" value="Purchasing potential p. a."/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="be76dab1-c6ab-4b1e-8322-8b052ccda4d9"/>
-        <column name="SCORETYPE" value="Current supply share"/>
-        </insert>
-        <insert tableName="CLASSIFICATIONTYPE">
-        <column name="CLASSIFICATIONGROUP_ID" value="fb1349b6-6dc1-44b7-b7ea-03d5483e7fac"/>
-        <column name="OBJECT_TYPE" value="Organisation"/>
-        <column name="CLASSIFICATIONTYPEID" value="95396ee7-f0e2-41b4-995e-bac5749709ec"/>
-        <column name="SCORETYPE" value="Business development"/>
-        </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml
index e043a11f6e0c6be9edc3602e317ab2a6433aed20..4bfd0d305d99ad749ed5dd75d8295144480a580e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml
@@ -1,12 +1,12 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="30aad20b-f8cd-4cd4-ad08-200f31686ce3">
+  <changeSet author="autogenerated" id="c663330c-e55f-4804-a18b-64c6693e5e12">
     <delete tableName="commrestriction"/>
     <insert tableName="commrestriction">
       <column name="COMMRESTRICTIONID" value="a07a7061-245f-4674-8482-282f5e5d2a5b"/>
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="EMPLOYEE_INVOLVED" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="MEDIUM" value="CAMPAIGNPHONE"/>
+      <column name="EMPLOYEE_INVOLVED" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="STARTDATE" valueDate="2019-11-25T02:47:33"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
index 6e0432c500a0d492a5be62544c28f1140ae03780..355a3ec7dc4a6efacfb4761879be080721676bbd 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
@@ -1,938 +1,938 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="6b9a0b99-36fd-4c6d-8c8e-985b3baa3146">
+  <changeSet author="autogenerated" id="2d5ca29d-0eef-4b22-b1c1-e6766831090c">
     <delete tableName="communication"/>
     <insert tableName="communication">
-      <column name="ADDR" value="www.gfk.de"/>
       <column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
+      <column name="ADDR" value="www.gfk.de"/>
       <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="ISSTANDARD" valueNumeric="0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="05d24d50-677f-4c7a-9f39-8a8082f267cd"/>
-      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="info@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:31:52"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 941 52360"/>
       <column name="COMMUNICATIONID" value="0a4410ef-bd92-4baa-95db-632f82d1de94"/>
-      <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 941 52360"/>
+      <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:32:40"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 7541 56874-15"/>
       <column name="COMMUNICATIONID" value="106b7d14-8973-4122-a9af-4ece26f4fd73"/>
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 7541 56874-15"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 821 42580"/>
       <column name="COMMUNICATIONID" value="11b513f0-4fef-4525-976e-f08740d57c44"/>
-      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 821 42580"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:45:42"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="gfk@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="14a01219-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="gfk@meine-firma.de"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="ppfiffig@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="14d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="ppfiffig@meine-firma.de"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="lsommer@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="14d05619-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="lsommer@meine-firma.de"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 40 63520"/>
       <column name="COMMUNICATIONID" value="1fd3454a-f054-4472-8e53-26f9b4a0ce76"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 40 63520"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:48:09"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 887 1333"/>
       <column name="COMMUNICATIONID" value="22d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 887 1333"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 89 3332-0"/>
       <column name="COMMUNICATIONID" value="22d07819-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 89 3332-0"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="https://www.industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="2445a63f-85b7-40cc-ad99-0bc261f60db6"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="https://www.industrial-steel.de"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 40 6352-105"/>
       <column name="COMMUNICATIONID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
+      <column name="ADDR" value="+49 40 6352-105"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T08:26:11"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 89 36920"/>
       <column name="COMMUNICATIONID" value="270d381e-3d37-40d7-a776-4d6302ed60d2"/>
-      <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 89 36920"/>
+      <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:36:39"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@grobbe-werk.de"/>
       <column name="COMMUNICATIONID" value="2f571583-f8d2-47ad-b183-8d9cab3b3c19"/>
+      <column name="ADDR" value="info@grobbe-werk.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:11:18"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="psteiger@trans-logistics.de"/>
       <column name="COMMUNICATIONID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
+      <column name="ADDR" value="psteiger@trans-logistics.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="tadmin@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="tadmin@meine-firma.de"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 421 98650"/>
       <column name="COMMUNICATIONID" value="3da6609c-79f0-449e-a236-3636368382f5"/>
-      <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 421 98650"/>
+      <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:46:23"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="https://skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="417ce25b-8d42-47b2-b7df-1dfcc28075be"/>
+      <column name="ADDR" value="https://skyscraper-bau.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 4321 78990"/>
       <column name="COMMUNICATIONID" value="459d704e-f140-4927-aae3-771fecd2891a"/>
-      <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 4321 78990"/>
+      <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:34:41"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="hsmith@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
+      <column name="ADDR" value="hsmith@meine-firma.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-32"/>
       <column name="COMMUNICATIONID" value="4ba08e1c-7094-412c-b4a4-210a330f6d71"/>
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 711 8754-32"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:22:23"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@superbauer.de"/>
       <column name="COMMUNICATIONID" value="4f3230c0-41e4-4861-880f-14ad0fcc5a35"/>
+      <column name="ADDR" value="info@superbauer.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:32:15"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@document-solutions.de"/>
       <column name="COMMUNICATIONID" value="508e1a48-5e0d-4474-8059-ad495f3b629d"/>
-      <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="info@document-solutions.de"/>
+      <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:24:31"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 9751500"/>
       <column name="COMMUNICATIONID" value="5136702b-2898-4db3-98d2-436772febc35"/>
+      <column name="ADDR" value="+49 871 9751500"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 40 6352-109"/>
       <column name="COMMUNICATIONID" value="5270133a-a59a-41c0-a812-2618c7557215"/>
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 40 6352-109"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:04:03"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="bleicht@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
+      <column name="ADDR" value="bleicht@meine-firma.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="lkanzler@web.de"/>
       <column name="COMMUNICATIONID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
+      <column name="ADDR" value="lkanzler@web.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:13:02"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 8763 1333"/>
       <column name="COMMUNICATIONID" value="58d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 8763 1333"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="5ea00579-3eb5-4c1f-9396-63a15b134f60"/>
+      <column name="ADDR" value="info@industrial-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:19:53"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@sevent.de"/>
       <column name="COMMUNICATIONID" value="5f9aaf24-69d7-4089-a31d-e15d6d55dc92"/>
+      <column name="ADDR" value="info@sevent.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:30:12"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 7541 56874-0"/>
       <column name="COMMUNICATIONID" value="64f4028b-7a2b-405a-a434-61f262abf2c3"/>
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 7541 56874-0"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:36:18"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 65320"/>
       <column name="COMMUNICATIONID" value="66b9cfdf-e289-407f-8418-9436b1d2152b"/>
-      <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 65320"/>
+      <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:48:35"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="atannenbaum@industiral-steel.de"/>
       <column name="COMMUNICATIONID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
+      <column name="ADDR" value="atannenbaum@industiral-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:13:19"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 841 32510"/>
       <column name="COMMUNICATIONID" value="6823d32a-0ef1-45af-a112-b43afe5addf6"/>
-      <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 841 32510"/>
+      <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:46:57"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@kronen.de"/>
       <column name="COMMUNICATIONID" value="69c70cb5-276d-4983-9607-a5fd55196573"/>
+      <column name="ADDR" value="info@kronen.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:22:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 89 653250"/>
       <column name="COMMUNICATIONID" value="6a9b52cd-805f-4fec-9601-2b1874990f7b"/>
-      <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 89 653250"/>
+      <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:49:52"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 89 25630"/>
       <column name="COMMUNICATIONID" value="6b5b76d9-489d-40e1-ac78-3261de6433a6"/>
-      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 89 25630"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:29:24"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 170 1212121"/>
       <column name="COMMUNICATIONID" value="6de0cb05-ebf3-4884-ba21-85117fc95dd7"/>
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 170 1212121"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="MEDIUM_ID" value="COMMMOBIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:56:26"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 30 65780"/>
       <column name="COMMUNICATIONID" value="73f6780a-5ef6-4647-b26b-4e7ef29d8364"/>
-      <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 30 65780"/>
+      <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:30:33"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="mericson@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
+      <column name="ADDR" value="mericson@skyscraper-bau.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="https://transatlantik-logistics.de"/>
       <column name="COMMUNICATIONID" value="78496224-0a11-4f2e-bc60-99940a08298d"/>
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="https://transatlantik-logistics.de"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@matthiasbogen.de"/>
       <column name="COMMUNICATIONID" value="786bdaba-c36d-4107-9c6f-abc15ebb4e25"/>
+      <column name="ADDR" value="info@matthiasbogen.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:10:46"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 2345433"/>
       <column name="COMMUNICATIONID" value="7c3ba80d-52ee-4275-a6b3-3afad4fb59b9"/>
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 2345433"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:03:15"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 393490"/>
       <column name="COMMUNICATIONID" value="7ff7d10a-41ba-4c6e-8c78-c47bd8df7579"/>
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 393490"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="dvortrefflich@trans-logistics.de"/>
       <column name="COMMUNICATIONID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
+      <column name="ADDR" value="dvortrefflich@trans-logistics.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-25"/>
       <column name="COMMUNICATIONID" value="8600ac7a-7b4a-4db5-8f43-9c104604f423"/>
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 711 8754-25"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@kältetechnik.de"/>
       <column name="COMMUNICATIONID" value="86784334-c997-4305-8526-35db5047ce93"/>
+      <column name="ADDR" value="info@kältetechnik.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:20:31"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="pmacher@industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
+      <column name="ADDR" value="pmacher@industrial-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-05T03:52:59"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 89 87750"/>
       <column name="COMMUNICATIONID" value="91195ee8-25f3-47df-b785-8c18510e647a"/>
-      <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 89 87750"/>
+      <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:32:03"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@jpmtouristik.de"/>
       <column name="COMMUNICATIONID" value="920cf62e-5a9f-4c25-9c01-1e22b3f64891"/>
-      <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="info@jpmtouristik.de"/>
+      <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:21:42"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 7541 56874-19"/>
       <column name="COMMUNICATIONID" value="949aae5e-2546-437b-af27-0ac1b18d3970"/>
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 7541 56874-19"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@aquire.de"/>
       <column name="COMMUNICATIONID" value="954a729a-dd11-4760-86a8-dc09e9c11d1a"/>
+      <column name="ADDR" value="info@aquire.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:09:20"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 37484732"/>
       <column name="COMMUNICATIONID" value="98bb2c06-db4c-4188-9676-67fb32881a1f"/>
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 37484732"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 40 6352-111"/>
       <column name="COMMUNICATIONID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
+      <column name="ADDR" value="+49 40 6352-111"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T08:26:49"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@mnfversicherung.de"/>
       <column name="COMMUNICATIONID" value="a0ba95f9-c872-4bfc-9591-868aaa3b2ac3"/>
+      <column name="ADDR" value="info@mnfversicherung.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:27:25"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 8131 493828"/>
       <column name="COMMUNICATIONID" value="a7cd429f-b81c-4bfe-9aa1-06d77d728812"/>
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 8131 493828"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="https://www.xing.com/companies/aditosoftwaregmbh"/>
       <column name="COMMUNICATIONID" value="a8dca1e8-f787-446b-b065-8089322b0402"/>
+      <column name="ADDR" value="https://www.xing.com/companies/aditosoftwaregmbh"/>
       <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="ISSTANDARD" valueNumeric="0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T11:42:52"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@buchner.de"/>
       <column name="COMMUNICATIONID" value="ab6da5e4-bea2-4a66-b818-b8ad5c57a167"/>
+      <column name="ADDR" value="info@buchner.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-21T09:10:07"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="psolano@industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
+      <column name="ADDR" value="psolano@industrial-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:32:30"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-29"/>
       <column name="COMMUNICATIONID" value="b7a11507-0a52-46e4-bef4-f9bce325844f"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T11:57:53"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 711 8754-29"/>
       <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-0"/>
       <column name="COMMUNICATIONID" value="b8789eca-7b8b-4261-8fc5-cd9053a704f2"/>
-      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 711 8754-0"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T05:31:22"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="contact@globgroup.com"/>
       <column name="COMMUNICATIONID" value="b9773f8a-97bf-4071-9b1e-32b5e89e526a"/>
+      <column name="ADDR" value="contact@globgroup.com"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-22"/>
       <column name="COMMUNICATIONID" value="b986e88b-d637-47e5-8553-addbd8b31488"/>
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 711 8754-22"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:30:47"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="kontak@schild.de "/>
       <column name="COMMUNICATIONID" value="b9b0499c-ea37-4a41-9a0b-8ed570d91683"/>
+      <column name="ADDR" value="kontak@schild.de "/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="slustig@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
+      <column name="ADDR" value="slustig@meine-firma.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@trans-logistics.de"/>
       <column name="COMMUNICATIONID" value="bf6122eb-b257-4bc3-97a7-f60985e0dc82"/>
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="info@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:32:54"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 821 96690"/>
       <column name="COMMUNICATIONID" value="c68be666-221e-46b4-8fad-d49bb1117c3a"/>
+      <column name="ADDR" value="+49 821 96690"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="tmosby@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
+      <column name="ADDR" value="tmosby@skyscraper-bau.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:22:24"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="rscherbeatsky@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
+      <column name="ADDR" value="rscherbeatsky@skyscraper-bau.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:30:48"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 7541 56874-11"/>
       <column name="COMMUNICATIONID" value="d0629982-5797-4eda-b36b-a58d2fc551ec"/>
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 7541 56874-11"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 176 48525800"/>
       <column name="COMMUNICATIONID" value="d32b5d16-3136-49ff-8c6c-71b7fe501552"/>
+      <column name="ADDR" value="+49 176 48525800"/>
       <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
-      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="MEDIUM_ID" value="COMMMOBIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="cdecker@trans-logistics.de"/>
       <column name="COMMUNICATIONID" value="d395f5eb-ff5f-4cd6-9e52-04066349d523"/>
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="cdecker@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="jgrüner@web.de"/>
       <column name="COMMUNICATIONID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
+      <column name="ADDR" value="jgrüner@web.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:11:20"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 171 9654874"/>
       <column name="COMMUNICATIONID" value="d6a0723c-5e4d-4771-8808-79b510e864cb"/>
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 171 9654874"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:26:03"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 7229323"/>
       <column name="COMMUNICATIONID" value="d721d57c-7cb0-45ee-a12f-982ec4efb62c"/>
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 7229323"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 8743 5690"/>
       <column name="COMMUNICATIONID" value="da54f448-f013-428b-85b1-311df2903223"/>
-      <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 8743 5690"/>
+      <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:49:12"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="lmatterhorn@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="ddcc3940-fdb2-49b1-8812-1e7d2ecf2598"/>
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="lmatterhorn@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:42:07"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="fmüller@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
+      <column name="ADDR" value="fmüller@meine-firma.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@netro.de"/>
       <column name="COMMUNICATIONID" value="dead3100-379c-4ca3-958f-006ba17a78ad"/>
+      <column name="ADDR" value="info@netro.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:42:41"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 93938292"/>
       <column name="COMMUNICATIONID" value="e0662d2c-ea02-4796-8783-a5ad4a8683fe"/>
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 93938292"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="alindner@industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
+      <column name="ADDR" value="alindner@industrial-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:10:34"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="hobermeier@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
+      <column name="ADDR" value="hobermeier@meine-firma.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 711 8754-31"/>
       <column name="COMMUNICATIONID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
+      <column name="ADDR" value="+49 711 8754-31"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T11:58:07"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@waken-neuser.de"/>
       <column name="COMMUNICATIONID" value="e4726063-bcbb-4527-8438-5f9fee077ce1"/>
-      <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="info@waken-neuser.de"/>
+      <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:33:16"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 65320"/>
       <column name="COMMUNICATIONID" value="e5b76921-2067-4f7d-b0b9-6c3d97dd5ca0"/>
-      <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 65320"/>
+      <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:49:30"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="maltinger@industrial-steel.de"/>
       <column name="COMMUNICATIONID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
+      <column name="ADDR" value="maltinger@industrial-steel.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:24:26"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="amorgenstern@trans-logistics.de"/>
       <column name="COMMUNICATIONID" value="ecb6313a-3663-45b0-80db-453a43eb0d0d"/>
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="amorgenstern@trans-logistics.de"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 871 65820"/>
       <column name="COMMUNICATIONID" value="f0ba9565-8b43-46db-80f8-a45f6be9cc4e"/>
-      <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 871 65820"/>
+      <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:42:51"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="info@pichelmaier-finc.de"/>
       <column name="COMMUNICATIONID" value="f2f8499d-2d00-485f-9d2f-381fd5e8f7ce"/>
+      <column name="ADDR" value="info@pichelmaier-finc.de"/>
       <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="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T03:27:48"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="+49 7541 56874-16"/>
       <column name="COMMUNICATIONID" value="f31e7b32-cc81-4b6a-868f-e9f4879dcee3"/>
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="+49 7541 56874-16"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
     </insert>
     <insert tableName="communication">
-      <column name="ADDR" value="azweisstein@skyscraper-bau.de"/>
       <column name="COMMUNICATIONID" value="f95dfa47-a5ff-407a-9c1c-826c5aa72c72"/>
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="ADDR" value="azweisstein@skyscraper-bau.de"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
+      <column name="ISSTANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
index 0646343dd382759bef111b0464dbfb7e0b393c35..e9542e1036fae3fdb3924a4e00907f0b9335ec45 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
@@ -1,481 +1,481 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="8f44b3ae-6d19-4ae0-b079-305c1b7a1273">
+  <changeSet author="autogenerated" id="9114cd12-9d7f-4c0d-b161-4010fb384453">
     <delete tableName="contact"/>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="0"/>
-      <column name="CONTACTID" value="0"/>
+      <column name="CONTACTID" value="0                                   "/>
+      <column name="ADDRESS_ID" value="0                                   "/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-08-29T02:43:16"/>
+      <column name="ORGANISATION_ID" value="0                                   "/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
       <column name="CONTACTID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="ADDRESS_ID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
+      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTROLE" value="Vertriebsleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
-      <column name="DEPARTMENT" value="Vertrieb"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
       <column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="ADDRESS_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
       <column name="CONTACTID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+      <column name="ADDRESS_ID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
-      <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
+      <column name="ISOLANGUAGE" value="eng"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTROLE" value="Marketingleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
-      <column name="DEPARTMENT" value="Marketing"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Marketing"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
       <column name="CONTACTID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+      <column name="ADDRESS_ID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTROLE" value="Marketingleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
-      <column name="DEPARTMENT" value="Marketing"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Marketing"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
       <column name="CONTACTID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="ADDRESS_ID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
-      <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="ISOLANGUAGE" value="eng"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTROLE" value="Marketingmitarbeiterin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
-      <column name="DEPARTMENT" value="Marketing"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Marketing"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTROLE" value="Marketingleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:41:40"/>
-      <column name="DEPARTMENT" value="Marketing"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
-      <column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Marketing"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
       <column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="ADDRESS_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
       <column name="CONTACTID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+      <column name="ADDRESS_ID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
-      <column name="DEPARTMENT" value="Management"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Management"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTROLE" value="Vertriebsleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
-      <column name="DEPARTMENT" value="Vertrieb"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
       <column name="CONTACTID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="ADDRESS_ID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
       <column name="CONTACTID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="ADDRESS_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="ORGANISATION_ID" value="0                                   "/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0"/>
-      <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
       <column name="CONTACTID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="ADDRESS_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="ORGANISATION_ID" value="0                                   "/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0"/>
-      <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
       <column name="CONTACTID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+      <column name="ADDRESS_ID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
       <column name="CONTACTID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="ADDRESS_ID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
       <column name="CONTACTROLE" value="Berater"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-11-25T01:52:05"/>
-      <column name="DEPARTMENT" value="Vertrieb"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTROLE" value="IT-Leiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
-      <column name="DEPARTMENT" value="IT"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="IT"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
       <column name="CONTACTID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+      <column name="ADDRESS_ID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
       <column name="CONTACTID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="ADDRESS_ID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
       <column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="ADDRESS_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
       <column name="CONTACTID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="ADDRESS_ID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="CONTACTPOSITION" value="Produktionsleiter"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
-      <column name="DEPARTMENT" value="Produktion"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CONTACTPOSITION" value="Produktionsleiter"/>
+      <column name="DEPARTMENT" value="Produktion"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="14d03432-985b-4efe-a634-da71ae482907"/>
       <column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="ADDRESS_ID" value="14d03432-985b-4efe-a634-da71ae482907"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
       <column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="ADDRESS_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
       <column name="CONTACTID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+      <column name="ADDRESS_ID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
       <column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="ADDRESS_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTROLE" value="IT-Leiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
-      <column name="DEPARTMENT" value="IT"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-      <column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="IT"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:06:15"/>
-      <column name="DEPARTMENT" value="Vertrieb"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
       <column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="ADDRESS_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTROLE" value="Vertriebsleiter"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
-      <column name="DEPARTMENT" value="Vertrieb"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Vertrieb"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
       <column name="CONTACTID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="ADDRESS_ID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="25360df5-104e-4903-8440-f848d025a24b"/>
       <column name="CONTACTID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+      <column name="ADDRESS_ID" value="25360df5-104e-4903-8440-f848d025a24b"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
       <column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="ADDRESS_ID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
       <column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+      <column name="ADDRESS_ID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
       <column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+      <column name="ADDRESS_ID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
       <column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="ADDRESS_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
       <column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="ADDRESS_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-      <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTROLE" value="Koordinator"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-11-26T08:27:11"/>
-      <column name="DEPARTMENT" value="Produktion"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DEPARTMENT" value="Produktion"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
       <column name="CONTACTID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="ADDRESS_ID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
-      <column name="ISOLANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
+      <column name="ISOLANGUAGE" value="eng"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
       <column name="CONTACTID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="ADDRESS_ID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="contact">
-      <column name="ADDRESS_ID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
       <column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+      <column name="ADDRESS_ID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="ISOLANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/contract.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/contract.xml
index ede93c47619d72b30b04f3615f18334a43250dc5..fab6496c05d4e42c10d64111d96a473ee863e2a0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/contract.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/contract.xml
@@ -1,102 +1,102 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="426e7df1-5279-47a5-99ec-76d4b979292c">
+  <changeSet author="autogenerated" id="c1895881-e590-4488-9dc5-ce394698b15c">
     <delete tableName="contract"/>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CONTRACTCODE" value="1007"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEMAIN"/>
       <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="CONTRACTID" value="28234066-ad12-451d-9cd2-fbc9f8ee0412"/>
       <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="CONTRACTCODE" value="1007"/>
+      <column name="CONTRACTSTART" valueDate="2019-03-11T01:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="CONTRACTCODE" value="1000"/>
-      <column name="CONTRACTDUE" valueDate="2019-01-01T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
       <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CONTRACTDUE" valueDate="2019-01-01T01:00:00"/>
+      <column name="CONTRACTCODE" value="1000"/>
+      <column name="CONTRACTSTART" valueDate="2018-10-01T02:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="CONTRACTCODE" value="1008"/>
-      <column name="CONTRACTDUE" valueDate="2019-11-17T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="CONTRACTDUE" valueDate="2019-11-17T01:00:00"/>
+      <column name="CONTRACTCODE" value="1008"/>
+      <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CONTRACTCODE" value="1003"/>
-      <column name="CONTRACTDUE" valueDate="2021-01-01T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
       <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CONTRACTDUE" valueDate="2021-01-01T01:00:00"/>
+      <column name="CONTRACTCODE" value="1003"/>
+      <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="CONTRACTCODE" value="1001"/>
-      <column name="CONTRACTDUE" valueDate="2018-01-01T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
       <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CONTRACTDUE" valueDate="2018-01-01T01:00:00"/>
+      <column name="CONTRACTCODE" value="1001"/>
+      <column name="CONTRACTSTART" valueDate="2017-05-01T02:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="CONTRACTCODE" value="1004"/>
-      <column name="CONTRACTDUE" valueDate="2022-01-01T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
       <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="CONTRACTDUE" valueDate="2022-01-01T01:00:00"/>
+      <column name="CONTRACTCODE" value="1004"/>
+      <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="CONTRACTCODE" value="1005"/>
-      <column name="CONTRACTDUE" valueDate="2020-02-03T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
       <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="CONTRACTDUE" valueDate="2020-02-03T01:00:00"/>
+      <column name="CONTRACTCODE" value="1005"/>
+      <column name="CONTRACTSTART" valueDate="2019-05-16T02:00:00"/>
     </insert>
     <insert tableName="contract">
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
+      <column name="PAYMENT" value="CONTRACTPAYANNUAL"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="CONTRACTCODE" value="1006"/>
       <column name="CONTRACTDUE" valueDate="2020-06-01T02:00:00"/>
-      <column name="CONTRACTID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
+      <column name="CONTRACTCODE" value="1006"/>
       <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
-      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
-      <column name="PAYMENT" value="CONTRACTPAYANNUAL"/>
     </insert>
     <insert tableName="contract">
-      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="CONTRACTCODE" value="1002"/>
-      <column name="CONTRACTDUE" valueDate="2020-01-01T01:00:00"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <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="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
       <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
+      <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+      <column name="CONTRACTDUE" valueDate="2020-01-01T01:00:00"/>
+      <column name="CONTRACTCODE" value="1002"/>
+      <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
     </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 11b8cf6c9174f5fa66e9e03c62075dfc8d3799d9..b0b4302c965aa31accf8c08971b3d869a86b82d6 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/descriptiontranslation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/descriptiontranslation.xml
@@ -1,27 +1,27 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="4c67662d-0212-4096-94c5-4533e2add418">
+  <changeSet author="autogenerated" id="9695b68c-0526-4d85-a7af-1951a33b1118">
     <delete tableName="descriptiontranslation"/>
     <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="OBJECT_TYPE" value="Product"/>
+      <column name="DESCRIPTION" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="LANG" value="deu"/>
       <column name="OBJECT_ROWID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
-      <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <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="OBJECT_TYPE" value="Product"/>
+      <column name="DESCRIPTION" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <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="OBJECT_TYPE" value="Product"/>
+      <column name="DESCRIPTION" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="LANG" value="deu"/>
       <column name="OBJECT_ROWID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
-      <column name="OBJECT_TYPE" value="Product"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/district.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/district.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c520cdad366e1bd3df89840b190bc99eb770c6c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/district.xml
@@ -0,0 +1,51 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="ec5e2484-6162-4455-9356-fede3aeb8002">
+    <delete tableName="district"/>
+    <insert tableName="district">
+      <column name="DISTRICT_NAME" value="Norddeutschland"/>
+      <column name="DISTRICTID" value="08026817-e05f-469f-9a55-00fee0ec0fac"/>
+      <column name="DISTRICT_INFO" value="Hamburg"/>
+      <column name="PARENTDISTRICT_DISTRICTID" value="7fc6c55e-f4af-4f77-8c09-b6cc2d95862f"/>
+      <column name="DISTRICT_NUMBER" valueNumeric="2"/>
+      <column name="DISTRICT_FILTER" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;Addresses.CITY&quot;,&quot;operator&quot;:&quot;EQUAL&quot;,&quot;value&quot;:&quot;Hamburg&quot;,&quot;key&quot;:&quot;Hamburg&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ISO3" value="deu"/>
+      <column name="DISTRICT_STATUS" valueNumeric="0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:25:04"/>
+    </insert>
+    <insert tableName="district">
+      <column name="DISTRICT_NAME" value="MAB"/>
+      <column name="DISTRICTID" value="502d71dd-a26a-41b9-a762-8c5bde80ca4e"/>
+      <column name="DISTRICT_INFO" value="Maschinen- und Anlagenbau"/>
+      <column name="DISTRICT_NUMBER" valueNumeric="4"/>
+      <column name="DISTRICT_FILTER" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;#EXTENSION.ClassificationType_filter.d67397c5-5e05-433b-b61d-12807906aa5a#TEXT&quot;,&quot;operator&quot;:&quot;EQUAL&quot;,&quot;value&quot;:&quot;Maschinen und Anlagen&quot;,&quot;key&quot;:&quot;3eb18b76-f51e-4ad2-9080-74b4a603667b&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ISO3" value="deu"/>
+      <column name="DISTRICT_STATUS" valueNumeric="0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:29:18"/>
+    </insert>
+    <insert tableName="district">
+      <column name="DISTRICT_NAME" value="Deutschland"/>
+      <column name="DISTRICTID" value="7fc6c55e-f4af-4f77-8c09-b6cc2d95862f"/>
+      <column name="DISTRICT_INFO" value="Deutschland Gesamt"/>
+      <column name="DISTRICT_NUMBER" valueNumeric="1"/>
+      <column name="DISTRICT_FILTER" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;#EXTENSION.ClassificationType_filter.037a9de1-fa6d-4895-9db3-82f7769682ae#TEXT&quot;,&quot;operator&quot;:&quot;EQUAL&quot;,&quot;value&quot;:&quot;Deutschland&quot;,&quot;key&quot;:&quot;b7b763d4-994d-483d-9a1c-6eb85786d61a&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ISO3" value="deu"/>
+      <column name="DISTRICT_STATUS" valueNumeric="0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:18:23"/>
+    </insert>
+    <insert tableName="district">
+      <column name="DISTRICT_NAME" value="München"/>
+      <column name="DISTRICTID" value="eef5f9a1-c849-4530-8068-1927d2b0e4d7"/>
+      <column name="PARENTDISTRICT_DISTRICTID" value="7fc6c55e-f4af-4f77-8c09-b6cc2d95862f"/>
+      <column name="DISTRICT_NUMBER" valueNumeric="3"/>
+      <column name="DISTRICT_FILTER" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;Addresses.CITY&quot;,&quot;operator&quot;:&quot;EQUAL&quot;,&quot;value&quot;:&quot;München&quot;,&quot;key&quot;:&quot;München&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="ISO3" value="deu"/>
+      <column name="DISTRICT_STATUS" valueNumeric="0"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:28:09"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/districtresponsible.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/districtresponsible.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b7363d7442becdeaddea847e15b15152bb51ba5d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/districtresponsible.xml
@@ -0,0 +1,34 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="cb1c6baa-9478-45d3-9476-c72d6a8cbf50">
+    <delete tableName="districtresponsible"/>
+    <insert tableName="districtresponsible">
+      <column name="DISTRICTRESPONSIBLEID" value="79423e23-9079-4d60-98ae-efb08c082f32"/>
+      <column name="DISTRICT_ID" value="08026817-e05f-469f-9a55-00fee0ec0fac"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="EMPLOYEE_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:31:52"/>
+    </insert>
+    <insert tableName="districtresponsible">
+      <column name="DISTRICTRESPONSIBLEID" value="83117f7a-b0b2-4cc9-b654-3d4833e9bd34"/>
+      <column name="DISTRICT_ID" value="eef5f9a1-c849-4530-8068-1927d2b0e4d7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="EMPLOYEE_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:28:58"/>
+    </insert>
+    <insert tableName="districtresponsible">
+      <column name="DISTRICTRESPONSIBLEID" value="ddeb50e7-b838-45a7-99ed-75053a0201c9"/>
+      <column name="DISTRICT_ID" value="7fc6c55e-f4af-4f77-8c09-b6cc2d95862f"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="EMPLOYEE_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:21:13"/>
+    </insert>
+    <insert tableName="districtresponsible">
+      <column name="DISTRICTRESPONSIBLEID" value="e4a51357-23dd-4904-b62e-7cccaaa6eb2c"/>
+      <column name="DISTRICT_ID" value="502d71dd-a26a-41b9-a762-8c5bde80ca4e"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="EMPLOYEE_CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T08:30:33"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplate.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplate.xml
index e0670297737097a47c62189e485b21b67600a503..3edae4a9772c175a79b80dbcba86e576b40c2274 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplate.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplate.xml
@@ -1,107 +1,107 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="bf3a07e0-44e0-4712-bd42-a17f949675b0">
-        <delete tableName="documenttemplate"/>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Angebotskopftext mit Dank"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Erstkontakt ADITO"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Standardbriefvorlage"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Erstkontakt meineFirma"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Kostenübernahmeerklärung"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Geschaeftspapiere"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Telefonkonferenz-Einladung"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Angebotsfußtext mit Dank"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="footer_meineFrima"/>
-            <column name="REPLACEMENTNAME" value="footermeineFirma"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <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="NAME" value="Rahmenvertrag"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="documenttemplate">
-            <column name="CLASSIFICATION" value="2"/>
-            <column name="DATE_NEW" valueDate="2020-03-24T14:50:41"/>
-            <column name="DOCUMENTTEMPLATEID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
-            <column name="ISOLANGUAGE" value="deu"/>
-            <column name="KIND" value="MAI"/>
-            <column name="NAME" value="Angebotsanfrage"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-    </changeSet>
+  <changeSet author="autogenerated" id="895063dd-6f2e-4a52-ab28-f004cca7dff4">
+    <delete tableName="documenttemplate"/>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="TEX"/>
+      <column name="NAME" value="Angebotskopftext mit Dank"/>
+      <column name="CLASSIFICATION" value="3"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:07:01"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="MAI"/>
+      <column name="NAME" value="Erstkontakt ADITO"/>
+      <column name="CLASSIFICATION" value="2"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:03:43"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="LET"/>
+      <column name="NAME" value="Standardbriefvorlage"/>
+      <column name="CLASSIFICATION" value="1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:03:22"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="MAI"/>
+      <column name="NAME" value="Erstkontakt meineFirma"/>
+      <column name="DESCRIPTION" value="Diese Email wird an Interessenten versendet, um ihnen erste Informationen zukommen zu lassen."/>
+      <column name="CLASSIFICATION" value="2"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T06:59:35"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="LET"/>
+      <column name="NAME" value="Kostenübernahmeerklärung"/>
+      <column name="CLASSIFICATION" value="1"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:03:08"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="LET"/>
+      <column name="NAME" value="Geschaeftspapiere"/>
+      <column name="CLASSIFICATION" value="2"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:02:46"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="MAI"/>
+      <column name="NAME" value="Telefonkonferenz-Einladung"/>
+      <column name="CLASSIFICATION" value="2"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:00:37"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="TEX"/>
+      <column name="NAME" value="Angebotsfußtext mit Dank"/>
+      <column name="CLASSIFICATION" value="4"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:10:02"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="REPLACEMENTNAME" value="footermeineFirma"/>
+      <column name="KIND" value="TEX"/>
+      <column name="NAME" value="footer_meineFrima"/>
+      <column name="DESCRIPTION" value="Fußtext mit Logo, Informationen und Links zu meineFirma."/>
+      <column name="CLASSIFICATION" value="7"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:01:34"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="ATT"/>
+      <column name="NAME" value="Rahmenvertrag"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T07:04:35"/>
+    </insert>
+    <insert tableName="documenttemplate">
+      <column name="DOCUMENTTEMPLATEID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="KIND" value="MAI"/>
+      <column name="NAME" value="Angebotsanfrage"/>
+      <column name="CLASSIFICATION" value="2"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-03-24T02:50:41"/>
+    </insert>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplatelink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplatelink.xml
index bc4b2e4b8359d11154d4e9cb2240d9daab7c3f67..9f02bd22716c67e7f4a325000fb80ea34c6b39d1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplatelink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplatelink.xml
@@ -1,20 +1,20 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="17856652-ace7-45c3-9f9f-640e8ed24fe3">
+  <changeSet author="autogenerated" id="00e5216b-c7a5-4c08-a60c-22d1ebf89d17">
     <delete tableName="documenttemplatelink"/>
     <insert tableName="documenttemplatelink">
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="DOCUMENTTEMPLATELINKID" value="b6704427-602c-4e5b-8e57-5207136e0413"/>
-      <column name="DOCUMENTTEMPLATE_ID_CHILD" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
       <column name="DOCUMENTTEMPLATE_ID_PARENT" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+      <column name="DOCUMENTTEMPLATE_ID_CHILD" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
     <insert tableName="documenttemplatelink">
-      <column name="DATE_NEW" valueDate="2020-06-26T00:00:00"/>
       <column name="DOCUMENTTEMPLATELINKID" value="f55b35f4-c915-455a-9e18-70f1709ea72b"/>
-      <column name="DOCUMENTTEMPLATE_ID_CHILD" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
       <column name="DOCUMENTTEMPLATE_ID_PARENT" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="DOCUMENTTEMPLATE_ID_CHILD" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
index dd6292ff8c823888bb0e0c86990b1ff464df95d6..b7f09032ef0bc8ba4392684da6df39b3a3f34548 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
@@ -1,105 +1,106 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b3af9285-63cc-4bc1-abf6-58091e18d10f"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0003e431-4355-4de5-aae8-2e08cf0703c9"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="78227d81-7af4-4f6c-95f0-348b87e8862e"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b4fafa76-73f2-43ee-8a88-12d30946f1bb"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="256dad02-7433-45b3-9584-ec335e0bdcab"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="98022888-3232-4688-a2f5-17efdf440e85"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="97233a7f-d454-4cd3-8ead-49e3caa820a0"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0938ed90-7191-48b4-81b9-daf9244bbe71"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0c546f3e-11bb-4fbf-b2f0-a06bf36f55fa"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="32259cb7-f9ec-407b-9f91-807049ab013f"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="95985522-1197-4ba6-8e48-6f3eab25510a"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="464d1fa7-6a07-4ed0-8d4b-46e394cc4d56"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="9a2f13e5-68d9-4db4-919e-f9ee89c79439"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="1dcf4e02-79ad-463d-8956-a3886eba9546"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="f43bc91d-7fc1-4549-8a41-903c62673e43"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ebbec7a2-a396-424a-aab5-1726254fc2e9"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="7fa4140f-7489-416e-83df-459f36628917"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="6329678a-70cf-4216-b529-99c90524fdb2"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
-            <column name="PLACEOFUSE" value="Organisation"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ca93ae0d-bd78-44a6-b781-e060da44e17e"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
-            <column name="PLACEOFUSE" value="Person"/>
-        </insert>
-        <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
-            <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="8e40cdb0-6754-4b88-b779-a10d354edcf7"/>
-            <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
-            <column name="PLACEOFUSE" value="Offer"/>
-        </insert>
-    </changeSet>
-</databaseChangeLog>
+  <changeSet author="autogenerated" id="f40ae58d-f9bd-4aba-877a-3296c5af7b57">
+    <delete tableName="documenttemplateplaceofuse"/>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0003e431-4355-4de5-aae8-2e08cf0703c9"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0938ed90-7191-48b4-81b9-daf9244bbe71"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0c546f3e-11bb-4fbf-b2f0-a06bf36f55fa"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="1dcf4e02-79ad-463d-8956-a3886eba9546"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="256dad02-7433-45b3-9584-ec335e0bdcab"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="32259cb7-f9ec-407b-9f91-807049ab013f"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="464d1fa7-6a07-4ed0-8d4b-46e394cc4d56"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="6329678a-70cf-4216-b529-99c90524fdb2"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="78227d81-7af4-4f6c-95f0-348b87e8862e"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="7fa4140f-7489-416e-83df-459f36628917"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+      <column name="PLACEOFUSE" value="Offer"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="8e40cdb0-6754-4b88-b779-a10d354edcf7"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="95985522-1197-4ba6-8e48-6f3eab25510a"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="97233a7f-d454-4cd3-8ead-49e3caa820a0"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="98022888-3232-4688-a2f5-17efdf440e85"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="9a2f13e5-68d9-4db4-919e-f9ee89c79439"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b3af9285-63cc-4bc1-abf6-58091e18d10f"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b4fafa76-73f2-43ee-8a88-12d30946f1bb"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ca93ae0d-bd78-44a6-b781-e060da44e17e"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+      <column name="PLACEOFUSE" value="Person"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ebbec7a2-a396-424a-aab5-1726254fc2e9"/>
+    </insert>
+    <insert tableName="documenttemplateplaceofuse">
+      <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+      <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="f43bc91d-7fc1-4549-8a41-903c62673e43"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvo.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvo.xml
index 0f3a1840823cc440e1f4b758bcb1887a6e09163a..00fe7cc3efa6bf686c8dbe66a3ae4c39a5730a01 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvo.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvo.xml
@@ -1,1384 +1,1384 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="f74c5d61-ca3b-43cd-a5d8-6f8d65c6fb0c">
+  <changeSet author="autogenerated" id="377e3790-2edd-4465-9db9-0ebf5b9a5095">
     <delete tableName="dsgvo"/>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:05:43"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="04bd12aa-d5a6-4c83-b3fa-4155008a2f9c"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:05:43"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:26"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="04ee4f0c-0d40-49e2-984d-fbca4d4adbf5"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2023-11-14T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:26"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2023-11-14T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:18:00"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="056930c0-2eb8-4c04-a467-72caff2813b6"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="4ba08e1c-7094-412c-b4a4-210a330f6d71"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:18:00"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="4ba08e1c-7094-412c-b4a4-210a330f6d71"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:11:54"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="0675a250-3145-42e0-ae9d-1589db5bdaaf"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:11:54"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:58:34"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:27:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="09a62d74-866e-4370-bec8-04d09028bcc4"/>
-      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:58:34"/>
+      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:27:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:54:28"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="0efa86aa-28c7-4201-9733-3be3e4556705"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-14T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:54:28"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="af5ac56e-a0e2-4693-b92b-7ea275721372"/>
+      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-14T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:03:43"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="0f468c3f-9d96-4fc1-b702-f6df2a7dbae6"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:03:43"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:03:59"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="0fbb3a7d-d20f-4fe1-bead-db8015f1913a"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="58d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:03:59"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="58d01219-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:02"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="106d5c23-2afe-45ea-860c-fa92489aa5f8"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:02"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:28:48"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="19b1bab3-7073-47fb-93a5-936fb8e4b3d2"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:28:48"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:58:25"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="1c836321-afe8-40bb-919b-4aa772ea4a6b"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:58:25"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:10:22"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="1d399e11-e3d0-4319-b4ad-50485a19dea2"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:10:22"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:34:13"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="1dcc0c19-75fa-4055-9d3e-7469c6f97672"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:34:13"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:55:46"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="211213ae-943a-4f28-986a-a3ab7bc429ae"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="5270133a-a59a-41c0-a812-2618c7557215"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:55:46"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="5270133a-a59a-41c0-a812-2618c7557215"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:13:53"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="234691e7-3ca9-48f0-a374-5f5d55b63445"/>
-      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:13:53"/>
+      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:04:25"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="23a744ab-b203-435b-8100-fe02587602d0"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="14d05619-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:04:25"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="14d05619-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:52"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="28a96745-50d5-4820-ac6b-7bcb01e07af2"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:52"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:10:44"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="2e42e6cd-2f7a-4ca5-b14f-9a0ed7d82694"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:10:44"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:36:41"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="314df6d4-0098-4b77-9e97-92e5f0d12535"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d721d57c-7cb0-45ee-a12f-982ec4efb62c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:36:41"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d721d57c-7cb0-45ee-a12f-982ec4efb62c"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:21:21"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="33ea7122-84bd-41b8-8231-51dd64ac6f93"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:21:21"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:09:28"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="369ae4bd-e6d2-4792-add3-77eb2ee4d5ca"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:09:28"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:02"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="3ce75887-f859-4df8-8ea2-e56ca31e74bf"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:02"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:25:50"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:22:47"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="42c9409a-5176-43fe-b8fd-4dded90f93ad"/>
-      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="PURPOSE" value="DSGVOADS"/>
-      <column name="ROW_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:25:50"/>
+      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:22:47"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:14:12"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="4a6e2dd5-cbf8-45f8-9546-152c73fc73b4"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:14:12"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:45:40"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="4e1e9d77-53e5-4805-91a3-69127e96f45a"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:45:40"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:58:45"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="5233c17e-d4e7-49ad-8594-6bb4706c0d88"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:58:45"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:56:11"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="52d25355-29c5-4b41-a5bb-4496b2fd1b3e"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:56:11"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:02:26"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="582c1721-8efa-4d21-bcdd-5199eca01a7b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:02:26"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:21:14"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="599403df-754b-4d93-bfe2-3e8e7d4d2633"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="ecb6313a-3663-45b0-80db-453a43eb0d0d"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:21:14"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ecb6313a-3663-45b0-80db-453a43eb0d0d"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:03"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="5a6fdfa7-9f75-4eaa-8c5d-e81836ef1d31"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:03"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:04:43"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="5d30593a-d3f1-45b6-be69-7bd3c3efa54b"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:04:43"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:02:08"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="5f7ead22-10a9-447c-82c8-850881f179be"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d6a0723c-5e4d-4771-8808-79b510e864cb"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:02:08"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d6a0723c-5e4d-4771-8808-79b510e864cb"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:46"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="5fac03b6-10e5-4cfd-b889-21920b91d981"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:56:46"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:11:06"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="60ae12ad-befd-451d-bab7-90ca4329faa4"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="ddcc3940-fdb2-49b1-8812-1e7d2ecf2598"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:11:06"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ddcc3940-fdb2-49b1-8812-1e7d2ecf2598"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:10:17"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:50:43"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="62213c13-1462-4fa2-8355-97f59a81640e"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2023-11-08T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:50:43"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
+      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2023-11-08T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:06:40"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="6605f260-6540-491d-a650-95469f742206"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2027-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:06:40"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2027-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:41"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="715da210-7de6-474d-84f5-765b8fc07ffc"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="22d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2021-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:41"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="22d01219-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2021-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:44:20"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7363cf90-0e3f-4417-a748-b929c1c0b417"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:44:20"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:02:39"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="76cabafa-30ac-4926-97c4-9e89a718301b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:02:39"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:58:59"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7a088406-3629-4da4-b18b-228aa932f0dd"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d0629982-5797-4eda-b36b-a58d2fc551ec"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:58:59"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d0629982-5797-4eda-b36b-a58d2fc551ec"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:37:04"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7aece091-dfa4-48f2-bec9-d98d755c7e4a"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:37:04"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:08:47"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7c8aeec0-b7be-4122-9150-f0933176cf01"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-07T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:08:47"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-07T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:05"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7dfa8520-6046-4797-8940-80365c6e9656"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:05"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:04"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="7e1f5ad1-c265-4779-a8d6-a524deafe75e"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:04"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:26"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="8030b2e3-71d7-4383-a179-9ce98fbca092"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:26"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:07:13"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="8048338e-03c3-4e53-bf6d-36b4ca49b0c2"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:07:13"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:17:36"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="81db0957-1a05-4921-87bd-985331a78731"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:17:36"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T01:24:49"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="82dda6d8-8870-4d37-8167-d590e1d51ad0"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOADS"/>
-      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-30T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T01:24:49"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-30T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:11:47"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="849b4cf4-3d68-4797-9f59-e1c6c70bfb4f"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:11:47"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:21:38"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="87517c3e-8d43-4da6-8816-32af7e9b33ac"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="106b7d14-8973-4122-a9af-4ece26f4fd73"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:21:38"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="106b7d14-8973-4122-a9af-4ece26f4fd73"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:21"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="87e72010-ddcc-48a7-9b80-b8ef021f4222"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="7c3ba80d-52ee-4275-a6b3-3afad4fb59b9"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2023-11-09T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:21"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="7c3ba80d-52ee-4275-a6b3-3afad4fb59b9"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2023-11-09T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
     </insert>
-    <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:04:48"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
+    <insert tableName="dsgvo">
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="88e1d8a3-9b86-4316-ae00-d71102900d09"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:04:48"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:43:52"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="8a5cc591-31ae-4cad-9bec-47ab49f07156"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="b986e88b-d637-47e5-8553-addbd8b31488"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:43:52"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="b986e88b-d637-47e5-8553-addbd8b31488"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:57:11"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="8be7973a-0e1c-4e86-ab33-96b16f3dab18"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:57:11"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:55:56"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:43:34"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="8e66d62d-3d03-46d1-85e5-ce34f289906c"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:43:34"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:43:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:08:23"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="905dad1c-b539-4836-9e79-50a7de5ddf6b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="e0662d2c-ea02-4796-8783-a5ad4a8683fe"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-09T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:08:23"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e0662d2c-ea02-4796-8783-a5ad4a8683fe"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-09T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:02"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="91bd44c6-0767-438b-b91c-9c5bc81795f3"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="7ff7d10a-41ba-4c6e-8c78-c47bd8df7579"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:02"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="7ff7d10a-41ba-4c6e-8c78-c47bd8df7579"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:02:10"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="92391423-29d3-437e-bba3-ade28c25bb3f"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:02:10"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:03:40"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="9600335c-a726-49e3-990a-1b9c42d53ff0"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-23T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:03:40"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-23T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:24:11"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="98e053e6-cce6-41fa-944d-f49087c0317d"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:24:11"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:35"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="9a046718-1dc4-4f5f-ae24-c38879d80b5d"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-10T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:35"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-10T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:03:45"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="9b1e6393-da94-47eb-9681-c39a87a57934"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-09T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:03:45"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-09T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:03:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:29:10"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="9b8c9d82-3617-4668-ab8e-43ed2473d242"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:29:10"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:59:30"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="9be8a5ac-5f56-473a-9f85-b8bf69055c68"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="98bb2c06-db4c-4188-9676-67fb32881a1f"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:59:30"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="98bb2c06-db4c-4188-9676-67fb32881a1f"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:59"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="9dc03519-9192-41c8-b022-66c7ddee3017"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:40:59"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:15:29"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="a039f1de-1d62-487d-85d6-4b9549daf511"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="f95dfa47-a5ff-407a-9c1c-826c5aa72c72"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:15:29"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="f95dfa47-a5ff-407a-9c1c-826c5aa72c72"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:22:55"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:22:47"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="a2433fd9-0e04-409e-8275-d3fcd7c543f4"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:22:55"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
+      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2019-11-30T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:22:47"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:18"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="a823a345-1fba-483a-a5a6-ad3dc5f0a7a9"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="949aae5e-2546-437b-af27-0ac1b18d3970"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-23T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:06:18"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="949aae5e-2546-437b-af27-0ac1b18d3970"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-23T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:05:38"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:05:07"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="aaf42438-36d4-41b1-87b8-ddff78495244"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:05:07"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:03:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:33:42"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="ace78b90-1900-4b28-8374-9a1ac4ffd045"/>
+      <column name="PURPOSE" value="DSGVOINTEREST"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:33:42"/>
       <column name="DSGVOTYPE" value="TYPE_NAME"/>
-      <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:20:31"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="ae8a092a-44bf-4ca2-a528-725cadbd56ab"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:20:31"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:20:26"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:07:49"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="b06700e7-aa36-4105-8cfd-239a8ca1c1af"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:07:49"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:09:49"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="b2b9b066-c011-4e98-aef5-a64a2f00a446"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-15T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:09:49"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-15T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:02:05"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="b4539a30-645d-46a9-8541-4ee153a0a93e"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="8600ac7a-7b4a-4db5-8f43-9c104604f423"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:02:05"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="8600ac7a-7b4a-4db5-8f43-9c104604f423"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:15:09"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="b5fb15bf-5831-4759-a590-5269d0db50a2"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="b7a11507-0a52-46e4-bef4-f9bce325844f"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2023-11-15T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:15:09"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="b7a11507-0a52-46e4-bef4-f9bce325844f"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2023-11-15T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:59:52"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="b7ebeae3-b2dc-4832-8e29-91f119f2a477"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:59:52"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:14:38"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="b93ca9a1-ea30-4380-82f0-f2f2e000352c"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="6de0cb05-ebf3-4884-ba21-85117fc95dd7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:14:38"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="6de0cb05-ebf3-4884-ba21-85117fc95dd7"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:54:51"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="ba8892ba-b0a4-4e88-ae41-3d3289b1e68a"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d32b5d16-3136-49ff-8c6c-71b7fe501552"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-10T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:54:51"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d32b5d16-3136-49ff-8c6c-71b7fe501552"/>
+      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-10T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T03:50:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:59:21"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="bad6f84f-94a0-4b5e-8a93-78301aef5c94"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d395f5eb-ff5f-4cd6-9e52-04066349d523"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:59:21"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d395f5eb-ff5f-4cd6-9e52-04066349d523"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:37:29"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="bb96556b-4673-4a21-a157-e0a3cf683343"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:37:29"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:33:36"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:30:55"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="bc0b2645-dfac-45c7-b3d1-7a6c9e299238"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="a7cd429f-b81c-4bfe-9aa1-06d77d728812"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:30:55"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="a7cd429f-b81c-4bfe-9aa1-06d77d728812"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:40"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="bc31e8d5-d674-4b32-bec9-c5dea9f86f99"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-11T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:48:40"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-11T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:56:37"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="bc93bbb0-7f19-4a4d-8a11-293acf5a6421"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:56:37"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:08:43"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="be12b2d9-d9b0-4e0a-a091-d7ebfc056201"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:08:43"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:15:57"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="c497f993-f768-4127-a609-0ca9b689d44b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:15:57"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:41:20"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="c737115f-3f5b-449d-905d-a9e2cb610952"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="14d01219-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:41:20"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="14d01219-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:11:17"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="c73795f2-8240-4a40-b81b-fac269a7cf50"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:11:17"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:07:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:01:46"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="cb413cc3-087d-4f30-887b-e4e9c5903ca9"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-02T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:01:46"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-02T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:01:40"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:01:51"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="cb8517c0-3d64-4d87-9b60-e824d5aeee1f"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:01:51"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:45"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="cbe02663-bd3f-41f1-9465-83d2ad3ab86b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="f31e7b32-cc81-4b6a-868f-e9f4879dcee3"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:12:45"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="f31e7b32-cc81-4b6a-868f-e9f4879dcee3"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:11:42"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:49:44"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="cdfff3f2-d5e0-4c99-9a5c-d25cd5b03aa1"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:49:44"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-18T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:53:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:44:56"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="d472dfd8-7022-4da2-a544-6349dc6509ee"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:44:56"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:54"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="db9b3ed2-b682-49f5-81ff-0c0d803f6623"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2023-11-15T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:46:54"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2023-11-15T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:44:49"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:16:53"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="dcb948ef-d09b-4678-a3f3-2a7470dda81a"/>
-      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:16:53"/>
+      <column name="DSGVOTYPE" value="TYPE_ATTR"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:11:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:57:11"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="decb41e4-312c-4266-bd11-8826d55fcd87"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="a8dca1e8-f787-446b-b065-8089322b0402"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:57:11"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="a8dca1e8-f787-446b-b065-8089322b0402"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T07:51:59"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:18:47"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="e026f337-922d-411a-a212-97536f35629b"/>
-      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:18:47"/>
+      <column name="DSGVOTYPE" value="TYPE_COMM"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:17:30"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:32:19"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="e9efdc04-a24e-4755-a3cb-dc751c201457"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:32:19"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:14:52"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
       <column name="DSGVOID" value="ea7c493d-7f18-4768-afe0-5a145937e82c"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONSENT"/>
+      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:14:52"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-24T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:14:48"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:00:18"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="ed2a38da-894e-4a9d-8611-c6177e721a00"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:00:18"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T04:01:45"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="ef8defee-d85d-4a84-83f7-643e0ef64ddc"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T04:01:45"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:01:37"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:01:15"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="f53458cf-dcba-4e0a-a06d-26810bfdcde0"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:01:15"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T04:58:18"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T09:09:26"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="f593030e-4f07-45f1-b64b-1d63b0f1e045"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVONEWS"/>
-      <column name="ROW_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T09:09:26"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T09:06:46"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:41:38"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="f7ba18de-ca9f-4084-bded-c4e555d3960e"/>
-      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:41:38"/>
+      <column name="DSGVOTYPE" value="TYPE_ADDRESS"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:38:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T03:59:48"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="f97dc957-3dbf-41c5-9334-45552930162d"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T03:59:48"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-16T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T01:24:28"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:26:42"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="fa987d76-2ec3-4a0e-be60-6e000b9c1352"/>
-      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:26:42"/>
+      <column name="DSGVOTYPE" value="TYPE_NAME"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:26:34"/>
     </insert>
     <insert tableName="dsgvo">
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T05:04:09"/>
-      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
+      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
       <column name="DSGVOID" value="fae320aa-8cc1-4000-9dc0-05a267f7eb84"/>
-      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="PURPOSE" value="DSGVOINTEREST"/>
-      <column name="ROW_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-      <column name="STATUORITYSOURCE" value="DSGVOCONTRACT"/>
+      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T05:04:09"/>
+      <column name="DSGVOTYPE" value="TYPE_BIRTH"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="ROW_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VALID_TO" valueDate="2022-11-17T12:00:00"/>
+      <column name="DATE_NEW" valueDate="2019-11-25T05:01:43"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
index 3833595792a7081d91668f501d94935763a0814f..9d3ad487ecbb0c6f2e9ff10365b7a8a53f5228a0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
@@ -1,12 +1,12 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="12efdf16-b433-4e71-b204-b215e17149f3">
+  <changeSet author="autogenerated" id="0382d26e-d391-49d0-9ddc-48b8314d2883">
     <delete tableName="dsgvoinfo"/>
     <insert tableName="dsgvoinfo">
-      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
+      <column name="TRANSMISSION" value="DSGVONONE"/>
       <column name="DATASOURCE" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
       <column name="DSGVOINFOID" value="6b117aad-02f4-4746-985a-de931059b72e"/>
-      <column name="TRANSMISSION" value="DSGVONONE"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
index c68b0f2baaa28d6c55c52996768f2260aecbb83b..d9a1e3cecf4bfc4cb479a81966d895d42aaab8a1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
@@ -20,7 +20,7 @@
             <column name="FILTER_NAME" value="OrganisationDuplicates" />
             <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
             <column name="ID_FIELD_NAME" value="CONTACTID" />
-            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;key&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;contenttype&quot;:&quot;LONG_TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
+            <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;se\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;key&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;contenttype&quot;:&quot;LONG_TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
             <column name="USER_NEW" value="Admin" />
             <column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
             <column name="USER_EDIT" value="Admin" />
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicatescanner.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicatescanner.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7e0ec1fa96fce602e301bd969d9c6d40236ca8c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicatescanner.xml
@@ -0,0 +1,30 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="1e234cd9-4ae8-4b7f-9e10-503494099a89">
+    <delete tableName="duplicatescanner"/>
+    <insert tableName="duplicatescanner">
+      <column name="FILTER_NAME" value="OrganisationDuplicates"/>
+      <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
+      <column name="ENTITY_TO_SCAN_NAME" value="Organisation_entity"/>
+      <column name="ID" value="8fa3ab66-cc01-45b6-88f3-a9e76bad7db0"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="ID_FIELD_NAME" value="CONTACTID"/>
+      <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;key&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;contenttype&quot;:&quot;LONG_TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+    </insert>
+    <insert tableName="duplicatescanner">
+      <column name="FILTER_NAME" value="PersonDuplicates"/>
+      <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2020-06-26T12:00:00"/>
+      <column name="ENTITY_TO_SCAN_NAME" value="Person_entity"/>
+      <column name="ID" value="a8363f75-dc0a-412c-afe1-80ebacc26744"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="ID_FIELD_NAME" value="CONTACTID"/>
+      <column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Person_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;FIRSTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;LASTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-06-26T12:00:00"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
index 9888701686c1f41e1da247fc2eda1fa890fae2ae..8a24b9cb3fae33d06380a2b48bf480c4683f41b9 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
@@ -1,56 +1,53 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-    <insert tableName="EXPORTTEMPLATE">
-      <column name="EXPORTTEMPLATEID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
-      <column name="TITLE" value="Personen mit Anschriften"/>
-      <column name="FIELDSEPARATOR" value="semicolon"/>
-      <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
+  <changeSet author="autogenerated" id="fd5c82f7-945e-4b49-9242-18fd4ba50b70">
+    <delete tableName="exporttemplate"/>
+    <insert tableName="exporttemplate">
       <column name="FIELDDELIMITER" value="quotation mark"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Addresse"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATE">
-      <column name="EXPORTTEMPLATEID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
       <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
-      <column name="TITLE" value="Firmen mit Addressen"/>
-      <column name="FIELDSEPARATOR" value="comma"/>
-      <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
-      <column name="FIELDDELIMITER" value="quotation mark"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="DESCRIPTION" value="Firmen und deren Addressen"/>
+      <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
       <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATE">
-      <column name="EXPORTTEMPLATEID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
       <column name="TITLE" value="Personen und Kontaktmöglichkeiten"/>
+      <column name="EXPORTTEMPLATEID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
       <column name="FIELDSEPARATOR" value="tabulator"/>
       <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
+      <column name="USER_NEW" value="Admin"/>
+    </insert>
+    <insert tableName="exporttemplate">
       <column name="FIELDDELIMITER" value="quotation mark"/>
-      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="ISOLANGUAGE" value="eng"/>
+      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
       <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="TITLE" value="Personen und Kontaktmöglichkeiten (Englisch)"/>
+      <column name="EXPORTTEMPLATEID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELDSEPARATOR" value="tabulator"/>
+      <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATE">
-      <column name="EXPORTTEMPLATEID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
-      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
+    <insert tableName="exporttemplate">
+      <column name="FIELDDELIMITER" value="quotation mark"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
-      <column name="TITLE" value="Personen und Kontaktmöglichkeiten (Englisch)"/>
-      <column name="FIELDSEPARATOR" value="tabulator"/>
+      <column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Addresse"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="TITLE" value="Personen mit Anschriften"/>
+      <column name="EXPORTTEMPLATEID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+      <column name="FIELDSEPARATOR" value="semicolon"/>
       <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
+      <column name="USER_NEW" value="Admin"/>
+    </insert>
+    <insert tableName="exporttemplate">
       <column name="FIELDDELIMITER" value="quotation mark"/>
-      <column name="ISOLANGUAGE" value="eng"/>
-      <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
+      <column name="DESCRIPTION" value="Firmen und deren Addressen"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="TITLE" value="Firmen mit Addressen"/>
+      <column name="EXPORTTEMPLATEID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+      <column name="FIELDSEPARATOR" value="comma"/>
+      <column name="SENTENCESEPARATOR" value="carriage return and line feed"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
index 96fc7f44feeab1a11d8951f3453defd2d24069b3..e282cf20aff5f43d1da1cf4033f063d3faf7a9dc 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
@@ -1,143 +1,144 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="acb36d07-089e-4a25-a0c2-694b06e74ae5"/>
-      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@salutation@}"/>
-      <column name="SORTING" valueNumeric="1"/>
+  <changeSet author="autogenerated" id="365f6f08-7dd5-4bff-9556-faf94de8574f">
+    <delete tableName="exporttemplatefield"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="FIELD" value="{@lastname@}"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="0804cb9a-0cfb-43d6-bd37-2680e24604b0"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="e1b5c9c8-846a-4195-af5c-09e923c1c1c6"/>
-      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@title@}"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELD" value="{@firstname@}"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="10194e81-65d8-4a12-acd3-123d6a692fba"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="34c65722-937f-4741-9c08-48a841e19527"/>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@firstname@}"/>
-      <column name="SORTING" valueNumeric="3"/>
+      <column name="FIELD" value="{@country@}"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="224cf307-fe26-4a6b-aae8-61190a2bff19"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="330bc05f-501e-4774-85bc-046347829dda"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="FIELD" value="{@salutation@}"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="300aeca0-0de8-4225-99ce-bcbb850016aa"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
       <column name="FIELD" value="{@lastname@}"/>
       <column name="SORTING" valueNumeric="4"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="330bc05f-501e-4774-85bc-046347829dda"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="224cf307-fe26-4a6b-aae8-61190a2bff19"/>
-      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@country@}"/>
-      <column name="SORTING" valueNumeric="5"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="FIELD" value="{@phone@}"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="334146d9-7950-4c59-9b07-d89eb57a0da2"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="e9f1cd83-5652-4f5b-913b-40dea9eda1c8"/>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@region@}"/>
-      <column name="SORTING" valueNumeric="6"/>
+      <column name="FIELD" value="{@firstname@}"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="34c65722-937f-4741-9c08-48a841e19527"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="779f6222-d1e8-4ec3-953a-31cb27115b9a"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+      <column name="FIELD" value="{@address@}"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="5ebc3ae4-80dd-497e-a26e-f275769f81e4"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
       <column name="FIELD" value="{@zipCode@}"/>
       <column name="SORTING" valueNumeric="7"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="779f6222-d1e8-4ec3-953a-31cb27115b9a"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="bffb3d69-7774-438e-85b2-81fc0629462a"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="FIELD" value="{@email@}"/>
+      <column name="SORTING" valueNumeric="5"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="8fd83e1e-e2ef-499c-9425-0da511fdb6fb"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELD" value="{@salutation@}"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="a9fae3fa-e2c1-4c34-a264-e74bc93e6ac9"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
-      <column name="FIELD" value="{@address@}"/>
-      <column name="SORTING" valueNumeric="8"/>
+      <column name="FIELD" value="{@salutation@}"/>
+      <column name="SORTING" valueNumeric="1"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="acb36d07-089e-4a25-a0c2-694b06e74ae5"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="bfeb9284-6db4-4d15-a07b-9b3f21fe9c22"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELD" value="{@lastname@}"/>
+      <column name="SORTING" valueNumeric="3"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="ba303e1b-40c9-4fef-bbdf-6d16ab0dbeb0"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
       <column name="FIELD" value="{@country@}"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="bfeb9284-6db4-4d15-a07b-9b3f21fe9c22"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="c245bf8e-1d99-4d85-834c-64613bad5042"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+      <column name="FIELD" value="{@address@}"/>
+      <column name="SORTING" valueNumeric="8"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="bffb3d69-7774-438e-85b2-81fc0629462a"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
       <column name="FIELD" value="{@region@}"/>
       <column name="SORTING" valueNumeric="3"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="c245bf8e-1d99-4d85-834c-64613bad5042"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="c39bb945-ecd2-4836-9cee-002178ae9709"/>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
       <column name="FIELD" value="{@zipCode@}"/>
       <column name="SORTING" valueNumeric="4"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="c39bb945-ecd2-4836-9cee-002178ae9709"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="5ebc3ae4-80dd-497e-a26e-f275769f81e4"/>
-      <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
-      <column name="FIELD" value="{@address@}"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELD" value="{@phone@}"/>
+      <column name="SORTING" valueNumeric="4"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="cacce4e9-c9ad-4dd3-ac43-79684ef57008"/>
+    </insert>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="FIELD" value="{@email@}"/>
       <column name="SORTING" valueNumeric="5"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="d01169d3-aab0-4233-b5ec-02ede86995cf"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="e153ea76-5e68-497a-8a3e-9bb40ce734b3"/>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
       <column name="FIELD" value="{@orgname@}"/>
       <column name="SORTING" valueNumeric="1"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="e153ea76-5e68-497a-8a3e-9bb40ce734b3"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="e319ac75-3468-4167-8f0d-568a0dfaef7d"/>
-      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="FIELD" value="{@firstname@}"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+      <column name="FIELD" value="{@title@}"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="e1b5c9c8-846a-4195-af5c-09e923c1c1c6"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="0804cb9a-0cfb-43d6-bd37-2680e24604b0"/>
-      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="FIELD" value="{@lastname@}"/>
-      <column name="SORTING" valueNumeric="3"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="300aeca0-0de8-4225-99ce-bcbb850016aa"/>
-      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="FIELD" value="{@salutation@}"/>
-      <column name="SORTING" valueNumeric="1"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="334146d9-7950-4c59-9b07-d89eb57a0da2"/>
-      <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="FIELD" value="{@phone@}"/>
-      <column name="SORTING" valueNumeric="4"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="8fd83e1e-e2ef-499c-9425-0da511fdb6fb"/>
+    <insert tableName="exporttemplatefield">
       <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
-      <column name="FIELD" value="{@email@}"/>
-      <column name="SORTING" valueNumeric="5"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="10194e81-65d8-4a12-acd3-123d6a692fba"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
       <column name="FIELD" value="{@firstname@}"/>
       <column name="SORTING" valueNumeric="2"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="e319ac75-3468-4167-8f0d-568a0dfaef7d"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="ba303e1b-40c9-4fef-bbdf-6d16ab0dbeb0"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
-      <column name="FIELD" value="{@lastname@}"/>
-      <column name="SORTING" valueNumeric="3"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="a9fae3fa-e2c1-4c34-a264-e74bc93e6ac9"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
-      <column name="FIELD" value="{@salutation@}"/>
-      <column name="SORTING" valueNumeric="1"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="cacce4e9-c9ad-4dd3-ac43-79684ef57008"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
-      <column name="FIELD" value="{@phone@}"/>
-      <column name="SORTING" valueNumeric="4"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEFIELD">
-      <column name="EXPORTTEMPLATEFIELDID" value="d01169d3-aab0-4233-b5ec-02ede86995cf"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
-      <column name="FIELD" value="{@email@}"/>
-      <column name="SORTING" valueNumeric="5"/>
+    <insert tableName="exporttemplatefield">
+      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+      <column name="FIELD" value="{@region@}"/>
+      <column name="SORTING" valueNumeric="6"/>
+      <column name="EXPORTTEMPLATEFIELDID" value="e9f1cd83-5652-4f5b-913b-40dea9eda1c8"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
index 02caafcd5a95767ea02322db6a955d4dad33e511..a934feaf1a45c5fdb796bba38adf5bd4154e5f55 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
@@ -1,25 +1,26 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-    <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
-      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819"/>
-      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+  <changeSet author="autogenerated" id="a8cceeec-17f1-4b4c-a68e-92689b9ba6c9">
+    <delete tableName="exporttemplateplaceofuse"/>
+    <insert tableName="exporttemplateplaceofuse">
+      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="135975c6-6c7a-408b-93e3-f04239503ff0"/>
       <column name="PLACEOFUSE" value="Person"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
-      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="86865c59-aa8b-4511-bf3d-b069395c684d"/>
-      <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
-      <column name="PLACEOFUSE" value="Organisation"/>
-    </insert>
-    <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
-      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f"/>
+    <insert tableName="exporttemplateplaceofuse">
       <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f"/>
       <column name="PLACEOFUSE" value="Person"/>
     </insert>
-    <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
-      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="135975c6-6c7a-408b-93e3-f04239503ff0"/>
-      <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+    <insert tableName="exporttemplateplaceofuse">
+      <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819"/>
       <column name="PLACEOFUSE" value="Person"/>
     </insert>
+    <insert tableName="exporttemplateplaceofuse">
+      <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+      <column name="EXPORTTEMPLATEPLACEOFUSEID" value="86865c59-aa8b-4511-bf3d-b069395c684d"/>
+      <column name="PLACEOFUSE" value="Organisation"/>
+    </insert>
   </changeSet>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
index 99435652dc45094a4f545c9a596a696f2161916b..a47c729277f37e18dbd1ec1201c8872fea52d279 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
@@ -1,78 +1,87 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="9946d88b-33c6-4bcc-81a6-e3c27aee669a">
+  <changeSet author="autogenerated" id="d5d62ca3-5ab3-4535-921a-c6ad83d5d8f0">
     <delete tableName="forecast"/>
     <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="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="25000"/>
+      <column name="FORECASTID" value="2d5c65fe-708b-4e54-96cf-d2fcdc98001f"/>
+      <column name="DATE_START" valueDate="2020-10-29T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
-      <column name="DATE_START" valueDate="2019-05-17T02:00:00"/>
-      <column name="FORECASTID" value="2ba9de60-4c59-4441-96d8-2bee798b80fb"/>
+      <column name="VOLUME" valueNumeric="80000"/>
+      <column name="FORECASTID" value="37016eaa-ce14-45cd-8977-930cf6a20bb1"/>
+      <column name="DATE_START" valueDate="2020-12-30T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <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"/>
+      <column name="INFO" value="fc"/>
     </insert>
     <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="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VOLUME" valueNumeric="100000"/>
-    </insert>
-    <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="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="FORECASTID" value="44bc5ce9-2456-4e04-8ff1-f35f2a71798f"/>
+      <column name="DATE_START" valueDate="2020-05-23T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VOLUME" valueNumeric="250000"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
-      <column name="DATE_START" valueDate="2019-09-23T02:00:00"/>
-      <column name="FORECASTID" value="6e36057c-1cf3-442a-ab7c-d608195c4290"/>
+      <column name="VOLUME" valueNumeric="25000"/>
+      <column name="FORECASTID" value="4cc2db79-5263-4ee7-a651-00e7ecb6cc33"/>
+      <column name="DATE_START" valueDate="2020-10-22T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <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"/>
+      <column name="INFO" value="fc"/>
     </insert>
     <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="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="VOLUME" valueNumeric="150000"/>
+      <column name="FORECASTID" value="655bf6c0-713a-4738-a649-b1f6e212bd92"/>
+      <column name="DATE_START" valueDate="2021-01-28T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VOLUME" valueNumeric="100000"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
-      <column name="DATE_START" valueDate="2016-05-02T02:00:00"/>
-      <column name="FORECASTID" value="b161df55-a04b-484f-b337-5e83bf4f38d3"/>
+      <column name="VOLUME" valueNumeric="100000"/>
+      <column name="FORECASTID" value="74d72ac5-11ba-414f-a8b4-d31481e90e7f"/>
+      <column name="DATE_START" valueDate="2020-10-29T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <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"/>
+      <column name="INFO" value="W3 "/>
     </insert>
     <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="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="VOLUME" valueNumeric="100000"/>
+      <column name="FORECASTID" value="82dccf63-165f-4345-87a6-e3535ae58349"/>
+      <column name="DATE_START" valueDate="2020-05-22T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VOLUME" valueNumeric="25000"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP1"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="INFO" value="FC"/>
     </insert>
     <insert tableName="forecast">
-      <column name="DATE_START" valueDate="2017-10-03T02:00:00"/>
-      <column name="FORECASTID" value="fbddbffb-dca1-4a83-95ea-0c518ed63363"/>
+      <column name="VOLUME" valueNumeric="75000"/>
+      <column name="FORECASTID" value="9b3c76ad-5fac-4c26-af9b-3b05f097763f"/>
+      <column name="DATE_START" valueDate="2020-11-18T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="GROUPCODE" value="PRODUCTGROUP3"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="INFO" value="fc"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="VOLUME" valueNumeric="25000"/>
+      <column name="FORECASTID" value="f87ad5ed-943e-4008-a3fa-291699e3df28"/>
+      <column name="DATE_START" valueDate="2020-11-19T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VOLUME" valueNumeric="150000"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
+      <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
+      <column name="INFO" value="fc"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/letterrecipient.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/letterrecipient.xml
index 980eae9707ebefe916f3a49090208d7d29d2bdae..82c4d1293012a8e33828f81b6895c2be23e94290 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/letterrecipient.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/letterrecipient.xml
@@ -1,191 +1,191 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="2e2a85a5-ed32-49c4-9592-028dbfd46626">
+  <changeSet author="autogenerated" id="828a267a-0162-4f17-923b-eed92399a8c4">
     <delete tableName="letterrecipient"/>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="LETTERRECIPIENTID" value="005dd385-f43f-4632-ba72-66275ade78d6"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="LETTERRECIPIENTID" value="0d91e8c7-9826-44dc-9151-6f80d622b675"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="LETTERRECIPIENTID" value="13ed5820-264b-4234-8d56-93113a8fc779"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="LETTERRECIPIENTID" value="184eef7a-86aa-4008-82c0-7d460235d318"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="LETTERRECIPIENTID" value="2625270b-94f1-45dd-a1ca-c5d4488db428"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
       <column name="LETTERRECIPIENTID" value="267ce41c-c1a1-408a-bf4a-c694de882199"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="LETTERRECIPIENTID" value="2d350bbb-6fad-4fd3-8d4b-8f6f0a80b83d"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="LETTERRECIPIENTID" value="35bd730b-41c5-4124-9e37-75225ad62d34"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="LETTERRECIPIENTID" value="39fbfe6c-6b6d-4681-9303-d701699e7135"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="LETTERRECIPIENTID" value="4208507c-0a1a-41a4-8281-28c512d81ecd"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="LETTERRECIPIENTID" value="45faadcd-5e27-49d4-9360-7184f57c772d"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="LETTERRECIPIENTID" value="470ee064-fa57-40c0-a2c2-d49e23e56ef5"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="LETTERRECIPIENTID" value="66ad2562-fbba-4e31-8822-e951c910701d"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="LETTERRECIPIENTID" value="759bbc2e-3a60-4a10-bbf7-32b3fddf82a5"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="LETTERRECIPIENTID" value="7858a7a6-32f6-4cac-9fe5-9f470a1c67f0"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="LETTERRECIPIENTID" value="7d437556-56e2-4db9-adde-758664d573de"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="LETTERRECIPIENTID" value="8308b2ac-9e39-446a-8b65-44fcd6cec0d2"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="LETTERRECIPIENTID" value="858c9b55-55d7-49bb-b84e-d62b28a74965"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="LETTERRECIPIENTID" value="9cced8ce-0377-4379-a200-6d0185dde6d8"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="LETTERRECIPIENTID" value="9cea7ed1-e43f-4dc7-81ea-ee5e4a8c7222"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="LETTERRECIPIENTID" value="9ddb79fd-fa88-4fd8-ad49-befaa4a6e06b"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="LETTERRECIPIENTID" value="a3e5ed3a-dbc8-4cec-b5a2-732d9c150b60"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="LETTERRECIPIENTID" value="a4640084-a43e-49c5-b4c3-ff4f76f5a484"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="LETTERRECIPIENTID" value="a62ca319-ffca-475e-bc37-babf5b59507d"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="LETTERRECIPIENTID" value="a747794b-1716-4146-901a-2ea3cbd1dcbb"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="LETTERRECIPIENTID" value="b14acb56-114f-4f24-8b5e-a2b6c6b8273c"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="LETTERRECIPIENTID" value="b816e644-3177-4773-adde-7bf20e042cf1"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="LETTERRECIPIENTID" value="bbf2eb47-ee90-49d4-87ef-25f03ee52450"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="LETTERRECIPIENTID" value="bdf8e00e-2cd9-423f-8f82-df3da400ecdc"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="LETTERRECIPIENTID" value="bee79ca6-4519-414a-911b-200d3c5fbb80"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="LETTERRECIPIENTID" value="ce1fe220-0bb1-4159-bfd6-8d6ac34a2bab"/>
       <column name="SERIALLETTER_ID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="LETTERRECIPIENTID" value="de6392be-ef74-4a1a-b591-8235303b5659"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="LETTERRECIPIENTID" value="e08ad04a-b876-454f-8a35-39ffe4e2a52c"/>
       <column name="SERIALLETTER_ID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
+      <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="LETTERRECIPIENTID" value="f103f51a-027b-419b-8dbd-5d816712547b"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="LETTERRECIPIENTID" value="f3f6bcd1-3f4c-479c-aad9-bcf7f4da58a1"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="LETTERRECIPIENTID" value="f507d4bd-0a0f-43eb-a7e6-c63f51041075"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
     </insert>
     <insert tableName="letterrecipient">
-      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="LETTERRECIPIENTID" value="fed18481-a0b6-4953-8a5e-65ba45a683e5"/>
       <column name="SERIALLETTER_ID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
+      <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
index ae2735e5c2cb9bab001992f25aaa272109530c56..04f21548191dd510cb7c1d12e8d076c087d26bbe 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/objectmember.xml
@@ -1,116 +1,116 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="b9e5af07-4762-4252-9196-a54f8b8751ad">
+  <changeSet author="autogenerated" id="05850d31-344c-4076-828e-76685ce09ecd">
     <delete tableName="objectmember"/>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
       <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
-      <column name="OBJECTMEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="1133f149-e2d4-41b6-a4a1-1fb852104635"/>
+      <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="57c66172-4480-4925-a3e5-c506551563e1"/>
+      <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="84eb003b-c333-48a2-9679-8a135dbbc02c"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
-      <column name="OBJECTMEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="a0a9d509-d613-471b-a972-da5de4475688"/>
+      <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="b576c100-af39-43b2-ba64-d2ce05c62a9b"/>
+      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="OBJECTMEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <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"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="cd84d91a-f8fc-413b-8649-f53a7f8f3b88"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_ROWID" value="680de39f-7f1c-4dca-8c67-9c16c3395c3f"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="d5c0fef8-1a11-4c76-8683-479ca4b99804"/>
+      <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="e81a6bf2-bf1b-45f6-a4e5-f99db96af0ed"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_ROWID" value="d633ce70-5841-4a26-aaed-95980af49966"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
     <insert tableName="objectmember">
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="OBJECT_TYPE" value="Campaign"/>
       <column name="OBJECTMEMBERID" value="e8a497ce-e0d4-4a5d-9c36-618c36343d23"/>
+      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="OBJECT_ROWID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
-      <column name="OBJECT_TYPE" value="Campaign"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
index 835e1db73457bc1e844cc17af91847046fc85752..8be28d744ec1851598a06432416c573fc92450ab 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
@@ -1,290 +1,323 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="92444eb2-cca0-4ebd-883f-a030cc44e138">
+  <changeSet author="autogenerated" id="5b87aacd-f065-4b4c-8c20-2fc971cc4c39">
     <delete tableName="offer"/>
     <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="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="420.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="OFFERCODE" valueNumeric="1003"/>
+      <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="OFFERDATE" valueDate="2018-02-23T01:00:00"/>
-      <column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" value="0"/>
-      <column name="STATUS" value="OFFERSTATCHECK"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1003"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="420.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="OFFERCODE" valueNumeric="1001"/>
+      <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="OFFERDATE" valueDate="2018-08-12T02:00:00"/>
-      <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" value="50"/>
-      <column name="STATUS" value="OFFERSTATSENT"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1001"/>
       <column name="VAT" valueNumeric="79.80"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="210.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="OFFERCODE" valueNumeric="1000"/>
+      <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="OFFERDATE" valueDate="2018-11-21T01:00:00"/>
-      <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" value="100"/>
-      <column name="STATUS" value="OFFERSTATSENT"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1000"/>
       <column name="VAT" valueNumeric="39.90"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-17T09:03:46"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T09:10:08"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="192500.00"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="ADDRESS" value="Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen"/>
+      <column name="OFFERDATE" valueDate="2020-05-20T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1008"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:03:46"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATWON"/>
     </insert>
     <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="DATE_EDIT" valueDate="2019-05-23T11:33:16"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <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="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:20:44"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="25000.00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="OFFERDATE" valueDate="2020-03-16T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="OFFERCODE" valueNumeric="1013"/>
+      <column name="VAT" valueNumeric="4750.00"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
+      <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="STATUS" value="OFFERSTATOPEN"/>
-      <column name="USER_EDIT" value="Admin"/>
+    </insert>
+    <insert tableName="offer">
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="FOOTER" value="Vielen Dank!"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="VAT" valueNumeric="4750.00"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="145000.00"/>
+      <column name="ADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
+      <column name="OFFERDATE" valueDate="2020-04-06T12:00:00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="PROBABILITY" value="0"/>
+      <column name="OFFERCODE" valueNumeric="1014"/>
+      <column name="VAT" valueNumeric="0.00"/>
+      <column name="DATE_NEW" valueDate="2020-09-16T09:11:19"/>
+      <column name="LETTERSALUTATION" value="Sehr geehrte Damen und Herren,"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <insert tableName="offer">
-      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:29:52"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="53500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart"/>
+      <column name="OFFERDATE" valueDate="2020-07-06T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1011"/>
       <column name="VAT" valueNumeric="10165.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <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="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <insert tableName="offer">
-      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <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:"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:30:15"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="28500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart"/>
+      <column name="OFFERDATE" valueDate="2020-08-12T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <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="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:27:21"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="630.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="OFFERCODE" valueNumeric="1002"/>
+      <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="OFFERDATE" valueDate="2018-06-14T02:00:00"/>
-      <column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" value="75"/>
-      <column name="STATUS" value="OFFERSTATSENT"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1002"/>
       <column name="VAT" valueNumeric="119.70"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
     </insert>
     <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="DATE_EDIT" valueDate="2019-05-17T08:26:55"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:23:52"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:30:37"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="3500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart"/>
+      <column name="OFFERDATE" valueDate="2020-08-19T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1006"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:23:52"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:23:28"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="17500.00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="OFFERDATE" valueDate="2020-05-15T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1010"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:23:42"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="210.00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="OFFERDATE" valueDate="2020-05-14T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1005"/>
       <column name="VAT" valueNumeric="39.90"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="840.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="OFFERCODE" valueNumeric="1004"/>
+      <column name="ADDRESS" value="Gfk AG  Wilhelm-Straße 4 80807 München"/>
       <column name="OFFERDATE" valueDate="2017-11-09T01:00:00"/>
-      <column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" value="50"/>
-      <column name="STATUS" value="OFFERSTATCHECK"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1004"/>
       <column name="VAT" valueNumeric="159.60"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
     </insert>
     <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="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T07:21:01"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="45000.00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="OFFERDATE" valueDate="2020-03-23T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1012"/>
       <column name="VAT" valueNumeric="8550.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
     <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="DATE_EDIT" valueDate="2019-05-22T11:43:39"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:27:12"/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="VERSNR" valueNumeric="1"/>
+      <column name="OFFERID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="DATE_EDIT" valueDate="2020-09-16T09:16:12"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="175000.00"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="ADDRESS" value="Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen"/>
+      <column name="OFFERDATE" valueDate="2020-07-06T12:00:00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <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="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="OFFERCODE" valueNumeric="1009"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VERSNR" valueNumeric="1"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:27:12"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
index be7cec5a9e3d8c6a292a524781a3c18dccdafda4..06d2014637a63a334113a341736f58795fda6614 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
@@ -1,492 +1,502 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="fb66eb21-7b8a-4190-9254-83f1f5e19a88">
+  <changeSet author="autogenerated" id="baf9b40f-da28-42c6-a194-f190623feb16">
     <delete tableName="offeritem"/>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="ITEMPOSITION" value="1.3"/>
-      <column name="ITEMSORT" valueNumeric="8"/>
       <column name="OFFERITEMID" value="092eb124-8cc1-456e-a5e8-dacdba4abc15"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="8"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
+      <column name="ITEMPOSITION" value="1.3"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.1"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="ITEMSORT" valueNumeric="7"/>
       <column name="OFFERITEMID" value="0f42ddc3-717d-4844-9f96-8dbab2800c24"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
+      <column name="ITEMPOSITION" value="1.2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Gipsplatten"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="178c6049-0b01-4f5b-8431-08ef637f9c97"/>
-      <column name="OFFER_ID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="ITEMPOSITION" value="1.3"/>
-      <column name="ITEMSORT" valueNumeric="7"/>
       <column name="OFFERITEMID" value="1b70642f-dc5a-4073-b10a-2eeb52f4dbba"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
+      <column name="ITEMPOSITION" value="1.3"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="1e935422-82b7-4d2b-8f78-749b3c8f2fc3"/>
-      <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <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="QUANTITY" valueNumeric="10.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="Stahlträger Standard"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="1f732309-fa65-4b1e-b8e0-69fa152f3537"/>
-      <column name="OFFER_ID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <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="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Ersatzteil 1"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="22f6c80c-8bd3-4b30-af56-0e080ca18f48"/>
-      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Turbolader"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="302aa616-37f7-415b-bcc7-e57e84da9d11"/>
-      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX47"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
+      <column name="ITEMPOSITION" value="1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
-      <column name="ITEMPOSITION" value="3"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
       <column name="OFFERITEMID" value="3a38dbeb-2dac-4ba6-8142-7e3a4a85f2d5"/>
-      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="ITEMPOSITION" value="3"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="42444090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="OFFER_ID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.1"/>
-      <column name="ITEMPOSITION" value="1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
       <column name="OFFERITEMID" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
+      <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="4f307ab3-8f26-4cc3-a40b-eb7b54f6bbee"/>
-      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.1"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="ITEMSORT" valueNumeric="6"/>
       <column name="OFFERITEMID" value="50cd83bc-f7ad-46aa-82a2-fca1a506c0ee"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
+      <column name="ITEMPOSITION" value="1.2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
-      <column name="ITEMPOSITION" value="1.1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="4"/>
       <column name="OFFERITEMID" value="564b5ba4-05ef-4702-b6d8-35417b94abae"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
+      <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="1000.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Gipsplatten"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="57d25821-f8a9-43e3-be6c-023e4a3039a1"/>
-      <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <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"/>
       <column name="OFFERITEMID" value="5814617f-8977-4ba4-9567-695767017848"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
+      <column name="ITEMPOSITION" value="1.1.1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
-      <column name="ITEMPOSITION" value="1.1.2"/>
-      <column name="ITEMSORT" valueNumeric="5"/>
       <column name="OFFERITEMID" value="58ce593c-a1af-41ad-91ee-df7c8a27e142"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
+      <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
       <column name="ITEMNAME" value="Service Einsatz"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="61c663b3-b1b0-4564-9534-4be4e32cb643"/>
-      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.1"/>
-      <column name="ITEMPOSITION" value="1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
       <column name="OFFERITEMID" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
+      <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
     </insert>
     <insert tableName="offeritem">
-      <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="QUANTITY" valueNumeric="1.00"/>
+      <column name="OFFERITEMID" value="76b2aed9-ef76-4682-8dcb-2f042257eedb"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="PRICE" valueNumeric="145000.00"/>
+      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+    </insert>
+    <insert tableName="offeritem">
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 1"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="82d27c88-a3da-4c64-a933-6031ec56e64a"/>
-      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <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="VAT" valueNumeric="19.00"/>
+      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
-      <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="948637d2-10eb-4962-906e-0b54496855fa"/>
-      <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX47"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
+      <column name="ITEMPOSITION" value="1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="DISCOUNT" valueNumeric="5.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="Förderanlage"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="aeaf7c50-b4c2-41ef-8e92-945ed64218e8"/>
-      <column name="OFFER_ID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="DISCOUNT" valueNumeric="5.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="10.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Vollstange"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="ba695281-f4b6-4004-aea7-40f902d4b1ac"/>
-      <column name="OFFER_ID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="bb444011-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="OFFER_ID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05caa"/>
-      <column name="OFFER_ID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
-      <column name="ITEMPOSITION" value="1.1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="4"/>
       <column name="OFFERITEMID" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
+      <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 3"/>
-      <column name="ITEMPOSITION" value="3"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
       <column name="OFFERITEMID" value="be3e3840-20ff-49be-b067-00b7f9a41786"/>
-      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="ITEMPOSITION" value="3"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
-      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+      <column name="QUANTITY" valueNumeric="5.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="dfcb49b3-e819-441a-8812-0dc1f2c57384"/>
-      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="WG2 Produkt 5"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="f81bad1d-baed-425b-8751-fd297161fdc7"/>
-      <column name="OFFER_ID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFERITEMID" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
       <column name="OFFERITEMID" value="fbfae671-be8f-468e-81a6-de3d6b002bec"/>
-      <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <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"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
-      <column name="ITEMPOSITION" value="1.1.2"/>
-      <column name="ITEMSORT" valueNumeric="6"/>
       <column name="OFFERITEMID" value="fe58567c-54f9-4194-b798-2571a5ed4e86"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
       <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
+      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
+      <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
index 631d6e9831c2fafe38303b9dc3bf00db1a669569..9edca5ffee807eb090d1402af3ba9da6ac6de0ef 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
@@ -1,210 +1,210 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="e4c18c14-05db-444e-8d2d-fb81e2d1c84a">
+  <changeSet author="autogenerated" id="d891b3f2-41c2-44db-858e-a1722cee4e8e">
     <delete tableName="organisation"/>
     <insert tableName="organisation">
-      <column name="DATE_NEW" valueDate="2019-08-29T02:43:16"/>
+      <column name="ORGANISATIONID" value="0                                   "/>
       <column name="KIND" value="ORGCUTOMER"/>
       <column name="NAME" value="privat"/>
-      <column name="ORGANISATIONID" value="0"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-29T02:43:16"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="3698"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
-      <column name="NAME" value="Bucher Unternehmensgruppe"/>
-      <column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
+      <column name="NAME" value="Lichtenstein Document Solutions GmbH&#10;"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
+      <column name="CUSTOMERCODE" value="2419"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="7878"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:26:25"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
-      <column name="INFO" value="Automobilvermietung"/>
+      <column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="Sevent SE"/>
-      <column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
+      <column name="NAME" value="meine Firma"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:24:21"/>
+      <column name="CUSTOMERCODE" value="0001"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="organisation">
-      <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="NAME" value="Netro AG"/>
-      <column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
+      <column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
+      <column name="KIND" value="ORGCUTOMER"/>
+      <column name="NAME" value="Grobbe-Werk GmbH"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:19:24"/>
+      <column name="CUSTOMERCODE" value="4758"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="3469"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:17:06"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
-      <column name="KIND" value="ORGMANUF"/>
-      <column name="NAME" value="Aquire GmbH"/>
-      <column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+      <column name="KIND" value="ORGCUTOMER"/>
+      <column name="NAME" value="Firmengruppe Matthias Bogen"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:18:19"/>
+      <column name="CUSTOMERCODE" value="4567"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="5612"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
-      <column name="NAME" value="Waken Neuser SE"/>
-      <column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
+      <column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
+      <column name="KIND" value="ORGCUTOMER"/>
+      <column name="NAME" value="JPM Touristik GmbH"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:20:35"/>
+      <column name="CUSTOMERCODE" value="4545"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="1235"/>
-      <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="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="Transatlantik Logistics GmbH"/>
-      <column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+      <column name="NAME" value="Industrial Steel AG"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T10:38:08"/>
+      <column name="CUSTOMERCODE" value="1234"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <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="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
     </insert>
     <insert tableName="organisation">
-      <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="NAME" value="Schild AG"/>
-      <column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
+      <column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="NAME" value="Kronen AG"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
+      <column name="CUSTOMERCODE" value="5874"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="4567"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:18:19"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
+      <column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="Firmengruppe Matthias Bogen"/>
-      <column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+      <column name="NAME" value="Glob Group"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:36:56"/>
+      <column name="CUSTOMERCODE" value="1212"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="3232"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:27:17"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
+      <column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="SuperBauer AG"/>
-      <column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
+      <column name="NAME" value="Transatlantik Logistics GmbH"/>
+      <column name="DATE_EDIT" valueDate="2019-05-28T08:00:12"/>
+      <column name="CUSTOMERCODE" value="1235"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <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="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="5874"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
-      <column name="NAME" value="Kronen AG"/>
-      <column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+      <column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
+      <column name="KIND" value="ORGMANUF"/>
+      <column name="NAME" value="Aquire GmbH"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:17:06"/>
+      <column name="CUSTOMERCODE" value="3469"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="0001"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:24:21"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="meine Firma"/>
-      <column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+      <column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
+      <column name="NAME" value="Pichelmaier Financial  AG&#13;&#10;"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
+      <column name="CUSTOMERCODE" value="3579"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="4545"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:20:35"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
+      <column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="JPM Touristik GmbH"/>
-      <column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
+      <column name="NAME" value="Sevent SE"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:26:25"/>
+      <column name="CUSTOMERCODE" value="7878"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="INFO" value="Automobilvermietung"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="1234"/>
-      <column name="DATE_EDIT" valueDate="2019-11-15T10:38:08"/>
-      <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="NAME" value="Industrial Steel AG"/>
-      <column name="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+      <column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+      <column name="NAME" value="Bucher Unternehmensgruppe"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
+      <column name="CUSTOMERCODE" value="3698"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="4758"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:19:24"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
+      <column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
       <column name="KIND" value="ORGCUTOMER"/>
-      <column name="NAME" value="Grobbe-Werk GmbH"/>
-      <column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
+      <column name="NAME" value="SuperBauer AG"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:27:17"/>
+      <column name="CUSTOMERCODE" value="3232"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="7691"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="NAME" value="MNF Versicherung"/>
-      <column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
+      <column name="KIND" value="ORGPARTNER"/>
+      <column name="NAME" value="Schild AG"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:37:48"/>
+      <column name="CUSTOMERCODE" value="6758"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="2419"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="NAME" value="Lichtenstein Document Solutions GmbH&#10;"/>
-      <column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
+      <column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
+      <column name="NAME" value="Waken Neuser SE"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
+      <column name="CUSTOMERCODE" value="5612"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="6983"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="NAME" value="International Kältetechnik AG&#10;"/>
-      <column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
+      <column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
+      <column name="KIND" value="ORGMANUF"/>
+      <column name="NAME" value="Netro AG"/>
+      <column name="DATE_EDIT" valueDate="2019-06-07T02:37:36"/>
+      <column name="CUSTOMERCODE" value="6354"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
     </insert>
     <insert tableName="organisation">
-      <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="NAME" value="Glob Group"/>
-      <column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
+      <column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+      <column name="NAME" value="MNF Versicherung"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
+      <column name="CUSTOMERCODE" value="7691"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="1236"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:26:56"/>
-      <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="NAME" value="Skyscraper Bau GmbH"/>
-      <column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
+      <column name="NAME" value="International Kältetechnik AG&#10;"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
+      <column name="CUSTOMERCODE" value="6983"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
     <insert tableName="organisation">
-      <column name="CUSTOMERCODE" value="3579"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="NAME" value="Pichelmaier Financial  AG&#13;&#10;"/>
-      <column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
+      <column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+      <column name="KIND" value="ORGCUTOMER"/>
+      <column name="NAME" value="Skyscraper Bau GmbH"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T06:26:56"/>
+      <column name="CUSTOMERCODE" value="1236"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <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="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/person.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/person.xml
index 4ab59795d0948898ed631214a8c9eda078bc6019..12c47e48c0f5187ac3a8091679a47b2689c51baf 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/person.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/person.xml
@@ -1,286 +1,286 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="e7d8e590-238a-4fd0-8fa7-f048263d18a6">
+  <changeSet author="autogenerated" id="42f7a5b9-f36d-4be4-89ec-07a0814f3073">
     <delete tableName="person"/>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1980-05-12"/>
-      <column name="DATE_EDIT" valueDate="2019-11-26T01:01:17"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
       <column name="FIRSTNAME" value="Peter"/>
       <column name="GENDER" value="m"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/d1dcf573078c44cf550e0567bcffd823"/>
       <column name="LASTNAME" value="Macher"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
+      <column name="DATE_EDIT" valueDate="2019-11-26T01:01:17"/>
       <column name="PERSONID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/d1dcf573078c44cf550e0567bcffd823"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <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="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Steiger"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
       <column name="PERSONID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Altinger"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
+      <column name="DATE_EDIT" valueDate="2019-05-19T08:03:46"/>
       <column name="PERSONID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1990-04-05"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/5dbfcfef4e102c68982c8dccc390f3e0"/>
       <column name="LASTNAME" value="Lustig"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T03:57:28"/>
       <column name="PERSONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/5dbfcfef4e102c68982c8dccc390f3e0"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <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="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Vortrefflich"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
       <column name="PERSONID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <column name="DATE_EDIT" valueDate="2019-11-12T02:39:57"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
       <column name="FIRSTNAME" value="Ted"/>
       <column name="GENDER" value="m"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Mausbeier"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
+      <column name="DATE_EDIT" valueDate="2019-11-12T02:39:57"/>
       <column name="PERSONID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:40:47"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:06:16"/>
       <column name="FIRSTNAME" value="Marshel"/>
       <column name="GENDER" value="m"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Ericsan"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:06:16"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:40:47"/>
       <column name="PERSONID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1994-08-03"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Kanzler"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-19T08:12:40"/>
       <column name="PERSONID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <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="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Zweistein"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
       <column name="PERSONID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1996-10-05"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/9386121ffea926a30b9fa54870968dd1"/>
       <column name="LASTNAME" value="Obermeier"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:01:51"/>
       <column name="PERSONID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/9386121ffea926a30b9fa54870968dd1"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <column name="DATE_EDIT" valueDate="2019-11-12T02:40:52"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
       <column name="FIRSTNAME" value="Lorenzo"/>
       <column name="GENDER" value="m"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="von Alpenhorn"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
+      <column name="DATE_EDIT" valueDate="2019-11-12T02:40:52"/>
       <column name="PERSONID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1993-01-20"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Grüner"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-19T08:10:37"/>
       <column name="PERSONID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
       <column name="SALUTATION" value="Monsieur"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <column name="DATE_EDIT" valueDate="2019-11-12T02:40:22"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
       <column name="FIRSTNAME" value="Robin"/>
       <column name="GENDER" value="f"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Scherbatstein"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
+      <column name="DATE_EDIT" valueDate="2019-11-12T02:40:22"/>
       <column name="PERSONID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1980-06-06"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Morgenstern"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
+      <column name="DATE_EDIT" valueDate="2019-05-19T08:18:55"/>
       <column name="PERSONID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1991-02-01"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/9052404f642301dfa02140a5dc34b592"/>
       <column name="LASTNAME" value="Pfiffig"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:02:01"/>
       <column name="PERSONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/9052404f642301dfa02140a5dc34b592"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1993-05-07"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/fb4e7cd5e2815300d1858079eadae3ca"/>
       <column name="LASTNAME" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T03:56:17"/>
       <column name="PERSONID" value="b16282bd-254e-4569-a56e-675449821467"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/fb4e7cd5e2815300d1858079eadae3ca"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <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="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Lindner"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
       <column name="PERSONID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1987-05-01"/>
-      <column name="DATE_EDIT" valueDate="2019-11-25T01:27:14"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T08:41:41"/>
       <column name="FIRSTNAME" value="Chloe"/>
       <column name="GENDER" value="f"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="TITLE" value="Dr."/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Decken"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T08:41:41"/>
+      <column name="DATE_EDIT" valueDate="2019-11-25T01:27:14"/>
       <column name="PERSONID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="TITLE" value="Dr."/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <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="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Tannenbaum"/>
+      <column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
       <column name="PERSONID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1985-05-10"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
       <column name="LASTNAME" value="Smith"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:02:10"/>
       <column name="PERSONID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="2001-05-07"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/75df8e492ebe7d8363abd71906e2c471"/>
       <column name="LASTNAME" value="Leicht"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:01:09"/>
       <column name="PERSONID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/75df8e492ebe7d8363abd71906e2c471"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
-      <column name="DATE_EDIT" valueDate="2019-11-15T08:40:17"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
       <column name="FIRSTNAME" value="Petra"/>
       <column name="GENDER" value="f"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="LASTNAME" value="Solana"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T08:40:17"/>
       <column name="PERSONID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1989-01-01"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/58d526fe1ec32f07facc7c52e04619b3"/>
       <column name="LASTNAME" value="Sommer"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:02:24"/>
       <column name="PERSONID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/58d526fe1ec32f07facc7c52e04619b3"/>
       <column name="SALUTATION" value="Frau"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="person">
       <column name="DATEOFBIRTH" valueDate="1989-12-03"/>
-      <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="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/cdd7846a9bc763c20ff79b7559a015a1"/>
       <column name="LASTNAME" value="Müller"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T04:01:41"/>
       <column name="PERSONID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
-      <column name="PICTURE" valueBlobFile="person/PICTURE/blobFiles/cdd7846a9bc763c20ff79b7559a015a1"/>
       <column name="SALUTATION" value="Herr"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
index f5f054c9d800e563eeb82edcaff8df1eb456628b..2de3cd44d1b4f7b35a6543f1f4dfc7c4667019d0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
@@ -1,230 +1,230 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="f28aa607-c9e7-4e02-a371-841d0e503c42">
+  <changeSet author="autogenerated" id="ecc3f53c-f7a8-464e-a85a-327745dd8ec4">
     <delete tableName="product"/>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="MINSTOCK" valueNumeric="50"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T11:14:32"/>
+      <column name="PRODUCTNAME" value="Ersatzteil 4"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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="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="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:32:19"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG1 Standardprodukt 3"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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="PRODUCTCODE" value="DL1001"/>
       <column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:30:01"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="PRODUCTNAME" value="Service Einsatz"/>
       <column name="STATUS" valueNumeric="1"/>
-      <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-16T01:53:18"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:53:18"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG2 Proudkt 3"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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-16T01:48:31"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 1"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="MINSTOCK" valueNumeric="15"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T11:14:05"/>
+      <column name="PRODUCTNAME" value="Ersatzteil 3"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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:23:33"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:23:33"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 4"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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-16T01:49:51"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 2"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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:25:18"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:25:18"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 5"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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-16T01:43:25"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG1 Standardprodukt 1"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:45:10"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:35"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt C"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T11:13:42"/>
+      <column name="PRODUCTNAME" value="Ersatzteil 2"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTSERVICE"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T11:20:28"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T11:22:20"/>
+      <column name="PRODUCTNAME" value="Beratungsdienstleistung"/>
+      <column name="STATUS" valueNumeric="1"/>
     </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:34:44"/>
-      <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="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:34:44"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTNAME" value="WG1 Standardprodukt 2"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:37:31"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:18"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt A"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T07:39:37"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:27"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt B"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
     <insert tableName="product">
-      <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="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="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="MINSTOCK" valueNumeric="12"/>
+      <column name="ADVERTISING" value="N"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
+      <column name="PRODUCTNAME" value="Ersatzteil 1"/>
+      <column name="STATUS" valueNumeric="1"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
index db9a5c08018334cd41cc25a78bc94ff79d2d9082..6ba30645103ad9564903bdbc2892c0a16e9f5053 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
@@ -1,240 +1,240 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="ce16cea1-ce8e-488e-9a2d-e74d4a547cd8">
+  <changeSet author="autogenerated" id="8eb1ec28-0236-45c7-af4c-8125a3aa855e">
     <delete tableName="productprice"/>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="25000.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="25000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2020-07-15T02:00:00"/>
+      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="35000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="24d65d20-bf5c-474d-8351-2788431e0e1a"/>
+      <column name="PRICE" valueNumeric="35000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="150000.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="150000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2021-06-17T02:00:00"/>
+      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="10000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="4028dfb7-d0e4-493e-9676-6f14a24a9507"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
-      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
       <column name="VAT" valueNumeric="0.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="30000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="43fa161c-0f85-4915-89be-6bb442143506"/>
+      <column name="PRICE" valueNumeric="30000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="443b9532-7a41-481a-8f95-ffaf5e7949af"/>
+      <column name="PRICE" valueNumeric="1000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="71d5a323-12d8-4d1b-8de6-6a7bf81d0b61"/>
+      <column name="PRICE" valueNumeric="25000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="2500.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="2500.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2020-05-18T02:00:00"/>
+      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="20000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
+      <column name="PRICE" valueNumeric="20000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a75cc2e2-bb81-4e9f-9fa4-95c8531e966d"/>
+      <column name="PRICE" valueNumeric="2500.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="10000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a9b9097a-f664-4114-aa0a-ff2a01dddd04"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="30000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="abfa7e4d-bd88-4186-a7ae-26385ea1d91c"/>
+      <column name="PRICE" valueNumeric="30000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="7500.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="ad57ee30-4afe-4426-912b-c0b9d03107f7"/>
+      <column name="PRICE" valueNumeric="7500.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="bb425e07-4238-4cb7-b20b-a0ba4ed8b1ae"/>
+      <column name="PRICE" valueNumeric="5000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="15000.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="15000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2020-05-22T02:00:00"/>
+      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="1500.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="c0769e98-bf18-444c-92b0-fc5d17613ea8"/>
+      <column name="PRICE" valueNumeric="1500.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="1060.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="1060.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2058-10-31T01:00:00"/>
+      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2018-11-01T01:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="df9fe0b0-4f16-4592-8066-fe9b3f41fdc1"/>
+      <column name="PRICE" valueNumeric="50000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="10000.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2020-05-21T02:00:00"/>
+      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
     </insert>
     <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="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRICE" valueNumeric="5000.00"/>
       <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"/>
+      <column name="PRICE" valueNumeric="5000.00"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="VALID_TO" valueDate="2020-06-15T02:00:00"/>
+      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index 224f7fea667137bc3b3ecdc8d77cbb80cda80a1f..9d52aa1d2cf9e2f37bf9319406fdabe336d2583d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -1,351 +1,458 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="6b690d9e-abff-4c18-80b0-5b8231b7bf86">
+  <changeSet author="autogenerated" id="f874d0d1-233c-45e0-a390-647f63166691">
     <delete tableName="salesorder"/>
     <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="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
       <column name="FOOTER" value="Unsere Zahlungkonditionen finden sie hier:"/>
-      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="SALESORDERCODE" valueNumeric="1011"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="28500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="VAT" valueNumeric="0.00"/>
       <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30"/>
-      <column name="SALESORDERCODE" valueNumeric="1011"/>
-      <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
+      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="CANCELLATION" valueNumeric="1"/>
       <column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
-      <column name="VAT" valueNumeric="0.00"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1000"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="SALESORDERCODE" valueNumeric="1000"/>
-      <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
-      <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="VAT" valueNumeric="39.90"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1002"/>
+      <column name="PAYDATE" valueDate="2018-07-25T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAYDATE" valueDate="2018-07-25T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="119.70"/>
+      <column name="CANCELLATION" valueNumeric="1"/>
+      <column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
       <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1006"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="1"/>
+      <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1001"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="DUNNINGDATE" valueDate="2019-09-01T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="1"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAID" valueNumeric="300"/>
-      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="300.00"/>
+      <column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
+      <column name="DUNNINGLEVEL" value="1"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1008"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="SALESORDERCODE" valueNumeric="1008"/>
-      <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
-      <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
     </insert>
     <insert tableName="salesorder">
-      <column name="CANCELLATION" valueNumeric="0"/>
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
+      <column name="FOOTER" value="Danke sehr:"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="SALESORDERCODE" valueNumeric="1018"/>
+      <column name="PAYDATE" valueDate="2020-09-16T07:54:51"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="SALESORDERDATE" valueDate="2020-06-03T12:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-09-16T07:54:51"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="DELIVERYADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
+      <column name="NET" valueNumeric="28500.00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="VAT" valueNumeric="0.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-06-10T12:00:00"/>
+      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart"/>
+      <column name="OFFER_ID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="28500.00"/>
+      <column name="SALESORDERID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Bolzstraße 64&#10;70173 Stuttgart"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
+    </insert>
+    <insert tableName="salesorder">
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <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="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="SALESORDERCODE" valueNumeric="1015"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="53000.00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="ORDERTYPE" value="ORDTYPECONF"/>
+      <column name="VAT" valueNumeric="10070.00"/>
       <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="SALESORDERCODE" valueNumeric="1015"/>
-      <column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
       <column name="SALESORDERID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
-      <column name="VAT" valueNumeric="10070.00"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
+      <column name="ORDERTYPE" value="ORDTYPECONF"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1004"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
       <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1003"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
+      <column name="ORDERTYPE" value="ORDTYPECANC"/>
     </insert>
     <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="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="SALESORDERCODE" valueNumeric="1013"/>
+      <column name="PAYDATE" valueDate="2017-10-13T12:00:00"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="SALESORDERDATE" valueDate="2017-10-10T12:00:00"/>
       <column name="DUNNINGDATE" valueDate="2017-11-23T12:00:00"/>
-      <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="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="53500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <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="PAID" valueNumeric="55000"/>
-      <column name="PAYDATE" valueDate="2017-10-13T12:00:00"/>
+      <column name="VAT" valueNumeric="10165.00"/>
       <column name="PAYDUEDATE" valueDate="2017-11-09T12:00:00"/>
       <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
-      <column name="PAYMENTTERMS" value="PAYTERM30"/>
-      <column name="SALESORDERCODE" valueNumeric="1013"/>
-      <column name="SALESORDERDATE" valueDate="2017-10-10T12:00:00"/>
+      <column name="OFFER_ID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="55000.00"/>
       <column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="VAT" valueNumeric="10165.00"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:&#10;&#10;Produkt: &#10;Produkt:"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="DUNNINGLEVEL" value="1"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
     <insert tableName="salesorder">
-      <column name="CANCELLATION" valueNumeric="1"/>
-      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
+      <column name="FOOTER" value="Danke sehr:"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="SALESORDERCODE" valueNumeric="1019"/>
+      <column name="PAYDATE" valueDate="2020-08-27T12:00:00"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="SALESORDERDATE" valueDate="2020-08-11T12:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="ISOLANGUAGE" value="deu"/>
       <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="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="NET" valueNumeric="192500.00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="VAT" valueNumeric="0.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
+      <column name="PAYMENTADDRESS" value="Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen"/>
+      <column name="OFFER_ID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="192500.00"/>
+      <column name="SALESORDERID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="Transatlantik Logistics GmbH&#10;Friedrichshafen 12&#10;88046 Friedrichshafen"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
+    </insert>
+    <insert tableName="salesorder">
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
+      <column name="FOOTER" value="Danke sehr:"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="SALESORDERCODE" valueNumeric="1020"/>
+      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="SALESORDERDATE" valueDate="2020-08-12T12:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="NET" valueNumeric="3500.00"/>
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="145000.00"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="VAT" valueNumeric="0.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-08-19T12:00:00"/>
+      <column name="PAYMENTADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
+      <column name="OFFER_ID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="145000.00"/>
+      <column name="SALESORDERID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="DELIVERYADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
+    </insert>
+    <insert tableName="salesorder">
       <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="SALESORDERCODE" valueNumeric="1012"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
-      <column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="3500.00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VAT" valueNumeric="0.00"/>
+      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
+      <column name="CANCELLATION" valueNumeric="1"/>
+      <column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="ORDERTYPE" value="ORDTYPECRED"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
+      <column name="SALESORDERCODE" valueNumeric="1010"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+      <column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="DUNNINGDATE" valueDate="2019-08-25T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAID" valueNumeric="0"/>
-      <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"/>
       <column name="VAT" valueNumeric="0.00"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="0.00"/>
+      <column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
+      <column name="DUNNINGLEVEL" value="2"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1005"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="39.90"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+      <column name="ORDERTYPE" value="ORDTYPECANC"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
+      <column name="FOOTER" value="Danke sehr:"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="SALESORDERCODE" valueNumeric="1017"/>
+      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="SALESORDERDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
-      <column name="NET" valueNumeric="420.00"/>
-      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="25000.00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
-      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="VAT" valueNumeric="4750.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-09-23T12:00:00"/>
+      <column name="PAYMENTADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="OFFER_ID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="29750.00"/>
+      <column name="SALESORDERID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
+      <column name="DELIVERYADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
+    </insert>
+    <insert tableName="salesorder">
       <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
+      <column name="DELIVERYTERMS" value="DELIVEREX"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="SALESORDERCODE" valueNumeric="1009"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
-      <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="420.00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="VAT" valueNumeric="79.80"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+      <column name="ORDERTYPE" value="ORDTYPENOTE"/>
     </insert>
     <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="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+      <column name="SALESORDERCODE" valueNumeric="1007"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+      <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="DUNNINGDATE" valueDate="2019-08-25T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <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="PAID" valueNumeric="545"/>
-      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
-      <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"/>
       <column name="VAT" valueNumeric="119.70"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="545.00"/>
+      <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+      <column name="DUNNINGLEVEL" value="2"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
     <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="DELIVERYADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
       <column name="DELIVERYTERMS" value="DELIVERCIF"/>
+      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="SALESORDERCODE" valueNumeric="1014"/>
+      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
+      <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="DUNNINGDATE" valueDate="2019-05-29T02:00:00"/>
-      <column name="DUNNINGLEVEL" value="2"/>
-      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="175000.00"/>
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <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="PAID" valueNumeric="40000"/>
-      <column name="PAYDATE" valueDate="2018-06-30T01:00:00"/>
+      <column name="VAT" valueNumeric="0.00"/>
       <column name="PAYMENTADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7"/>
-      <column name="SALESORDERCODE" valueNumeric="1014"/>
-      <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
+      <column name="OFFER_ID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="40000.00"/>
       <column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
-      <column name="VAT" valueNumeric="0.00"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
+      <column name="DUNNINGLEVEL" value="2"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
     <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="DELIVERYADDRESS" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="0"/>
       <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="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="SALESORDERCODE" valueNumeric="1016"/>
+      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="SALESORDERDATE" valueDate="2020-08-05T12:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="NET" valueNumeric="0.00"/>
-      <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="ORDTYPEINVO"/>
-      <column name="PAID" valueNumeric="50000"/>
-      <column name="PAYDUEDATE" valueDate="2019-11-22T12:00:00"/>
+      <column name="VAT" valueNumeric="0.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-08-12T12:00:00"/>
       <column name="PAYMENTADDRESS" value="Salesproject"/>
-      <column name="PAYMENTTERMS" value="PAYTERM7"/>
-      <column name="SALESORDERCODE" valueNumeric="1016"/>
-      <column name="SALESORDERDATE" valueDate="2019-11-15T12:00:00"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="50000.00"/>
       <column name="SALESORDERID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
-      <column name="VAT" valueNumeric="0.00"/>
+      <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
+      <column name="DELIVERYADDRESS" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
index cadabceb4cb8689f1c590b8a1ed2c3aaf1c25ed1..cdca89d55b2bb5ed3eb1fdeaee9bf8d4d1a6ce6d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
@@ -1,438 +1,517 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="17ea0209-e727-428a-af61-f4f3e60fed9a">
+  <changeSet author="autogenerated" id="a3df107f-0e4c-439b-9007-8bf4f7d88c00">
     <delete tableName="salesorderitem"/>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
-      <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
-      <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="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX47"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Turbolader"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="3500.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="SALESORDERITEMID" value="07ceecff-e3cc-4891-b820-3fb6b977a9cc"/>
+    </insert>
+    <insert tableName="salesorderitem">
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="ITEMNAME" value="Turbolader"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRICE" valueNumeric="3500.00"/>
+      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
-      <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="SALESORDER_ID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
       <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="PRICE" valueNumeric="145000.00"/>
+      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="SALESORDERITEMID" value="117e49f1-b6ac-4570-9042-ae9d69263cb5"/>
+    </insert>
+    <insert tableName="salesorderitem">
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="ITEMNAME" value="AX45"/>
+      <column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.1"/>
-      <column name="ITEMPOSITION" value="1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+      <column name="ITEMPOSITION" value="1.1.1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.1"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX47"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
-      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+      <column name="QUANTITY" valueNumeric="5.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="4eb43698-a4e7-4617-8150-1b279dcce9f2"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="SALESORDERITEMID" value="2f409cb9-4d85-4e39-8e78-4838cd9a9224"/>
+      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+    </insert>
+    <insert tableName="salesorderitem">
+      <column name="QUANTITY" valueNumeric="10.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="ITEMNAME" value="Stahlträger Standard"/>
+      <column name="SALESORDER_ID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
+      <column name="PRICE" valueNumeric="5000.00"/>
+      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+      <column name="SALESORDERITEMID" value="35c54c0a-760c-4a6b-a5f1-4d6beaec07ac"/>
+      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+    </insert>
+    <insert tableName="salesorderitem">
       <column name="QUANTITY" valueNumeric="5.00"/>
-      <column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRICE" valueNumeric="5000.00"/>
+      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
+      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="50.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Ersatzteil 3"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="1060.00"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <column name="QUANTITY" valueNumeric="50.00"/>
       <column name="SALESORDERITEMID" value="3d9a18ac-2182-4cd5-a2c4-140674466821"/>
-      <column name="SALESORDER_ID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
-      <column name="ITEMPOSITION" value="3"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="ITEMPOSITION" value="3"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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"/>
+    </insert>
+    <insert tableName="salesorderitem">
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
+      <column name="ITEMNAME" value="WG2 Produkt 5"/>
+      <column name="SALESORDER_ID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRICE" valueNumeric="25000.00"/>
+      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="SALESORDERITEMID" value="692f2acd-08b6-45d1-bcdf-6f8e46999039"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
-      <column name="ITEMPOSITION" value="1.1.2"/>
-      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+      <column name="ITEMPOSITION" value="1.1.2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
-      <column name="ITEMNAME" value="Sonderrabatt"/>
-      <column name="ITEMPOSITION" value="1.1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
+      <column name="ITEMNAME" value="Förderanlage"/>
+      <column name="SALESORDER_ID" value="63a33308-4ae4-4de7-bd59-162f3677e819"/>
+      <column name="DISCOUNT" valueNumeric="5.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRICE" valueNumeric="150000.00"/>
+      <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
+      <column name="SALESORDERITEMID" value="817d0b06-077d-4f71-b983-91cf218ff0f7"/>
+    </insert>
+    <insert tableName="salesorderitem">
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
+      <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
+      <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
+      <column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
-      <column name="ITEMPOSITION" value="1.1.2"/>
-      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="5"/>
+      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+      <column name="ITEMPOSITION" value="1.1.2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT                     "/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
-      <column name="ITEMPOSITION" value="1.1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="4"/>
+      <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
+      <column name="ITEMPOSITION" value="1.1.1.1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+      <column name="QUANTITY" valueNumeric="1000.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
       <column name="ITEMNAME" value="Gipsplatten"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="150.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.1"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="6"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.2"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
       <column name="ITEMNAME" value="Service Einsatz"/>
-      <column name="ITEMPOSITION" value="2"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="2"/>
+      <column name="ITEMPOSITION" value="2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname4.1"/>
-      <column name="ITEMPOSITION" value="1.1.1"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="3"/>
+      <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+      <column name="ITEMPOSITION" value="1.1.1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="ITEMPOSITION" value="1.3"/>
-      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.3"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <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"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="AX45"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-      <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="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
+      <column name="QUANTITY" valueNumeric="3.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
       <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="ITEMPOSITION" value="1.3"/>
-      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="ITEMSORT" valueNumeric="7"/>
+      <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+      <column name="ITEMPOSITION" value="1.3"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <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"/>
     </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 8f1d49425c448439bd69ec4a8015f396caade3a8..b02071fcb7dc81c6fead45952d21c67523b1b96d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -1,77 +1,77 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="d0df62fd-50ee-4cd7-a9c4-a0820a9180a0">
+  <changeSet author="autogenerated" id="f1e88e4e-d309-4a84-a593-01a50b54454b">
     <delete tableName="salesproject"/>
     <insert tableName="salesproject">
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="ENDDATE" valueDate="2020-05-16T02:00:00"/>
+      <column name="VOLUME" valueNumeric="200000.00"/>
       <column name="PHASE" value="SALPROJPHASESQO"/>
+      <column name="ENDDATE" valueDate="2021-05-20T12:00:00"/>
+      <column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <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="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="STARTDATE" valueDate="2020-05-14T12:00:00"/>
       <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="VOLUME" valueNumeric="120000.00"/>
       <column name="PHASE" value="SALPROJPHASESAL"/>
+      <column name="ENDDATE" valueDate="2021-05-17T12:00:00"/>
+      <column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <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="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="STARTDATE" valueDate="2020-05-15T12:00:00"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
-      <column name="VOLUME" valueNumeric="120000.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="VOLUME" valueNumeric="350000.00"/>
       <column name="PHASE" value="SALPROJPHASEOFFER"/>
+      <column name="ENDDATE" valueDate="2022-05-22T12:00:00"/>
+      <column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <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="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+      <column name="STARTDATE" valueDate="2020-05-13T12:00:00"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
-      <column name="VOLUME" valueNumeric="350000.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="VOLUME" valueNumeric="250000.00"/>
       <column name="PHASE" value="SALPROJPHASESAL"/>
+      <column name="ENDDATE" valueDate="2022-05-18T12:00:00"/>
+      <column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <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="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+      <column name="STARTDATE" valueDate="2020-05-15T12:00:00"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
-      <column name="VOLUME" valueNumeric="250000.00"/>
     </insert>
     <insert tableName="salesproject">
-      <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="ENDDATE" valueDate="2020-11-26T12:00:00"/>
       <column name="PHASE" value="SALPROJPHASENQC"/>
+      <column name="ENDDATE" valueDate="2021-11-26T12:00:00"/>
+      <column name="SALESPROJECTID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
+      <column name="PROBABILITY" value="SALPROJPROB50"/>
       <column name="PROJECTCODE" valueNumeric="1007"/>
       <column name="PROJECTTITLE" value="Projekt 123"/>
-      <column name="SALESPROJECTID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="STARTDATE" valueDate="2019-11-26T12:00:00"/>
+      <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+      <column name="STARTDATE" valueDate="2020-11-24T12:00:00"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
     </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="VOLUME" valueNumeric="450000.00"/>
       <column name="PHASE" value="SALPROJPHASEMQC"/>
-      <column name="PROBABILITY" value="SALPROJPROB50"/>
+      <column name="ENDDATE" valueDate="2022-05-22T12:00:00"/>
+      <column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <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="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="STARTDATE" valueDate="2020-02-05T12:00:00"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
-      <column name="VOLUME" valueNumeric="450000.00"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
index 29f3eb95b1cf3541435de5292e88f3eeb6b1a9c4..0da4ecf330262a1d7f22da65a80640dc466d5875 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
@@ -1,188 +1,188 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="f24c7667-2b3a-4a73-87cf-e2533c312638">
+  <changeSet author="autogenerated" id="f1e7e051-35fe-4809-882c-052d78251aac">
     <delete tableName="salesproject_milestone"/>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-05-10T08:08:07"/>
+      <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
       <column name="DATE_START" valueDate="2019-04-25T08:08:07"/>
+      <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="KIND" value="SalesprojectPhase"/>
+      <column name="DATE_END" valueDate="2019-05-10T08:08:07"/>
       <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>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-06-17T08:08:07"/>
+      <column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
       <column name="DATE_START" valueDate="2019-05-10T08:08:07"/>
+      <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-06-17T08:08:07"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
     </insert>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
+      <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
       <column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
       <column name="DATE_START" valueDate="2019-11-26T12:43:30"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
       <column name="PARENT_ID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
-      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="SALESPROJECT_MILESTONEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="KIND" value="SalesprojectState"/>
       <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>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-11-26T12:43:30"/>
+      <column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
       <column name="DATE_START" valueDate="2019-06-19T08:08:07"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-11-26T12:43:30"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/>
       <column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
+      <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="KIND" value="SalesprojectState"/>
       <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>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
+      <column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
       <column name="DATE_START" valueDate="2019-06-01T10:18:10"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
     </insert>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
+      <column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
       <column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
+      <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="KIND" value="SalesprojectPhase"/>
+      <column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
       <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="SALESPROJECT_MILESTONEID" value="5189697c-5dbf-4d10-a163-dfde87e490ab"/>
       <column name="DATE_START" valueDate="2019-05-17T08:08:08"/>
+      <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="KIND" value="SalesprojectState"/>
       <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>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-11-26T12:48:00"/>
+      <column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
       <column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
+      <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-11-26T12:48:00"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASENEGO"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
       <column name="DATE_START" valueDate="2019-06-17T08:08:07"/>
+      <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
     </insert>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-11-26T12:43:46"/>
+      <column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
       <column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
+      <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <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"/>
+      <column name="DATE_END" valueDate="2019-11-26T12:43:46"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="8fb45194-7ced-475f-be58-7780c359dd0f"/>
       <column name="DATE_START" valueDate="2019-11-26T12:48:00"/>
+      <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
       <column name="PARENT_ID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
-      <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
-      <column name="SALESPROJECT_MILESTONEID" value="8fb45194-7ced-475f-be58-7780c359dd0f"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="97ac26df-2333-461c-958e-83fbc6f743ed"/>
       <column name="DATE_START" valueDate="2019-11-26T12:48:39"/>
+      <column name="SALESPROJECT_ID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="KIND" value="SalesprojectPhase"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/>
-      <column name="SALESPROJECT_ID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="SALESPROJECT_MILESTONEID" value="97ac26df-2333-461c-958e-83fbc6f743ed"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
       <column name="DATE_START" valueDate="2019-06-15T01:34:58"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="KIND" value="SalesprojectState"/>
       <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>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
+      <column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
       <column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="KIND" value="SalesprojectPhase"/>
+      <column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
       <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="SALESPROJECT_MILESTONEID" value="ba8d15aa-3851-451b-9230-70eb7fb4ed6c"/>
       <column name="DATE_START" valueDate="2019-11-26T12:48:39"/>
+      <column name="SALESPROJECT_ID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
       <column name="KIND" value="SalesprojectState"/>
       <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
-      <column name="SALESPROJECT_ID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
-      <column name="SALESPROJECT_MILESTONEID" value="ba8d15aa-3851-451b-9230-70eb7fb4ed6c"/>
     </insert>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="d51e2f85-5767-4cfb-9252-b314813152ed"/>
       <column name="DATE_START" valueDate="2019-11-15T01:06:15"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="KIND" value="SalesprojectPhase"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="SALESPROJECT_MILESTONEID" value="d51e2f85-5767-4cfb-9252-b314813152ed"/>
     </insert>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
+      <column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
       <column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
+      <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="KIND" value="SalesprojectPhase"/>
+      <column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
       <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="SALESPROJECT_MILESTONEID" value="d77dc2ae-f12d-49ac-9a8f-ee0b5086f6ef"/>
       <column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
+      <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="KIND" value="SalesprojectState"/>
       <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>
     <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="e33c0567-8085-4a1e-a7f6-131353297ebf"/>
       <column name="DATE_START" valueDate="2019-11-26T12:43:46"/>
+      <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
       <column name="PARENT_ID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
-      <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="SALESPROJECT_MILESTONEID" value="e33c0567-8085-4a1e-a7f6-131353297ebf"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASESAL"/>
     </insert>
     <insert tableName="salesproject_milestone">
-      <column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
+      <column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="KIND" value="SalesprojectPhase"/>
+      <column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
       <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>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
index 20b02c61cebc2431621853c6dac2c3b4f098fd22..1c1811748d39df6ac549ab7b69914f0a06964f32 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
@@ -1,34 +1,34 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="cce280a2-5970-4067-9998-e23af5eb46a4">
+  <changeSet author="autogenerated" id="9ccc7a52-08cb-46f9-8deb-1eb7eee6236e">
     <delete tableName="salesproject_touchpoint"/>
     <insert tableName="salesproject_touchpoint">
       <column name="ENTRYDATE" valueDate="2019-05-17T08:22:56"/>
-      <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="INFO" value="Kontakt über die Webseite"/>
     </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="INFO" value="Erster Kontakt mit uns."/>
     </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="INFO" value="Die relevanten AP's waren am Stand. Hatten ein sehr produktives Gespräch."/>
     </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="INFO" value="Besuch bei der Messe"/>
     </insert>
     <insert tableName="salesproject_touchpoint">
       <column name="ENTRYDATE" valueDate="2019-03-12T01:00:00"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salutation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salutation.xml
index 157efcc8d25bb71741a87f6b4ab0de8c26f8f8d4..5d3f19517e20251b951f44af09cd6c0bf339044d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salutation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salutation.xml
@@ -1,194 +1,164 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="fd073db7-3e03-4f39-8d7b-d28692863574">
+  <changeSet author="autogenerated" id="c210dacd-26fa-459c-a4c9-07487b5cbe26">
     <delete tableName="salutation"/>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="27"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Herrn Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Dr. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
+      <column name="SALUTATION" value="Mrs."/>
       <column name="SORT" valueNumeric="6"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="Dr. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
+      <column name="SALUTATION" value="Frau"/>
       <column name="SORT" valueNumeric="26"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
+      <column name="SALUTATION" value="Mrs."/>
       <column name="SORT" valueNumeric="18"/>
+      <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Prof. Dr. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="15"/>
       <column name="TITLE" value="Prof. Dr."/>
-    </insert>
-        <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Prof. Dr. {fn} {ln}"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Professorin"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="e8549204-4735-11ea-b77f-2e728ce88125"/>
-      <column name="SEX" value="f"/>
-      <column name="SORT" valueNumeric="7"/>
-      <column name="TITLE" value="Prof. Dr."/>
+      <column name="HEADLINE" value="Herrn Prof. Dr. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Madame {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
+      <column name="SALUTATION" value="Madame"/>
       <column name="SORT" valueNumeric="19"/>
+      <column name="HEADLINE" value="Madame {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="spa"/>
       <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="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
+      <column name="SALUTATION" value="Señora"/>
       <column name="SORT" valueNumeric="30"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
+      <column name="SALUTATION" value="Monsieur"/>
       <column name="SORT" valueNumeric="22"/>
       <column name="TITLE" value="Prof.Dr."/>
+      <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
+      <column name="SALUTATION" value="Mrs."/>
       <column name="SORT" valueNumeric="31"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Präsident {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="14"/>
       <column name="TITLE" value="Präsident"/>
+      <column name="HEADLINE" value="Herrn Präsident {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Präsidentin {fn} {ln}"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Präsidentin"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="e8549614-4735-11ea-b77f-2e728ce88125"/>
-      <column name="SEX" value="f"/>
-      <column name="SORT" valueNumeric="33"/>
-      <column name="TITLE" value="Präsidentin"/>
-    </insert>
-    <insert tableName="salutation">
-      <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
+      <column name="SALUTATION" value="Madame"/>
       <column name="SORT" valueNumeric="23"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
+      <column name="SALUTATION" value="Monsieur"/>
       <column name="SORT" valueNumeric="11"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
+      <column name="SALUTATION" value="Mr."/>
       <column name="SORT" valueNumeric="28"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Professor {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="12"/>
       <column name="TITLE" value="Professor"/>
+      <column name="HEADLINE" value="Herrn Professor {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Professor {fn} {ln}"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Professorin"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="e85494ac-4735-11ea-b77f-2e728ce88125"/>
-      <column name="SEX" value="f"/>
-      <column name="SORT" valueNumeric="32"/>
-      <column name="TITLE" value="Professorin"/>
-    </insert>
-    <insert tableName="salutation">
-      <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
+      <column name="SALUTATION" value="Monsieur"/>
       <column name="SORT" valueNumeric="10"/>
       <column name="TITLE" value="Prof."/>
+      <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
+      <column name="SALUTATION" value="Frau"/>
       <column name="SORT" valueNumeric="9"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
       <column name="ISOLANGUAGE" value="deu"/>
@@ -197,120 +167,150 @@
       <column name="SORT" valueNumeric="4"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Prof. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="21"/>
       <column name="TITLE" value="Prof."/>
+      <column name="HEADLINE" value="Herrn Prof. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="spa"/>
       <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="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
+      <column name="SALUTATION" value="Señor"/>
       <column name="SORT" valueNumeric="29"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Dr. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="13"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="Herrn Dr. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Mr. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
+      <column name="SALUTATION" value="Mr."/>
       <column name="SORT" valueNumeric="16"/>
+      <column name="HEADLINE" value="Mr. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn Bürgermeister {fn} - {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="2"/>
       <column name="TITLE" value="Bürgermeister"/>
+      <column name="HEADLINE" value="Herrn Bürgermeister {fn} - {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau Bürgermeisterin {fn} - {ln}"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Bürgermeisterin"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="e8549740-4735-11ea-b77f-2e728ce88125"/>
-      <column name="SEX" value="f"/>
-      <column name="SORT" valueNumeric="34"/>
-      <column name="TITLE" value="Bürgermeisterin"/>
-    </insert>
-    <insert tableName="salutation">
-      <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
+      <column name="SALUTATION" value="Monsieur"/>
       <column name="SORT" valueNumeric="8"/>
+      <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Herrn {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
+      <column name="SALUTATION" value="Herr"/>
       <column name="SORT" valueNumeric="1"/>
+      <column name="HEADLINE" value="Herrn {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Frau {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <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="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
+      <column name="SALUTATION" value="Frau"/>
       <column name="SORT" valueNumeric="3"/>
+      <column name="HEADLINE" value="Frau {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Professor {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
+      <column name="SALUTATION" value="Mr."/>
       <column name="SORT" valueNumeric="17"/>
       <column name="TITLE" value="Professor"/>
+      <column name="HEADLINE" value="Professor {fn} {ln}"/>
+    </insert>
+    <insert tableName="salutation">
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Professorin"/>
+      <column name="SEX" value="f"/>
+      <column name="SALUTATIONID" value="e8549204-4735-11ea-b77f-2e728ce88125"/>
+      <column name="SALUTATION" value="Frau"/>
+      <column name="SORT" valueNumeric="7"/>
+      <column name="TITLE" value="Prof. Dr."/>
+      <column name="HEADLINE" value="Frau Prof. Dr. {fn} {ln}"/>
+    </insert>
+    <insert tableName="salutation">
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Professorin"/>
+      <column name="SEX" value="f"/>
+      <column name="SALUTATIONID" value="e85494ac-4735-11ea-b77f-2e728ce88125"/>
+      <column name="SALUTATION" value="Frau"/>
+      <column name="SORT" valueNumeric="32"/>
+      <column name="TITLE" value="Professorin"/>
+      <column name="HEADLINE" value="Frau Professor {fn} {ln}"/>
+    </insert>
+    <insert tableName="salutation">
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Präsidentin"/>
+      <column name="SEX" value="f"/>
+      <column name="SALUTATIONID" value="e8549614-4735-11ea-b77f-2e728ce88125"/>
+      <column name="SALUTATION" value="Frau"/>
+      <column name="SORT" valueNumeric="33"/>
+      <column name="TITLE" value="Präsidentin"/>
+      <column name="HEADLINE" value="Frau Präsidentin {fn} {ln}"/>
+    </insert>
+    <insert tableName="salutation">
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Bürgermeisterin"/>
+      <column name="SEX" value="f"/>
+      <column name="SALUTATIONID" value="e8549740-4735-11ea-b77f-2e728ce88125"/>
+      <column name="SALUTATION" value="Frau"/>
+      <column name="SORT" valueNumeric="34"/>
+      <column name="TITLE" value="Bürgermeisterin"/>
+      <column name="HEADLINE" value="Frau Bürgermeisterin {fn} - {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
+      <column name="SALUTATION" value="Madame"/>
       <column name="SORT" valueNumeric="25"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="fra"/>
       <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="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
+      <column name="SALUTATION" value="Monsieur"/>
       <column name="SORT" valueNumeric="24"/>
       <column name="TITLE" value="Dr. Ing."/>
+      <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
       <column name="ISOLANGUAGE" value="eng"/>
@@ -319,14 +319,14 @@
       <column name="SORT" valueNumeric="20"/>
     </insert>
     <insert tableName="salutation">
-      <column name="HEADLINE" value="{ti} {fn} {ln}"/>
       <column name="ISOLANGUAGE" value="eng"/>
       <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="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
+      <column name="SALUTATION" value="Mr."/>
       <column name="SORT" valueNumeric="5"/>
       <column name="TITLE" value="Dr."/>
+      <column name="HEADLINE" value="{ti} {fn} {ln}"/>
     </insert>
     <insert tableName="salutation">
       <column name="ISOLANGUAGE" value="fra"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/serialletter.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/serialletter.xml
index 43088fe984657d2cd65bc87a404a7b8aa2fcf7c7..1e0ce4c31b446fbb2c694032c32f5709127d482e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/serialletter.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/serialletter.xml
@@ -1,24 +1,24 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="87837986-ff87-4743-9ce0-4c1abb668fec">
+  <changeSet author="autogenerated" id="96b4a230-a1d3-496d-88a1-54ce7f5c1174">
     <delete tableName="serialletter"/>
     <insert tableName="serialletter">
-      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="SERIALLETTERID" value="3bb97d70-e651-4800-9742-32b46ac82292"/>
-      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
+      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="TITLE" value="VIP Kundeneinladungen"/>
+      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
     </insert>
     <insert tableName="serialletter">
-      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="SERIALLETTERID" value="b0578b56-b2a4-4e74-94e0-38b9dde99234"/>
-      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
+      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="TITLE" value="Einladung Kundentag"/>
+      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
     </insert>
     <insert tableName="serialletter">
-      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="SERIALLETTERID" value="eb0c5345-e93f-4148-88ea-f5f22c62c419"/>
-      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
+      <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
       <column name="TITLE" value="Weihnachtskarte"/>
+      <column name="STATUS" value="SERIALLETTERNOTSENT"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
index 4a93f0598c05e3d8c59a57d2dc8c0f8623454913..1d1470208eb659853932c5413d7918c32a38d42b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
@@ -1,240 +1,248 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="6b1bb53f-77e4-4373-a349-0760af2e77c3">
+  <changeSet author="autogenerated" id="f2e08a9f-bb67-42ce-b52c-bbf70ffc4553">
     <delete tableName="task"/>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
+      <column name="SUBJECT" value="Autoreifen wechseln"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-10-01T06:05:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
+      <column name="MATURITY_DATE" valueDate="2020-10-01T06:05:00"/>
       <column name="PRIORITY" value="TASKPRIONONE"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="Autoreifen wechseln"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-05-20T06:05:00"/>
     </insert>
     <insert tableName="task">
-      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="SUBJECT" value="Vorbereitung Präsentation"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-24T01:46:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="MATURITY_DATE" valueDate="2020-10-27T02:46:00"/>
       <column name="PRIORITY" value="TASKPRIONONE"/>
-      <column name="PROGRESS" value="TASKPROG50"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Vorbereitung Präsentation"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="TASKID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
+      <column name="STATUS" value="IN-PROGRESS"/>
+      <column name="START_DATE" valueDate="2020-10-27T02:46:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
+      <column name="SUBJECT" value="Kampagne zu Akquise planen"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-22T10:25:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
+      <column name="MATURITY_DATE" valueDate="2020-10-30T11:25:00"/>
       <column name="PRIORITY" value="TASKPRIOHIGH"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="Kampagne zu Akquise planen"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-10-26T11:25:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Verpackung der Ware hat bei Zustellung äußerliche Beschädigungen aufgewiesen. An den gleichen Stellen ist die Ware ebenfalls beshädigt."/>
-      <column name="EDITOR_CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="SUBJECT" value="Beschädigte Ware"/>
       <column name="KIND" value="TICKET"/>
+      <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="DESCRIPTION" value="Verpackung der Ware hat bei Zustellung äußerliche Beschädigungen aufgewiesen. An den gleichen Stellen ist die Ware ebenfalls beshädigt."/>
       <column name="MATURITY_DATE" valueDate="2019-11-22T10:59:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="EDITOR_CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="PROGRESS" value="TASKPROG0"/>
-      <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-      <column name="START_DATE" valueDate="2019-11-15T10:59:00"/>
-      <column name="STATUS" value="ASSIGNED"/>
-      <column name="SUBJECT" value="Beschädigte Ware"/>
       <column name="TASKID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
+      <column name="STATUS" value="ASSIGNED"/>
+      <column name="START_DATE" valueDate="2019-11-15T10:59:00"/>
     </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="SUBJECT" value="Lead nachfassen"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-29T01:48:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
+      <column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
+      <column name="MATURITY_DATE" valueDate="2020-09-30T12:48:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
-      <column name="PROGRESS" value="TASKPROG50"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Lead nachfassen"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="TASKID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-09-30T12:48:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
+      <column name="SUBJECT" value="Nachfassen bei Kunden"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-15T09:36:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
+      <column name="MATURITY_DATE" valueDate="2020-12-22T10:36:00"/>
       <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <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="SUBJECT" value="Nachfassen bei Kunden"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="783f38b6-db71-42b5-9117-848553905c93"/>
+      <column name="STATUS" value="IN-PROGRESS"/>
+      <column name="START_DATE" valueDate="2020-12-22T10:36:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
+      <column name="SUBJECT" value="Forecast anpassen"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
+      <column name="MATURITY_DATE" valueDate="2020-10-30T10:34:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="Forecast anpassen"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-10-21T09:34:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Preisabstimmung."/>
+      <column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-04-05T09:08:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="DESCRIPTION" value="Preisabstimmung."/>
+      <column name="MATURITY_DATE" valueDate="2020-10-21T09:08:00"/>
       <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
-      <column name="PROGRESS" value="TASKPROG75"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="TASKID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
+      <column name="STATUS" value="WAITING"/>
+      <column name="START_DATE" valueDate="2020-10-21T09:08:00"/>
     </insert>
     <insert tableName="task">
+      <column name="SUBJECT" value="Test"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MATURITY_DATE" valueDate="2020-05-29T11:50:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="Test"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-05-21T11:50:00"/>
     </insert>
     <insert tableName="task">
+      <column name="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="MATURITY_DATE" valueDate="2020-05-28T09:21:00"/>
       <column name="PRIORITY" value="TASKPRIOHIGH"/>
-      <column name="PROGRESS" value="TASKPROG75"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="TASKID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-05-21T09:21:00"/>
     </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="SUBJECT" value="Projektplanung fehlerhaft"/>
       <column name="KIND" value="TICKET"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <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="MATURITY_DATE" valueDate="2019-09-12T01:43:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
+      <column name="EDITOR_CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <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="SUBJECT" value="Projektplanung fehlerhaft"/>
       <column name="TASKID" value="998d95e6-3d3b-448b-a634-5516c0e392a5"/>
+      <column name="STATUS" value="ASSIGNED"/>
+      <column name="START_DATE" valueDate="2019-09-05T01:43:00"/>
     </insert>
     <insert tableName="task">
+      <column name="SUBJECT" value="Rückruf Herr. Feldner"/>
       <column name="KIND" value="TASK"/>
-      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="KIND" value="TASK"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="MATURITY_DATE" valueDate="2019-12-02T10:00:00"/>
       <column name="PRIORITY" value="TASKPRIOHIGH"/>
-      <column name="PROGRESS" value="TASKPROG50"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
-      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="START_DATE" valueDate="2019-11-26T01:00:00"/>
-      <column name="STATUS" value="ENDED"/>
-      <column name="SUBJECT" value="Rückruf Herr. Feldner"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="TASKID" value="cb00abc2-afc7-4cde-9e44-baf02248edd2"/>
+      <column name="STATUS" value="ENDED"/>
+      <column name="START_DATE" valueDate="2019-11-26T01:00:00"/>
     </insert>
     <insert tableName="task">
+      <column name="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MATURITY_DATE" valueDate="2020-06-19T06:03:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
-      <column name="PROGRESS" value="TASKPROG25"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
+      <column name="PROGRESS" value="TASKPROG25"/>
       <column name="TASKID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-03-09T06:03:00"/>
     </insert>
     <insert tableName="task">
-      <column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="SUBJECT" value="Besuch vorbereiten"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-24T09:38:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MATURITY_DATE" valueDate="2020-10-28T10:38:00"/>
       <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <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="SUBJECT" value="Besuch vorbereiten"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-10-14T09:38:00"/>
     </insert>
     <insert tableName="task">
-      <column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
+      <column name="SUBJECT" value="Event im Hause"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-11-13T06:04:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
+      <column name="MATURITY_DATE" valueDate="2020-11-11T06:04:00"/>
       <column name="PRIORITY" value="TASKPRIOHIGH"/>
-      <column name="PROGRESS" value="TASKPROG75"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Event im Hause"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="TASKID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-05-20T06:04:00"/>
     </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="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-01-20T05:00:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <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="MATURITY_DATE" valueDate="2021-01-20T03:00:00"/>
       <column name="PRIORITY" value="TASKPRIOHIGH"/>
+      <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <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="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
+      <column name="STATUS" value="IN-PROGRESS"/>
+      <column name="START_DATE" valueDate="2021-01-20T03:00:00"/>
     </insert>
     <insert tableName="task">
-      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="KIND" value="TASK"/>
+      <column name="SUBJECT" value="Controlling Termin Vorbereiten"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-12-02T09:59:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="MATURITY_DATE" valueDate="2020-12-02T09:59:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
-      <column name="PROGRESS" value="TASKPROG0"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
-      <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="START_DATE" valueDate="2019-11-25T09:59:00"/>
-      <column name="STATUS" value="NEW"/>
-      <column name="SUBJECT" value="Controlling Termin Vorbereiten"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="TASKID" value="eadbfbc2-3664-49c8-bda1-b6f8e15e5f21"/>
+      <column name="STATUS" value="NEW"/>
+      <column name="START_DATE" valueDate="2020-11-23T09:59:00"/>
     </insert>
     <insert tableName="task">
-      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
       <column name="KIND" value="TASK"/>
-      <column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
+      <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="MATURITY_DATE" valueDate="2020-11-12T02:44:00"/>
       <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
-      <column name="PROGRESS" value="TASKPROG50"/>
+      <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <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="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="TASKID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
+      <column name="STATUS" value="IN-PROGRESS"/>
+      <column name="START_DATE" valueDate="2020-10-21T01:44:00"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
index d63eb70db4ecdaf189b79da48b621c0906dc7b35..04c72218c576ff03540b136aeaf811f1e83c3ae4 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
@@ -1,54 +1,54 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="065cdfbf-0c43-4c89-a8dc-93b808ce554a">
+  <changeSet author="autogenerated" id="843e645d-0e32-4a4a-a2a2-17a54d367de6">
     <delete tableName="tasklink"/>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="TASKLINKID" value="0a0294dd-ea9f-4840-9526-51a5cd4ec509"/>
       <column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="TASKLINKID" value="62941aed-465d-4ce4-b0af-de80a900cb09"/>
       <column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
+      <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="6c2f84af-ff2e-4b70-b4d0-607a2bd0d941"/>
       <column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
+      <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="TASKLINKID" value="8137c681-ea6b-4223-b275-cddfd34b2e4b"/>
       <column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
+      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
       <column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
       <column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
+      <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
     </insert>
     <insert tableName="tasklink">
-      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="TASKLINKID" value="f79e858f-9237-47d0-8f38-8a2b7c77e520"/>
       <column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
+      <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ticket.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ticket.xml
index 9ba65c2e9e9abd79b88f1b9a72ae2a1c83470a2c..ecfdc5b1c10cc166df1e7adc52a35b17cbb110ce 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ticket.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ticket.xml
@@ -1,18 +1,18 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="dcc90829-0353-4fbb-b13d-a87373d1cf98">
+  <changeSet author="autogenerated" id="feb553cc-862a-497f-93b5-327edf8eba57">
     <delete tableName="ticket"/>
     <insert tableName="ticket">
       <column name="CODE" valueNumeric="1"/>
       <column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
-      <column name="TICKETID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
       <column name="TICKETTYPE" value="SUPPORTTICKET"/>
+      <column name="TICKETID" value="634ad7a8-9c68-4ea4-8385-f5bb37224482"/>
     </insert>
     <insert tableName="ticket">
       <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="TICKETID" value="64f1135c-964c-473e-8596-4cd6c4e5bda8"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
deleted file mode 100644
index 5c29131bd08edb8207a519d7a5ca4b9d2f930ee4..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
-        <!--
-        <insert tableName="VISITPLANEMPLOYEEWEEK">
-          <column name="VISITPLANEMPLOYEEWEEKID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="VISITPLAN_YEAR" valueNumeric="2020"/>
-          <column name="VISITPLAN_WEEK" valueNumeric="21"/>
-          <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-          <column name="INFO" value=""/>
-        </insert>
-
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="04e3cf2c-c367-4b3c-a65f-f729da96754f"/>
-          <column name="ENTRYDATE" valueDate="2020-05-18"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-          <column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="9c6b378b-4738-47b6-9f19-3a1e26f3428e"/>
-          <column name="ENTRYDATE" valueDate="2020-05-19"/>
-          <column name="BEGIN_TIME" value="14:00"/>
-          <column name="END_TIME" value="17:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
-          <column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="bd7b38d1-9ae1-4424-8c65-d9b0f3b000ba"/>
-          <column name="ENTRYDATE" valueDate="2020-05-19"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
-          <column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="5102104c-6baa-404f-9c71-157a8c79663a"/>
-          <column name="ENTRYDATE" valueDate="2020-05-20"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
-          <column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        
-        <insert tableName="VISITPLANEMPLOYEEWEEK">
-          <column name="VISITPLANEMPLOYEEWEEKID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="VISITPLAN_YEAR" valueNumeric="2020"/>
-          <column name="VISITPLAN_WEEK" valueNumeric="22"/>
-          <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-          <column name="INFO" value=""/>
-        </insert>
-
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="152c5f90-4c8b-40ee-8ff9-e2362340ba45"/>
-          <column name="ENTRYDATE" valueDate="2020-05-25"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="f799a0cd-31bb-4be3-9fd9-0cbd0a3d55ac"/>
-          <column name="ENTRYDATE" valueDate="2020-05-26"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-        <insert tableName="VISITPLANENTRY">
-          <column name="VISITPLANENTRYID" value="ad325402-616c-495e-a7f5-a5ae6def0399"/>
-          <column name="ENTRYDATE" valueDate="2020-05-27"/>
-          <column name="BEGIN_TIME" value="10:00"/>
-          <column name="END_TIME" value="11:00"/>
-          <column name="ORGANISATION_CONTACT_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
-          <column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
-          <column name="STATUS" value="VISITSTATUSPLANNED                  "/>
-        </insert>
-
-
-        <insert tableName="VISITRECOMMENDATION">
-          <column name="VISITRECOMMENDATIONID" value="487eeff9-6807-41f6-95e9-5f0f61b45a05"/>
-          <column name="DUE_DATE" valueDate="2020-04-16T10:43:23"/>
-          <column name="PRIORITY" value="VISITPRIOMEDIUM                     "/>
-          <column name="SOURCE" value="MANUAL                              "/>
-          <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-          <column name="INFO" value="Kontrolltermin"/>
-        </insert>
-        -->
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitrecommendation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitrecommendation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8c87c7d354f8a87ea081fc188365869937210be7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitrecommendation.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="936a5d92-db2b-4540-af7a-aeb4025cbeba">
+    <delete tableName="visitrecommendation"/>
+    <insert tableName="visitrecommendation">
+      <column name="VISITRECOMMENDATIONID" value="8bb5bc54-b3fa-4625-86d3-95cfe16269e1"/>
+      <column name="DUE_DATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="SOURCE" value="MANUAL                              "/>
+      <column name="PRIORITY" value="VISITPRIOCRITICAL                   "/>
+      <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index ae8736c63f7bcc4b7075dc345ec1aadcea052724..c3a1d3c5759b118fd0d3d4e30e38f246a3f28166 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -16,7 +16,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
-    
-    <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
+
+    <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
     <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/Workflow/webserviceUser_flowableIdmService.xml b/.liquibase/_____SYSTEMALIAS/basic/Workflow/webserviceUser_flowableIdmService.xml
index a6c0bda8efa8be2321086abe97773941cd65a657..a9d036c000cc8ca956fd2ff3aa65877c71a80519 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/Workflow/webserviceUser_flowableIdmService.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/Workflow/webserviceUser_flowableIdmService.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.listl" id="198892eb-e2a6-4550-9a42-a4d016aa4d11">
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="8a72258cf92888f5cc026131549b7b8d">
     <insert tableName="ASYS_USERS">
       <column name="GROUPID" value="BASIC"/>
       <column name="NAME" value="_____USER_6283cfd9-cf4d-4711-95a1-9b0d74526e01"/>
@@ -74,13 +73,5 @@
       <column name="PROPKEY" value="passwordChanged"/>
       <column name="DATE_NEW" valueDate="2020-05-14T11:20:55"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_6283cfd9-cf4d-4711-95a1-9b0d74526e01" />
-            </whereParams>
-        </delete>
-    </rollback>
-    </changeSet>
-</databaseChangeLog>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml
index b5343af53ceb54f5d12f2de963e846fec8afac18..96ebb69f9517fc57a458bd60374c93c74c4a8a41 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="generatedData/ASYS_BINARIES.xml"/>
+    <include relativeToChangelogFile="true" file="generatedData/changelog.xml" context="example"/>
 
     <include relativeToChangelogFile="true" file="example_asys_users/insert_asys_users-admin.xml"/>
 
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/ASYS_USERS/PROPVAL_CLOB/clobFiles/13f3a9037de88b552013bab06b4e9bb1.txt b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/ASYS_USERS/PROPVAL_CLOB/clobFiles/13f3a9037de88b552013bab06b4e9bb1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ff58054b12386053674a23760d93633e0913c12b
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/ASYS_USERS/PROPVAL_CLOB/clobFiles/13f3a9037de88b552013bab06b4e9bb1.txt
@@ -0,0 +1 @@
+H4sIAAAAAAAAAM2Z7WsbRxDG/xXjQr6NtC8zs7vXi8CN1TaQ2qUWhX4K+zKburiRkWVo+td3znFDSj4UBR3oizidT3fS/PZ55pn1eLO5/mV9sxq//+Xip/VqvJpeX23f73e57t9WPZC/9uPy6fT4dO1qfH25+ubp8O2bi5vNuNT34+b15s169Ub2f+/l7Oax/i7vx+XHk+P6zfqn9dXm6YOGc+/NMXh2HrBaguL1KFik2l0kE/znd3xxt//24u5OXrzbf/vphpcXm/XKGRvBWrC4MXEgN6BbJGIbfDJmXD5dM766vrp8vXl9fXV2+d3mt5/XL8/Bnp8tV6PcyZ/yfn92v314eW7Oz97tto/3L8/3u0c5P7t9kD/v9x+e367G27aqrkqiYCA3jICeAhSkDIzV52gSY0zjUi8ct/eyy/vtbnVxdTkuP70bl8+P1KNPBVk+V/SLwt5c/Lq+/LwOP8jDvdxqWXdf1vffuyyfGX6O8rp32c3AMVZTmEyDHn0FZOMgVdcgOpMwFxbB8FUc/WD8Ijot8CwcS0vJS0Jw0RFgsAZiMgmKOFNrKYm8OUWON/lOP7nb/iGzyBK9y+S5QObsALHrkQ8IxcSQTLAkQb4WJy88I7GnGXCiLznlGiGWrrK0QVegL4ozh9R8lCTenyLOV9tHtdhbeXj76vgWa4plJwVS6h2w+AAZsUxLPBtTmYXygSx5Y81geXBhEW2yzsQ5WEoPjUoAU20BNN3qL7AeDJfQdIHGXk6S5UVrO3l4mEOV1ceIupydj2qyTljXOTMQpeANc48uHU4SB8+DpwW6GFOaQ5XJG7X/iNocFCeKi5BK6sDRU8zZEtqTNNmfd9v2OIu/lkl1IVjoEvvHisTULIhklxsHMdkdRtKZSZNEA/qFS067mp+BJGdVXyRUTRr93ik1JYkNqku5ULDBmJPU5ETSabtsM7BsNUus0iFUZI2C3msozAYaN8tePSyVejjLMFAYvF34yGwtz8Ayo0uGgkDHLoCdKxTXIjAn26Z4WyufJEvZzWGu3csUEOI0f6i5Gm+hkI4jWv3ISZtNDXQgRt6YNFgarFlQ9Bx1Xjg+xlawBFuVYHFZXypBTo2Ba+spJ/RS5BQx/nj7oE//MIcgQ/dcqUIKpCFQuw/kTgJUehMqzhmJX0vSL9AkUqebw1wx5Jh0DEmlq5GgNMgBCSTHRuRdqLWfIsk/2u1+u5GHWRplSkihTqnBJ13dWVVphCC4UnwzVKkdrkprB6s47UJFjmjnYBmKmMbkQamhDiKKMXLN04RZojZ97f8nqcrr3bsZKErSAQydJr40eVTXAJFRdCzzYnu2nbRNHk6RJ0U6WkS0yaiqj0+x58LeBoKao9fWLgKZHIMk7yyqvbDYk6T4tMujj73dfzgiRsaYW7ANWg2qSExajsYe+pQ2g9H6UDkQY5rEiH6wceFs0OB6dIaqw1giI9RSprVn1FU7Oqg2Bf0DGldPcqfuPzs8R0epGHtpicCXaZQknauLVX/imEkbHGueP3CU9Bpa/YA0GFJf9czHR2liw5aMhVaiNnZuDqJ3ZRomYyLR1RnbKaL8N+ocX5BsVZBSQV1q2u7KAWKZRg9B1PaYQm14CEUH5mlrh+JHX9XcO8vooWEYJWtPxKYMMaN29a7jb5beOXXLtpRTBDl1x+NL0elIHYi0BFUh1lI19uUELWRCpm7ksLiqEMO0q4NuILNgjaqMc0ScEjO2QgYIS5ziqnaDkiM0a5ozjXo40V2daX48OkWiZnrVeFqz9hqkYiC1UIC6QzbFYc0H7QJ8pEhPhhoX5FKy4f+kqL/30/mv2G91Vfn5qF+ZtSUE5RnJaYJFwy2LNw5PJrIun/9N+Q8BdtMJrxwAAA==
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
index 2c287e18ae1dd4b02418763b536a54aded66ef3f..407cd8d0b951e51ed8e36e0ab51fe067a1e7a87b 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
@@ -1,129 +1,121 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="j.hoermanns" id="f51b5b01-c172-49b7-97b8-13b54d3aafdb">
+  <changeSet author="autogenerated" id="e157d9afaa8a4e6499f68415dd7d9085">
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="6f2070f6-26ce-4361-8ad5-df7e8bb09410"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="1edd7253-c1a9-4eb1-92b8-ce2ad9262aa9"/>
+      <column name="PROPVAL" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="22864525-f580-4ce3-b5d5-2034519cb482"/>
+      <column name="PROPVAL" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Birgit Leicht"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="0a9afbd0-54c8-4141-834c-a1fad149aeed"/>
+      <column name="PROPVAL" value="Birgit Leicht"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Birgit"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="afc7201d-a72d-49d5-842d-04d6192f6302"/>
+      <column name="PROPVAL" value="Birgit"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Leicht"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="b1832c76-356c-4909-a6ef-bde0c0e1c857"/>
+      <column name="PROPVAL" value="Leicht"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="b091cb95-5976-4b8f-975f-c411b82b5b8c"/>
+      <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="48e35d4e-93c9-49e9-bc7e-b1f105bed72d"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="8888f771-9e61-4ea8-8e3b-388bcfbdd4bf"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="e961b7da-561c-436a-a718-8746fa818d30"/>
+      <column name="PROPVAL" value="b.leicht@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="b.leicht@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="fb684399-de76-44dd-975d-f3d4d6c95c42"/>
+      <column name="PROPVAL" value="b.leicht@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="7025fd5a-3b29-4412-87d9-a02b7e543649"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="7025fd5a-3b29-4412-87d9-a02b7e543649"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="3c8e31a5-81c9-4cc3-895b-d5a8b5d87fa9"/>
-        <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
+      <column name="ID" value="3c8e31a5-81c9-4cc3-895b-d5a8b5d87fa9"/>
+      <column name="PROPVAL" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
index 1c02edf6d92635280accb16bd318039dbe23d660..eff2ffec8299ac9f88d9ca995716cdde6f9d170b 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
@@ -1,147 +1,139 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="3b2eb88a-7d8f-4b51-a361-29170982d152">
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="fe4f395ece8408a44dcaf3ee29638ffb">
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="63b9438d-1a63-49c9-85c2-6bc28efe87e5"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="0eabe917-fcf7-46e4-92d1-f7d326ded6c4"/>
+      <column name="PROPVAL" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="a9efc147-d086-477f-b3d5-6eea09c95e2e"/>
+      <column name="PROPVAL" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Harold Smith"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="5064165c-a566-4905-a9ba-6df21c150935"/>
+      <column name="PROPVAL" value="Harold Smith"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Harold"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="efb6610d-8990-40c7-8044-9d3f471fe08c"/>
+      <column name="PROPVAL" value="Harold"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Smith"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="95761793-e2e5-439f-9313-e75e4558c8f0"/>
+      <column name="PROPVAL" value="Smith"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_FieldStaff"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="9e7f3f53-3df4-4e6e-b16c-f13f2430c871"/>
+      <column name="PROPVAL" value="PROJECT_FieldStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="4bbc6f33-c782-47fd-9dfd-f19aed6a7dbc"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="4bbc6f33-c782-47fd-9dfd-f19aed6a7dbc"/>
+      <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="331a5f35-3111-4317-bb3a-03455d6503ed"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="331a5f35-3111-4317-bb3a-03455d6503ed"/>
+      <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="89cda16b-f94f-4b20-8fea-184250de76f2"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="70fcb1a9-b13b-4222-afdc-c39de33ffe36"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="28b90a4a-b098-42cc-bd5c-27cb27988307"/>
+      <column name="PROPVAL" value="h.smith@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.smith@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="ce8946ae-eb69-46fe-b63b-d4684c0189bb"/>
+      <column name="PROPVAL" value="h.smith@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0b5d827a-32dc-4cd5-b023-2f4fbc65f43e"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="0b5d827a-32dc-4cd5-b023-2f4fbc65f43e"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="fee8756b-7e97-4472-aa58-bb49d1ee7902"/>
-        <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
+      <column name="ID" value="fee8756b-7e97-4472-aa58-bb49d1ee7902"/>
+      <column name="PROPVAL" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_0555b87b-5708-4748-aa88-064e33cab002" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
index 1122e1ee601e661f65a0ecd68448fbe4da213cf0..c0d64e154658183b0f5e7a4a17da62a2f85c5cdf 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
@@ -1,129 +1,121 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="f9502718-5fca-4a3c-a439-22b28a6a4866">
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="7e601b5a7087bb9539fe250fc6f48308">
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="a501ba6e-4229-4bcc-9587-3e5b3516f1b5"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="e7a50a5e-7208-4821-b223-720721067edb"/>
+      <column name="PROPVAL" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="3cd16b02-ea88-4a95-b837-95cd4e989094"/>
+      <column name="PROPVAL" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Herbert Obermeier"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="c1114ba2-3a61-460f-868b-af15e1113a87"/>
+      <column name="PROPVAL" value="Herbert Obermeier"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Herbert"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="182783dc-9ca6-469c-8f5b-1c732a0c4830"/>
+      <column name="PROPVAL" value="Herbert"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Obermeier"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="3a555e19-4f2e-4327-98cc-515658c7c17f"/>
+      <column name="PROPVAL" value="Obermeier"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_Marketing"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="fbd983eb-e30b-4dee-b2c5-d682727a614b"/>
+      <column name="PROPVAL" value="PROJECT_Marketing"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="98a96f11-de67-4efb-8977-5dc459f3f396"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="68a5bb62-d0f7-4268-881f-d86466ad67c3"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="230a9a3b-92d9-474b-a10f-8e5ac63d9a12"/>
+      <column name="PROPVAL" value="h.obermeier@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="h.obermeier@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="b1ef9091-a7e1-4800-9e7e-ed72aa419124"/>
+      <column name="PROPVAL" value="h.obermeier@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="70f4ff0b-06de-4346-9350-469d401fad5e"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="70f4ff0b-06de-4346-9350-469d401fad5e"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="67de6be9-07e6-40c7-9e41-fc341081fbd5"/>
-        <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
+      <column name="ID" value="67de6be9-07e6-40c7-9e41-fc341081fbd5"/>
+      <column name="PROPVAL" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
index 0f88fc614e6edd87d715b986636f31c4127f45f5..83810907fe2b23ba2175fdd283242772c4f3f88f 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
@@ -1,156 +1,148 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="d0cbed0a-5977-456f-b410-7f4a80c17cfd">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Lisa Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Lisa"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Sommer"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_FieldStaff"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="f2874d06-ff43-43f7-b2ae-67e12ef0b8e9"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_Marketing"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="bcd35640-a961-40d8-adde-05d481dec5c6"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="edef5625-4f9e-4855-b75f-77751ea949a9"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="l.sommer@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="l.sommer@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="9d66fea5-771e-44e2-8663-792ef9f13f8e"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="b9418e4d-709a-40e0-9b2a-b3d864cd5adc"/>
-        <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="f8ed3bd5a0cc066cb6c52abae3792203">
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="f139e953-b295-4bbd-927e-b894ff4d3b67"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="0a73d381-b0a1-4156-b9c2-3c6e1d909ff0"/>
+      <column name="PROPVAL" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="3264f099-27f8-4d8d-a471-01536ef8bdbd"/>
+      <column name="PROPVAL" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="54e6a89d-5283-4966-8780-b93cbca97b29"/>
+      <column name="PROPVAL" value="Lisa Sommer"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="f3403820-b7ee-4e90-8c4b-881d8ccc223b"/>
+      <column name="PROPVAL" value="Lisa"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="3cedc3be-ad6d-489a-a8c9-84bf96363229"/>
+      <column name="PROPVAL" value="Sommer"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="9dc8712b-384b-4e62-9fab-22982c1a8acc"/>
+      <column name="PROPVAL" value="PROJECT_FieldStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="f2874d06-ff43-43f7-b2ae-67e12ef0b8e9"/>
+      <column name="PROPVAL" value="PROJECT_Marketing"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="bcd35640-a961-40d8-adde-05d481dec5c6"/>
+      <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="edef5625-4f9e-4855-b75f-77751ea949a9"/>
+      <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="a4de6db6-fc43-4bc4-b3fd-75bb7602a08c"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="8479dc65-f3eb-43fe-9161-92e2e5bd7a52"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="535e6910-1e5c-45dd-89cc-8695266d2563"/>
+      <column name="PROPVAL" value="l.sommer@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="518fa115-27f6-42af-883d-f234229df8f5"/>
+      <column name="PROPVAL" value="l.sommer@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="9d66fea5-771e-44e2-8663-792ef9f13f8e"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
+      <column name="ID" value="b9418e4d-709a-40e0-9b2a-b3d864cd5adc"/>
+      <column name="PROPVAL" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
+    </insert>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
index f66f0d95d3910653cd642855072d1e94e1b18813..ce281d0e080ca9fb42961cbc9f8f12e342a43c88 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
@@ -1,129 +1,121 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">   
-    <changeSet author="j.hoermanns" id="88a254de-509f-4eba-a88d-8539ca8cd37f">
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="48372b734f5add803e5bd2b345594313">
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="b5dd10e8-188d-477d-ae61-a3c36da643a8"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="7f566326-c405-4238-8974-d92aafab0b80"/>
+      <column name="PROPVAL" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="1525c79d-2f48-4fa4-b2e7-1a5a6cb502e8"/>
+      <column name="PROPVAL" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Susanne Lustig"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="8ee8c986-72da-49d6-87eb-403b0994203a"/>
+      <column name="PROPVAL" value="Susanne Lustig"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Susanne"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="2360c964-f456-423c-83f7-79ec57aff10f"/>
+      <column name="PROPVAL" value="Susanne"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Lustig"/>
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="504e660a-8c64-41e3-99c3-e39b5f2ee0ce"/>
+      <column name="PROPVAL" value="Lustig"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_HumanResources"/>
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="e753cd61-fcb6-4b89-8f29-93b875ccc388"/>
+      <column name="PROPVAL" value="PROJECT_HumanResources"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="e4d362f3-8bc3-4dd5-9b1c-d338017b5aaa"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="a796eef7-72b6-435a-adbc-4e9356fcd35d"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="s.lustig@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="8b8a49a6-7909-422d-8d55-5f70503946fe"/>
+      <column name="PROPVAL" value="s.lustig@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="s.lustig@domain.local"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="665922d4-e0b4-4f36-b907-0e0e73a1bffc"/>
+      <column name="PROPVAL" value="s.lustig@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="1ff6b066-12ba-4b01-a29e-0a84241a8b2c"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="1ff6b066-12ba-4b01-a29e-0a84241a8b2c"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
     </insert>
     <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="02fb802c-446d-4446-98f1-0e865c0950a6"/>
-        <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
+      <column name="ID" value="02fb802c-446d-4446-98f1-0e865c0950a6"/>
+      <column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
index 583a0787f568f15744168999be42ff22aaafa4ed..78c7b235bd72a71679d121cac1e8dc31a59256a6 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
@@ -1,246 +1,238 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermanns" id="321d0899-d0e5-4314-8bea-4fbfe063939c">
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="486a164b-9345-457f-92db-1d3d94ff75a2"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="lastModified"/>
-        <column name="PROPVAL" value="1544193908535"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="cdb34f95-e414-4807-bbdb-f369138ee49f"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="contactID"/>
-        <column name="PROPVAL" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="3b996169-6951-4f1d-9529-b5dfeb048dca"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="name"/>
-        <column name="PROPVAL" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="c17c88f5-74e2-44a1-ae68-8130918b43d3"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="isActive"/>
-        <column name="PROPVAL" value="true"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="d8ce1868-a995-4698-a632-d8405b9bc3d9"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="title"/>
-        <column name="PROPVAL" value="Admin"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="93c88dff-a6b0-49ce-b7b4-e474b7ca7fb6"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="firstname"/>
-        <column name="PROPVAL" value="Tim"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PERSONAL"/>
-        <column name="ID" value="f63d0946-3960-43bb-9888-4c36d962f955"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="lastname"/>
-        <column name="PROPVAL" value="Admin"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="6c38f080-e36a-4c95-9756-43e3410962a0"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
-    </insert>
-        <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="f962481d-01ff-4682-a077-043f77dbc039"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_DASHBOARDSTOREADMIN"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="767e4844-772e-47e3-9cee-e9820995c3e2"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_DESIGNER"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="818e47ec-f922-4af6-81a3-67ceed90c1de"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_FieldStaff"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="c9c347c9-c936-4537-9792-4c6a09007442"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_HumanResources"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="b4a5eba5-bb57-4676-9716-96637449ae45"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_Marketing"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="b1cd893d-4a66-4960-ad2f-f6d7632b0bdc"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="6a469696-b7f6-4bf0-b497-db531e8e67f1"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
-    </insert>
-	<insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2019-07-12T14:00:00.535"/>
-        <column name="DATE_NEW" valueDate="2019-07-12T14:00:00.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="0922fff7-f127-4478-8d92-8e8bb31f868e"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="PROJECT_Support"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="ef8097ea-206d-456f-bebe-144d8190ef6f"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="password"/>
-        <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="PASSWORD"/>
-        <column name="ID" value="7a9a5b3b-9fde-4822-9198-06692be1fc0f"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="passwordChanged"/>
-        <column name="PROPVAL" value="1533122217399"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="f277858d-abc0-4a64-b2cc-237fc8f9cfd7"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="email"/>
-        <column name="PROPVAL" value="Admin@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="BASIC"/>
-        <column name="ID" value="bcc17469-c0e2-463a-b8e5-66acf839572c"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="calendarID"/>
-        <column name="PROPVAL" value="Admin@domain.local"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="FRAMESEARCH"/>
-        <column name="ID" value="0fcfdb23-e599-4c63-84c0-5da2acc946a8"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="frameStoredSearches"/>
-        <column name="PROPVAL_CLOB" value="H4sIAAAAAAAAAM2Z7WsbRxDG/xXjQr6NtC8zs7vXi8CN1TaQ2qUWhX4K+zKburiRkWVo+td3znFDSj4UBR3oizidT3fS/PZ55pn1eLO5/mV9sxq//+Xip/VqvJpeX23f73e57t9WPZC/9uPy6fT4dO1qfH25+ubp8O2bi5vNuNT34+b15s169Ub2f+/l7Oax/i7vx+XHk+P6zfqn9dXm6YOGc+/NMXh2HrBaguL1KFik2l0kE/znd3xxt//24u5OXrzbf/vphpcXm/XKGRvBWrC4MXEgN6BbJGIbfDJmXD5dM766vrp8vXl9fXV2+d3mt5/XL8/Bnp8tV6PcyZ/yfn92v314eW7Oz97tto/3L8/3u0c5P7t9kD/v9x+e367G27aqrkqiYCA3jICeAhSkDIzV52gSY0zjUi8ct/eyy/vtbnVxdTkuP70bl8+P1KNPBVk+V/SLwt5c/Lq+/LwOP8jDvdxqWXdf1vffuyyfGX6O8rp32c3AMVZTmEyDHn0FZOMgVdcgOpMwFxbB8FUc/WD8Ijot8CwcS0vJS0Jw0RFgsAZiMgmKOFNrKYm8OUWON/lOP7nb/iGzyBK9y+S5QObsALHrkQ8IxcSQTLAkQb4WJy88I7GnGXCiLznlGiGWrrK0QVegL4ozh9R8lCTenyLOV9tHtdhbeXj76vgWa4plJwVS6h2w+AAZsUxLPBtTmYXygSx5Y81geXBhEW2yzsQ5WEoPjUoAU20BNN3qL7AeDJfQdIHGXk6S5UVrO3l4mEOV1ceIupydj2qyTljXOTMQpeANc48uHU4SB8+DpwW6GFOaQ5XJG7X/iNocFCeKi5BK6sDRU8zZEtqTNNmfd9v2OIu/lkl1IVjoEvvHisTULIhklxsHMdkdRtKZSZNEA/qFS067mp+BJGdVXyRUTRr93ik1JYkNqku5ULDBmJPU5ETSabtsM7BsNUus0iFUZI2C3msozAYaN8tePSyVejjLMFAYvF34yGwtz8Ayo0uGgkDHLoCdKxTXIjAn26Z4WyufJEvZzWGu3csUEOI0f6i5Gm+hkI4jWv3ISZtNDXQgRt6YNFgarFlQ9Bx1Xjg+xlawBFuVYHFZXypBTo2Ba+spJ/RS5BQx/nj7oE//MIcgQ/dcqUIKpCFQuw/kTgJUehMqzhmJX0vSL9AkUqebw1wx5Jh0DEmlq5GgNMgBCSTHRuRdqLWfIsk/2u1+u5GHWRplSkihTqnBJ13dWVVphCC4UnwzVKkdrkprB6s47UJFjmjnYBmKmMbkQamhDiKKMXLN04RZojZ97f8nqcrr3bsZKErSAQydJr40eVTXAJFRdCzzYnu2nbRNHk6RJ0U6WkS0yaiqj0+x58LeBoKao9fWLgKZHIMk7yyqvbDYk6T4tMujj73dfzgiRsaYW7ANWg2qSExajsYe+pQ2g9H6UDkQY5rEiH6wceFs0OB6dIaqw1giI9RSprVn1FU7Oqg2Bf0DGldPcqfuPzs8R0epGHtpicCXaZQknauLVX/imEkbHGueP3CU9Bpa/YA0GFJf9czHR2liw5aMhVaiNnZuDqJ3ZRomYyLR1RnbKaL8N+ocX5BsVZBSQV1q2u7KAWKZRg9B1PaYQm14CEUH5mlrh+JHX9XcO8vooWEYJWtPxKYMMaN29a7jb5beOXXLtpRTBDl1x+NL0elIHYi0BFUh1lI19uUELWRCpm7ksLiqEMO0q4NuILNgjaqMc0ScEjO2QgYIS5ziqnaDkiM0a5ozjXo40V2daX48OkWiZnrVeFqz9hqkYiC1UIC6QzbFYc0H7QJ8pEhPhhoX5FKy4f+kqL/30/mv2G91Vfn5qF+ZtSUE5RnJaYJFwy2LNw5PJrIun/9N+Q8BdtMJrxwAAA=="/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="CALENDAR"/>
-        <column name="ID" value="bdb076c0-4056-4fbf-ae40-2e96aef36242"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="calUserFavorites"/>
-        <column name="PROPVAL_CLOB" value="; ;+ mailto:Admin@domain.local;+ CN:Administrator;+ ; |"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="CALENDAR"/>
-        <column name="ID" value="230c676e-93be-4457-80fd-c30cacff5fd0"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="calLastViewMode"/>
-        <column name="PROPVAL" value="1"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="ROLE"/>
-        <column name="ID" value="858677a7-3df4-4ce0-93e9-11fb0c972961"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="roleNames"/>
-        <column name="PROPVAL" value="INTERNAL_DESIGNER"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
-        <column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
-        <column name="GROUPID" value="OTHER"/>
-        <column name="ID" value="28469b56-49a5-4f13-bebf-57c5e94dfc4f"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="phoneAddress"/>
-        <column name="PROPVAL" value="PJSIP/212"/>
-    </insert>
-    <insert tableName="ASYS_USERS">
-        <column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
-        <column name="GROUPID" value="NOGROUP"/>
-        <column name="ID" value="c2eea117-30d7-46b8-bc12-1d3f0963dc55"/>
-        <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
-        <column name="PROPKEY" value="department"/>
-        <column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
-    </insert>
-    <rollback>
-        <delete tableName="ASYS_USERS">
-            <where>NAME = ?</where>
-            <whereParams>
-                    <param value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046" />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
+  <changeSet author="autogenerated" id="8f0d55a9858ee3b438043c16b257588e">
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="486a164b-9345-457f-92db-1d3d94ff75a2"/>
+      <column name="PROPVAL" value="1544193908535"/>
+      <column name="PROPKEY" value="lastModified"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="cdb34f95-e414-4807-bbdb-f369138ee49f"/>
+      <column name="PROPVAL" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="PROPKEY" value="contactID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="3b996169-6951-4f1d-9529-b5dfeb048dca"/>
+      <column name="PROPVAL" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="PROPKEY" value="name"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="c17c88f5-74e2-44a1-ae68-8130918b43d3"/>
+      <column name="PROPVAL" value="true"/>
+      <column name="PROPKEY" value="isActive"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="d8ce1868-a995-4698-a632-d8405b9bc3d9"/>
+      <column name="PROPVAL" value="Admin"/>
+      <column name="PROPKEY" value="title"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="93c88dff-a6b0-49ce-b7b4-e474b7ca7fb6"/>
+      <column name="PROPVAL" value="Tim"/>
+      <column name="PROPKEY" value="firstname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PERSONAL"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="f63d0946-3960-43bb-9888-4c36d962f955"/>
+      <column name="PROPVAL" value="Admin"/>
+      <column name="PROPKEY" value="lastname"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="6c38f080-e36a-4c95-9756-43e3410962a0"/>
+      <column name="PROPVAL" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="f962481d-01ff-4682-a077-043f77dbc039"/>
+      <column name="PROPVAL" value="INTERNAL_DASHBOARDSTOREADMIN"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="767e4844-772e-47e3-9cee-e9820995c3e2"/>
+      <column name="PROPVAL" value="INTERNAL_DESIGNER"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="818e47ec-f922-4af6-81a3-67ceed90c1de"/>
+      <column name="PROPVAL" value="PROJECT_FieldStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="c9c347c9-c936-4537-9792-4c6a09007442"/>
+      <column name="PROPVAL" value="PROJECT_HumanResources"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="b4a5eba5-bb57-4676-9716-96637449ae45"/>
+      <column name="PROPVAL" value="PROJECT_Marketing"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="b1cd893d-4a66-4960-ad2f-f6d7632b0bdc"/>
+      <column name="PROPVAL" value="PROJECT_OfficeStaff"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="6a469696-b7f6-4bf0-b497-db531e8e67f1"/>
+      <column name="PROPVAL" value="PROJECT_ProjectManagement"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2019-07-12T02:00:00"/>
+      <column name="ID" value="0922fff7-f127-4478-8d92-8e8bb31f868e"/>
+      <column name="PROPVAL" value="PROJECT_Support"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2019-07-12T02:00:00"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="ef8097ea-206d-456f-bebe-144d8190ef6f"/>
+      <column name="PROPVAL" value="SHA256S:8BA6557C1C12BD7B9FF24147B71ECB36AC04CD6F7F0E7C84677E06C0CA6EAFD5:3FFDE946723B844B3F5B21D3AE1CF87FAC182CC21D1EDA3F76E781C3F63EEE9F"/>
+      <column name="PROPKEY" value="password"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="PASSWORD"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="7a9a5b3b-9fde-4822-9198-06692be1fc0f"/>
+      <column name="PROPVAL" value="1533122217399"/>
+      <column name="PROPKEY" value="passwordChanged"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="f277858d-abc0-4a64-b2cc-237fc8f9cfd7"/>
+      <column name="PROPVAL" value="Admin@domain.local"/>
+      <column name="PROPKEY" value="email"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="BASIC"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="bcc17469-c0e2-463a-b8e5-66acf839572c"/>
+      <column name="PROPVAL" value="Admin@domain.local"/>
+      <column name="PROPKEY" value="calendarID"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="FRAMESEARCH"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="PROPVAL_CLOB" valueClobFile="ASYS_USERS/PROPVAL_CLOB/clobFiles/13f3a9037de88b552013bab06b4e9bb1.txt"/>
+      <column name="ID" value="0fcfdb23-e599-4c63-84c0-5da2acc946a8"/>
+      <column name="PROPKEY" value="frameStoredSearches"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="CALENDAR"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="PROPVAL_CLOB" value="; ;+ mailto:Admin@domain.local;+ CN:Administrator;+ ; |"/>
+      <column name="ID" value="bdb076c0-4056-4fbf-ae40-2e96aef36242"/>
+      <column name="PROPKEY" value="calUserFavorites"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="CALENDAR"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="230c676e-93be-4457-80fd-c30cacff5fd0"/>
+      <column name="PROPVAL" value="1"/>
+      <column name="PROPKEY" value="calLastViewMode"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="ROLE"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="858677a7-3df4-4ce0-93e9-11fb0c972961"/>
+      <column name="PROPVAL" value="INTERNAL_DESIGNER"/>
+      <column name="PROPKEY" value="roleNames"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="OTHER"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="DATE_EDIT" valueDate="2018-12-07T03:45:08"/>
+      <column name="ID" value="28469b56-49a5-4f13-bebf-57c5e94dfc4f"/>
+      <column name="PROPVAL" value="PJSIP/212"/>
+      <column name="PROPKEY" value="phoneAddress"/>
+      <column name="DATE_NEW" valueDate="2018-05-25T09:52:30"/>
+    </insert>
+    <insert tableName="ASYS_USERS">
+      <column name="GROUPID" value="NOGROUP"/>
+      <column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="ID" value="c2eea117-30d7-46b8-bc12-1d3f0963dc55"/>
+      <column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
+      <column name="PROPKEY" value="department"/>
+      <column name="DATE_NEW" valueDate="2020-04-27T12:11:00"/>
+    </insert>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml
index 033eefbe3772e3de76381bc2f340de485887b5d9..a468b7b1c4e96814aef3b4967e8e52c60a09ab9b 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml
@@ -1,1598 +1,1598 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="autogenerated" id="783bf33918360eda4d95468f8c4cf39a">
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e990531850d88c95118c75ed34b42615"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12037"/>
-            <column name="DATE_EDIT" valueDate="2019-07-27T11:42:38"/>
-            <column name="DATE_NEW" valueDate="2019-07-27T11:42:38"/>
-            <column name="FILENAME" value="address.docx"/>
-            <column name="ID" value="011eb0ce-b209-44e2-a5bf-5d5c9d056372"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="a1b00343-1b45-40e2-a3d0-e54847a14eb8"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12253"/>
-            <column name="DATE_EDIT" valueDate="2019-07-29T05:02:35"/>
-            <column name="DATE_NEW" valueDate="2019-07-29T05:02:35"/>
-            <column name="FILENAME" value="platzhalterword.docx"/>
-            <column name="ID" value="0844e0e3-e456-4517-aaa0-a43834a70bbb"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="7861355c-251d-4483-a040-6cd93b9fbe2d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/ef3d15d33c3023a91985372805270dc6"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4412370"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:03:41"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:03:41"/>
-            <column name="FILENAME" value="Standardbriefvorlage.docx"/>
-            <column name="ID" value="0a0588bb-b75e-4be5-88f5-c3eb0e07dee8"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
-            <column name="DATASIZE" valueNumeric="389"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T02:06:04"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T02:06:04"/>
-            <column name="FILENAME" value="DemoLeadimport.csv"/>
-            <column name="ID" value="0a3ddc5a-0463-4da2-9264-d7ff13a56f84"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
-            <column name="ROW_ID" value="f85740b9-6180-4d4f-8d9b-34c057073dab"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
-            <column name="DATASIZE" valueNumeric="389"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T11:43:20"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T11:43:20"/>
-            <column name="FILENAME" value="DemoLeadimport.csv"/>
-            <column name="ID" value="0af4991d-5d5b-4dc9-8eb0-ce9ceb843523"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
-            <column name="ROW_ID" value="048f0744-d7d9-46e5-bfdb-3be766818969"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5dbfcfef4e102c68982c8dccc390f3e0"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="41554"/>
-            <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
-            <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
-            <column name="DESCRIPTION" value="Image of the profile"/>
-            <column name="FILENAME" value="ProfileImage"/>
-            <column name="ID" value="0c9e1a2e-220c-4574-9d04-870b8ee22000"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/d53815eeeac3c3fa5d5c4d60ee9a6954"/>
-            <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-            <column name="TABLENAME" value="PERSON"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a7b09b2698dede8200596089a8fa7750"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12106"/>
-            <column name="DATE_EDIT" valueDate="2019-07-22T02:57:18"/>
-            <column name="DATE_NEW" valueDate="2019-07-22T02:57:18"/>
-            <column name="FILENAME" value="platzhalterword.docx"/>
-            <column name="ID" value="15369b8b-0ad6-4eee-96b3-cd88dd27c273"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="841f7cf6-554b-47c4-ac57-dd71a2272fdd"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/77030fb819d7bed57f5fc12e981b287b"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="46836"/>
-            <column name="DATE_EDIT" valueDate="2019-07-25T09:59:14"/>
-            <column name="DATE_NEW" valueDate="2019-07-25T09:59:14"/>
-            <column name="FILENAME" value="Test.htm"/>
-            <column name="ID" value="18f7ff65-175d-461f-a898-52a681c1e534"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="ce6727f6-b61f-467c-89eb-bca14f649fbc"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="953856"/>
-            <column name="DATE_EDIT" valueDate="2019-09-10T01:16:32"/>
-            <column name="DATE_NEW" valueDate="2019-09-10T01:16:32"/>
-            <column name="FILENAME" value="Geschaeftspapiere.docx"/>
-            <column name="ID" value="1cbfe5b5-283f-48c0-8dba-9d132cc3f693"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-            <column name="TABLENAME" value="CONTACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/cc0d984337d631cfa16c588b449f21b8"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4914307"/>
-            <column name="DATE_EDIT" valueDate="2019-11-15T12:12:57"/>
-            <column name="DATE_NEW" valueDate="2019-11-15T12:12:57"/>
-            <column name="FILENAME" value="Erstkontakt.eml"/>
-            <column name="ID" value="1db694f7-2118-46e7-a575-bd02f1d7cfb6"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/15f74fdb15de7c73d2c1a61ee27a1f01"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="51593"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T08:30:09"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T08:30:09"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="1e027de6-c2c3-486b-9375-efdfd0faf3b0"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="fff23f0a-b1ff-4901-8009-639dc2044a4d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="953856"/>
-            <column name="DATE_EDIT" valueDate="2019-09-04T02:57:23"/>
-            <column name="DATE_NEW" valueDate="2019-09-04T02:57:23"/>
-            <column name="FILENAME" value="Geschaeftspapiere.docx"/>
-            <column name="ID" value="1f0282f8-c67e-4c18-96b8-605063fe918a"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="dc222632-edae-4744-b6d5-e8f4967c8f7a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12253"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T10:52:26"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T10:52:26"/>
-            <column name="FILENAME" value="platzhalterword.docx"/>
-            <column name="ID" value="24ee0123-4e06-43f6-b853-8ca56dbcb504"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="728b9256-1064-42f2-847b-7692212a5a0c"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4a3bfd07a9b138ba352c8705a88fe306"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="40945"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T11:46:13"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T11:46:13"/>
-            <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
-            <column name="ID" value="28e80dac-8bae-49fd-acc4-d70bcf8bbece"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="86ae6c77-1ed6-47a7-a43c-03aa0d331062"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978985"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:40:38"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:40:38"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="2a8e424f-061e-4206-bc77-f0eeef0fba14"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="d5fcbcae-601f-4036-9803-0e762872f1cd"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978985"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T08:57:40"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T08:55:34"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="2f977ef9-de2d-4b25-8a8e-01b71a71ddff"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="8e4c15db-2092-49a9-bc75-466a42ecc840"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/45d34705f664040f9248eb8bacc2a28b"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="158014"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:47:24"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:47:24"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="2fce606e-42b3-4b7d-b810-41c33ac25f8b"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="fe9f1d8d-e24a-46d2-91d5-b79390e8f0dd"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6f1a18491d368b9b87091abcbcfcba15"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37675"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:03:06"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:03:06"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="328ccfd4-4f11-4312-bc91-04becea90161"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/1934b9888d931bd006964206bd7eb82e"/>
-            <column name="ROW_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e8cc6344b63e91066ff9741cee273ce7"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37751"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T09:34:14"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T09:34:14"/>
-            <column name="FILENAME" value="Kontaktdatenkorrektur.txt"/>
-            <column name="ID" value="32cf8fb2-160d-47d5-a28f-8a953b286a9f"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="d6a2d85b-3ecd-4d41-b220-a8b4fe98b3f2"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/19404e8c6e0d7620a4fc2d0d2f5c8dbc"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="162284"/>
-            <column name="DATE_EDIT" valueDate="2019-05-29T06:31:39"/>
-            <column name="DATE_NEW" valueDate="2019-05-29T06:31:39"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="3bf01e81-3d28-469b-b6d0-9e78e4e7dff0"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
-            <column name="TABLENAME" value="CONTRACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e22d050388d09c6a9cdeb6cef75e48ff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="210"/>
-            <column name="DATE_EDIT" valueDate="2019-07-19T02:48:33"/>
-            <column name="DATE_NEW" valueDate="2019-07-19T02:48:33"/>
-            <column name="FILENAME" value="Platzhalter.txt"/>
-            <column name="ID" value="3c233fad-0ec1-4849-be35-b0ed06e8049f"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/50013a45c80a2ced78eaa5416d39898c"/>
-            <column name="ROW_ID" value="65f5f23d-ea6f-4691-80f7-88787bcd6200"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1b3576d77942d79cdfb6c96a6a834f6b"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="5212"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:02:37"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:02:37"/>
-            <column name="FILENAME" value="footer_meineFrima.html"/>
-            <column name="ID" value="3c261dc5-e2d1-46b5-9259-467449fa1002"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/8ab69b8b0429fd6bf17496702467645e"/>
-            <column name="ROW_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/974524534e4e9e56d03ff7e4e4b669b7"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="159601"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:06:22"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:06:22"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="3f03df17-d8ad-410c-be6b-4305c3e0da3a"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
-            <column name="DATASIZE" valueNumeric="354366"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T10:25:45"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T10:25:45"/>
-            <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
-            <column name="ID" value="40b6357d-e90d-4fda-8ee4-a106068aacd5"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
-            <column name="ROW_ID" value="7430ff07-fb29-4820-8c68-3983c670d62e"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="49856"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:49:11"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:49:11"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="4146a457-edaf-4b9e-80f5-4020b6d1290c"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="1eba9d1a-09e0-4574-a66e-5ea0b0a12f8a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/912b40dae75b14b49e6d3653201a45a7"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="26"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T12:47:32"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T12:47:32"/>
-            <column name="FILENAME" value="kopftext förmlic.txt"/>
-            <column name="ID" value="4453809e-a153-4c7f-ae01-2b59ca3325e3"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5c32d4940b6672e0259b96e0b4a99c1b"/>
-            <column name="ROW_ID" value="ea745b17-2836-42e0-bb0c-ad66eb8f0bab"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0f474ccbf77d31f899cd5eab5f9a3c24"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="44736"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:03:19"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:03:19"/>
-            <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
-            <column name="ID" value="44af8cfe-84b6-497c-bd93-f7a5c5ac8159"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/64bceac916eae42b500d8b3b568d0dc4"/>
-            <column name="ROW_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a7b09b2698dede8200596089a8fa7750"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12106"/>
-            <column name="DATE_EDIT" valueDate="2019-07-19T02:50:22"/>
-            <column name="DATE_NEW" valueDate="2019-07-19T02:50:22"/>
-            <column name="FILENAME" value="platzhalterword.docx"/>
-            <column name="ID" value="45de5848-c7eb-4596-bfec-5265b4ed3564"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="88dc292a-2b9b-4d6c-97e3-e951eb886ee3"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f942a0dfecf75f3ef29e4cd6db41bc7b"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="46592"/>
-            <column name="DATE_EDIT" valueDate="2019-05-17T12:52:06"/>
-            <column name="DATE_NEW" valueDate="2019-05-17T12:52:06"/>
-            <column name="FILENAME" value="WG ADITO  Agenda Workshop.msg"/>
-            <column name="ID" value="46d08998-5025-4e4d-8dc5-971215218605"/>
-            <column name="MIMETYPE" value="application/vnd.ms-outlook"/>
-            <column name="ROW_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
-            <column name="TABLENAME" value="ACTIVITY"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9c4bb8163207a504d9bd902b211d6919"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="36694"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T11:41:57"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T11:41:57"/>
-            <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
-            <column name="ID" value="47ec6c01-d320-454d-9fb6-ea1d20fcfd7a"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="afc69e14-9ff8-4073-89df-f85decc18c85"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/33a4966b814800097ed23edc98e72bdf"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="1054110"/>
-            <column name="DATE_EDIT" valueDate="2019-05-23T11:26:01"/>
-            <column name="DATE_NEW" valueDate="2019-05-23T11:26:01"/>
-            <column name="FILENAME" value="AID017-DE - ADITO Technikbroschüre.pdf"/>
-            <column name="ID" value="48f0f57c-c60a-4714-83bb-3a31c999f766"/>
-            <column name="MIMETYPE" value="application/pdf"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/0f49a3883a4b1a63c95e253c3a6f5b49"/>
-            <column name="ROW_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-            <column name="TABLENAME" value="CONTACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c590cab1baa844ae40fcca7eae9f7120"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="361"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T10:44:15"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T10:44:15"/>
-            <column name="FILENAME" value="Platzhalter.txt"/>
-            <column name="ID" value="4afda35f-f6a3-43a5-93fa-e2c219f9cd7e"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b4bfc8e6756252b9cf027eee5afa4eb4"/>
-            <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-            <column name="TABLENAME" value="CONTACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="12253"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:48:20"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:48:20"/>
-            <column name="FILENAME" value="platzhalterword.docx"/>
-            <column name="ID" value="4c06b694-038b-44f9-a145-bce042a02bdd"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="a0b9b996-3046-47e4-aea5-c2a679e30b0f"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1b285ebd615271bbda4eccdc78b29843"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="15"/>
-            <column name="DATE_EDIT" valueDate="2019-07-19T01:48:26"/>
-            <column name="DATE_NEW" valueDate="2019-07-15T04:11:11"/>
-            <column name="DESCRIPTION" value="Image of the product"/>
-            <column name="FILENAME" value="ProductImage"/>
-            <column name="ID" value="4dfcf37a-72de-4472-b6b1-0eaa87e63bc8"/>
-            <column name="MIMETYPE" value="application/octet-stream"/>
-            <column name="ROW_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
-            <column name="TABLENAME" value="PRODUCT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1927df681b9076243156a34b466ba04d"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="46836"/>
-            <column name="DATE_EDIT" valueDate="2019-07-25T10:02:19"/>
-            <column name="DATE_NEW" valueDate="2019-07-25T10:02:19"/>
-            <column name="FILENAME" value="Test.htm"/>
-            <column name="ID" value="5087734c-ee95-4be9-8be0-0c12a33b5230"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="bc44d430-2835-4051-9f6f-eda2cc05df1a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4593"/>
-            <column name="DATE_EDIT" valueDate="2019-07-30T08:38:01"/>
-            <column name="DATE_NEW" valueDate="2019-07-30T08:38:01"/>
-            <column name="FILENAME" value="Serienbrieftest.odt"/>
-            <column name="ID" value="5143d1cf-3aac-42f9-a242-4da2a644349b"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
-            <column name="ROW_ID" value="88696542-cc87-4a7a-b529-a7ed3405e95c"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/2d856782350505ebc0e17b35a3e696c0"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="11983"/>
-            <column name="DATE_EDIT" valueDate="2019-09-04T03:19:35"/>
-            <column name="DATE_NEW" valueDate="2019-09-04T03:19:35"/>
-            <column name="FILENAME" value="Test ohne Inhalt.docx"/>
-            <column name="ID" value="58542ae5-4c6a-4a1b-9687-e3993dd12634"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="bad97238-a5c4-4e7c-b87a-0b521afc2856"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4407373"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T09:00:29"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T09:00:29"/>
-            <column name="FILENAME" value="DemoDaten_Einzelbrief.docx"/>
-            <column name="ID" value="5d00316c-b2a3-4e8c-acf0-fae48675fd8d"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="b328f059-11f0-4aca-bc46-a7ede953be4e"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="41554"/>
-            <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
-            <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
-            <column name="DESCRIPTION" value="Image of the profile"/>
-            <column name="FILENAME" value="ProfileImage"/>
-            <column name="ID" value="62030aa4-908b-48c7-abc5-6074a3a2e611"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5acb881f3923c6cddb89c89e9e42a937"/>
-            <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
-            <column name="TABLENAME" value="PERSON"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a9b8f41f0a4bedb7d6a38d5d52f85b1b"/>
-            <column name="DATASIZE" valueNumeric="399"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T11:22:21"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T11:22:21"/>
-            <column name="FILENAME" value="DemoLeadimport.csv"/>
-            <column name="ID" value="63234827-9874-49bf-affc-4ba454a4c6af"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ded1e6efa24a8a98c418771334381ee0"/>
-            <column name="ROW_ID" value="c77e7528-c5ab-4945-9c92-3ba8bee5f66d"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9a76ec5d3fcd843340434d26b6b249ad"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="48700"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T08:49:49"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T08:49:49"/>
-            <column name="FILENAME" value="Erstkontakt_Branchenneutral.htm"/>
-            <column name="ID" value="680e7267-ca2a-4b39-af99-44057e347980"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="d2a8ab6d-3761-4e16-8cc7-45add62d2dcd"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/d769a1cf1c8bba2335080db19cf99f13"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="10580"/>
-            <column name="DATE_EDIT" valueDate="2019-07-29T04:50:33"/>
-            <column name="DATE_NEW" valueDate="2019-07-29T04:50:12"/>
-            <column name="FILENAME" value="test.txt"/>
-            <column name="ID" value="6a71ae64-60ec-41b9-b0aa-8bdd8e1a74a4"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/629fbc9558d4bd91809bd795dfcf346a"/>
-            <column name="ROW_ID" value="a5968e5c-a5a6-46ac-aebf-92930fd33874"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/15f74fdb15de7c73d2c1a61ee27a1f01"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="51593"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T11:02:40"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T11:02:40"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="6db41c79-bbea-4a8a-8f72-d63489c251f6"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="34fc4969-4998-4443-aa37-3484ad4d8474"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978985"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T08:31:15"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T08:31:15"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="71c971c1-f73b-4e08-8bc4-3f648ec4a8f1"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="2b3c04aa-f3ba-4c04-abe7-4954fa1ff6e3"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/78aad2436b5dbd1a878f9e4f9e29fbf1"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4495"/>
-            <column name="DATE_EDIT" valueDate="2019-08-30T11:02:40"/>
-            <column name="DATE_NEW" valueDate="2019-08-30T11:02:40"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="72d20e81-917c-4bcb-ae81-9f978cb5f798"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/598beafd86d131dff1af1448fa6399b3"/>
-            <column name="ROW_ID" value="35177875-151f-4856-b263-c693eead9ccc"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f0e5ee0a296504b006a4333e1c9b24a9"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="47439"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:44:13"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:44:13"/>
-            <column name="FILENAME" value="Gewinnspiel.htm"/>
-            <column name="ID" value="7cdb8038-c2b6-4a3d-92e2-80b5b8a95eca"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="764acd0b-928a-4548-8311-3f50f463e19c"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/81f883491d9a080a6e51ab8c5d2c7e8d"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37287"/>
-            <column name="DATE_EDIT" valueDate="2019-07-29T05:06:28"/>
-            <column name="DATE_NEW" valueDate="2019-07-29T05:06:28"/>
-            <column name="FILENAME" value="Test.txt"/>
-            <column name="ID" value="827bc032-5d52-4947-9491-185ebcb5f336"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="fbc7ef6d-bc48-492e-94a4-fd404a9e8255"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4407373"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:46:04"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:46:04"/>
-            <column name="FILENAME" value="DemoDaten_Serienbrief.docx"/>
-            <column name="ID" value="82c6105f-b89a-4f29-a355-a68c561c2aba"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="4d01f5dc-639b-45ed-98ec-860e344ed57a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/038811d652198c99d5150b3329312bdd"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="49816"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:51:27"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:51:27"/>
-            <column name="FILENAME" value="Geschaeftspapiere_final.odt"/>
-            <column name="ID" value="8e73bdba-f17d-4f05-b04c-33020ac5b4b0"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="ebb3a038-0c45-4e43-b14c-0c56d85457e3"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
-            <column name="DATASIZE" valueNumeric="389"/>
-            <column name="DATE_EDIT" valueDate="2019-10-15T09:01:38"/>
-            <column name="DATE_NEW" valueDate="2019-10-15T09:01:38"/>
-            <column name="FILENAME" value="DemoLeadimport.csv"/>
-            <column name="ID" value="8f5bc5e7-b6b3-45cd-b783-7f33bfc3dd1b"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
-            <column name="ROW_ID" value="d1f86f63-d946-43c6-a483-34c5faa95b8f"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a19a7f7561d606fb6c815b05cd57949a"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="280"/>
-            <column name="DATE_EDIT" valueDate="2019-07-23T08:24:21"/>
-            <column name="DATE_NEW" valueDate="2019-07-23T08:24:21"/>
-            <column name="FILENAME" value="Platzhalter.txt"/>
-            <column name="ID" value="94b958a7-a5de-4c25-8465-b5bf207ea1ab"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/41265ae22b98babc2cf2661287a1f6d5"/>
-            <column name="ROW_ID" value="31f4525b-eb00-4c68-8f9e-2026fb60f5cc"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/226c22fda5fe7fb1c1fdc48286baa9c5"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="98"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:09:56"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:09:56"/>
-            <column name="FILENAME" value="Angebotskopftext mit Dank.txt"/>
-            <column name="ID" value="95604c6a-f56c-4bc0-a118-6c301b6069a9"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/21a4e763b2b80382fdaca19842904279"/>
-            <column name="ROW_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4593"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T09:50:32"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T09:50:32"/>
-            <column name="FILENAME" value="Serienbrieftest.odt"/>
-            <column name="ID" value="9c7709e1-6a05-4d7f-964d-56989e38e948"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
-            <column name="ROW_ID" value="02c4e51d-a849-4025-83eb-6890fad3529d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
-            <column name="DATASIZE" valueNumeric="354366"/>
-            <column name="DATE_EDIT" valueDate="2019-10-09T05:04:40"/>
-            <column name="DATE_NEW" valueDate="2019-10-09T04:53:18"/>
-            <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
-            <column name="ID" value="9d35ce3a-e67e-4bd6-b653-5dc9ea56aa60"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
-            <column name="ROW_ID" value="5f358e92-6b50-4592-853f-11f47cf86e7b"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c590cab1baa844ae40fcca7eae9f7120"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="361"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T11:56:55"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T11:56:55"/>
-            <column name="FILENAME" value="Platzhalter.txt"/>
-            <column name="ID" value="9f82917e-f7a0-4a84-802e-1a161211f043"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b4bfc8e6756252b9cf027eee5afa4eb4"/>
-            <column name="ROW_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
-            <column name="TABLENAME" value="OFFER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/abdb7b1c9af8d02a13428625b2c4b7c4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4130"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T11:29:14"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T11:29:14"/>
-            <column name="FILENAME" value="Erstkontakt_Anlagen_Maschinenbau.eml"/>
-            <column name="ID" value="a1e4ef39-143a-4379-865f-f3a9d8e4b2e6"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/3b321504aadfd778470cfece67754346"/>
-            <column name="ROW_ID" value="b92473c7-089b-40c1-a1f0-25e5b96ecd43"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c24edfbfc63866dd659e07ef03f45988"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="130"/>
-            <column name="DATE_EDIT" valueDate="2019-08-19T01:16:37"/>
-            <column name="DATE_NEW" valueDate="2019-08-19T01:16:37"/>
-            <column name="FILENAME" value="Testmail.html"/>
-            <column name="ID" value="a3afcd9a-2375-44da-8737-b0d76d3ef6b3"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/fd86b34ae674763936fee3276f16e051"/>
-            <column name="ROW_ID" value="a4f6309c-0d0c-4fca-a64a-dfb8758561fb"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5413f77e981a3653876b1c707671f8fa"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="158024"/>
-            <column name="DATE_EDIT" valueDate="2019-06-11T04:31:55"/>
-            <column name="DATE_NEW" valueDate="2019-06-11T04:31:55"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="a59687b0-7119-4a51-80ab-36892e25f4bb"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
-            <column name="TABLENAME" value="ACTIVITY"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4593"/>
-            <column name="DATE_EDIT" valueDate="2019-08-02T09:50:39"/>
-            <column name="DATE_NEW" valueDate="2019-08-02T09:50:39"/>
-            <column name="FILENAME" value="Serienbrieftest.odt"/>
-            <column name="ID" value="a6ab9367-2f9d-4a4a-a258-404a80c4e252"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
-            <column name="ROW_ID" value="292762c1-c004-4cf4-8718-0167dfdbfa78"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="354366"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T08:24:51"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T08:24:51"/>
-            <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
-            <column name="ID" value="a80d89c5-86d0-4161-89dd-fc55e05673d7"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
-            <column name="ROW_ID" value="509f8eb4-cf04-45d6-a06a-4a53ffaf0f95"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/acd976c80b510dbe81e1908ecf3c12f5"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="95628"/>
-            <column name="DATE_EDIT" valueDate="2019-09-03T04:31:34"/>
-            <column name="DATE_NEW" valueDate="2019-09-03T04:31:34"/>
-            <column name="FILENAME" value="Nutzung des Neon Ticket-Systems.html"/>
-            <column name="ID" value="ac878df9-2310-40d7-be80-544578956331"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/octet-stream"/>
-            <column name="ROW_ID" value="e6527bda-0475-42e0-9b7c-29c8ce4db58a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978985"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:37:37"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:37:37"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="aeccedaa-cef0-41c9-8fae-5337c6c45bec"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="9bfa24a1-4e46-4643-a3ce-eb0056088f8a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01acc8b4c71e3e221cb5960f566991b5"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="47419"/>
-            <column name="DATE_EDIT" valueDate="2019-07-25T09:52:59"/>
-            <column name="DATE_NEW" valueDate="2019-07-25T09:52:59"/>
-            <column name="FILENAME" value="Unbenannt.html"/>
-            <column name="ID" value="b01f1280-8498-4ea5-9019-3d0193d4d617"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="3a498982-60ba-4c0a-9dcc-e6f2241e570d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5413f77e981a3653876b1c707671f8fa"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="158024"/>
-            <column name="DATE_EDIT" valueDate="2019-06-11T04:36:47"/>
-            <column name="DATE_NEW" valueDate="2019-06-11T04:36:47"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="b06ece8b-1b35-454a-9d67-74adc0e912dd"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
-            <column name="TABLENAME" value="CONTRACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1927df681b9076243156a34b466ba04d"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="46836"/>
-            <column name="DATE_EDIT" valueDate="2019-07-29T05:03:39"/>
-            <column name="DATE_NEW" valueDate="2019-07-29T05:03:39"/>
-            <column name="FILENAME" value="Test.htm"/>
-            <column name="ID" value="b177b8db-a917-4457-a3dc-843a86cea630"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="ec32511a-dabb-4151-9ceb-edefb721a698"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/81f883491d9a080a6e51ab8c5d2c7e8d"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37287"/>
-            <column name="DATE_EDIT" valueDate="2019-07-25T10:42:28"/>
-            <column name="DATE_NEW" valueDate="2019-07-25T10:42:28"/>
-            <column name="FILENAME" value="Testmail.txt"/>
-            <column name="ID" value="b27d7e5a-4889-4c5c-9ddc-0c50462c6f98"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="ca1b94ce-344f-44a4-acf6-d6ff08d6c34f"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c33c633bdc271e837d3a979a9d5fff69"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="1819"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T10:27:33"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T10:27:33"/>
-            <column name="FILENAME" value="Emails_überarbeitet.txt"/>
-            <column name="ID" value="b2e57791-af02-4a1e-a334-fcad134046db"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/e20351259564192e04ca73b46bd938d1"/>
-            <column name="ROW_ID" value="dab2b50f-e524-4a4d-aff8-8a53d6217f5c"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5c3b9bf8852fce3729aa0556a4a780e1"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978393"/>
-            <column name="DATE_EDIT" valueDate="2019-10-15T02:40:19"/>
-            <column name="DATE_NEW" valueDate="2019-10-15T02:40:19"/>
-            <column name="FILENAME" value="Erstkontakt.eml"/>
-            <column name="ID" value="b35e8149-ea3f-4eb2-9ec8-2dd77cfd0df1"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="d77f966e-e43d-482c-90fc-4c286a2f4bb7"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/689020ca7b4c5c70c92f0506e869c8e6"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="51487"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T08:29:46"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T08:29:46"/>
-            <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
-            <column name="ID" value="b3904a52-9e7d-449e-83de-cceb3596d3db"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="814ef0c0-52b1-4551-aec0-31878550e48f"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/d6e22dc7b559e3350c8dd9022fbefdc2"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="47426"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:39:39"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:39:39"/>
-            <column name="FILENAME" value="Gewinnspiel.htm"/>
-            <column name="ID" value="ba8558e2-4517-4b82-9b11-fbb1eee74588"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="5ac971fd-2c52-4fbb-8151-a61b4571f058"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/302b5fa29e39c8a02a8c1448ff3910b3"/>
-            <column name="DATASIZE" valueNumeric="887484"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T09:58:09"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T09:58:09"/>
-            <column name="FILENAME" value="crmKontakte -Teil1.csv"/>
-            <column name="ID" value="bb407845-807c-4dcc-9536-8c1de0a45fef"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/04a8e899e701a284e67a4c5e07f19903"/>
-            <column name="ROW_ID" value="5f2df795-0c59-4183-9930-a884c0469ec5"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f9c9eae8183b9c9340f03876b39a3362"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="36691"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:52:45"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:51:27"/>
-            <column name="FILENAME" value="SerieneinladungTelefonkonferenz.html"/>
-            <column name="ID" value="bd4c9292-5429-4aa2-8f38-21161776b902"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/a5d872a35697fea105c043a5d79a9a11"/>
-            <column name="ROW_ID" value="9f55b65f-7e78-4dec-9dec-36e5933439b4"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/49d3146cb185e61df669506d15c319cb"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="50024"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T09:02:16"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T09:02:16"/>
-            <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
-            <column name="ID" value="bdb8e01b-9fd0-49da-9475-cb04fa161229"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="9e64bb57-2895-4b89-968d-73bbb6545139"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c0d5b740056d6825c8d4eab32a4e2e5a"/>
-            <column name="DATASIZE" valueNumeric="3440718"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T03:53:54"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T03:53:54"/>
-            <column name="FILENAME" value="crmKontakte.CSV"/>
-            <column name="ID" value="c2ba7e69-c88d-49b0-aa50-44ced00eebf6"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/261655987485e2a158d679cd234b63b0"/>
-            <column name="ROW_ID" value="3c61945f-3699-44a8-8243-68369a3b8ef9"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4f28ca232405b199c36a2a322c604840"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="6203"/>
-            <column name="DATE_EDIT" valueDate="2019-05-23T01:16:23"/>
-            <column name="DATE_NEW" valueDate="2019-05-23T01:16:23"/>
-            <column name="FILENAME" value="Kunden begeistern mit passgenauem Online-Marketing Teil 1 - Teilnehmerbericht.xlsx"/>
-            <column name="ID" value="c4f11f5c-0fbe-4a7c-894c-968f9d605bc0"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
-            <column name="ROW_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-            <column name="TABLENAME" value="ACTIVITY"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e8cc6344b63e91066ff9741cee273ce7"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37751"/>
-            <column name="DATE_EDIT" valueDate="2019-07-30T11:27:13"/>
-            <column name="DATE_NEW" valueDate="2019-07-30T11:27:13"/>
-            <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
-            <column name="ID" value="c71dd680-8d48-42f2-8ffe-06540b49ea5a"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="daa63509-937b-4ce3-aed8-a79863225ef2"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9386121ffea926a30b9fa54870968dd1"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="41554"/>
-            <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
-            <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
-            <column name="DESCRIPTION" value="Image of the profile"/>
-            <column name="FILENAME" value="ProfileImage"/>
-            <column name="ID" value="ca0db8c3-e51a-45da-8fe4-7c727396d52e"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/4d2fdaebe7a657843273c9714729df48"/>
-            <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
-            <column name="TABLENAME" value="PERSON"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="41554"/>
-            <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
-            <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
-            <column name="DESCRIPTION" value="Image of the profile"/>
-            <column name="FILENAME" value="ProfileImage"/>
-            <column name="ID" value="ca8d0195-db3f-4b04-98be-9c46e060e67b"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/1bafbc350fd7bb88105555e14ef98d93"/>
-            <column name="ROW_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
-            <column name="TABLENAME" value="PERSON"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="49856"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:45:54"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:45:54"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="cb09f02d-2981-4ce4-b44f-ad9cc65a7852"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="54c20fa2-e182-4e5e-b919-122a983996e5"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4f8d2fbe1fa680acfddecbf6a2d7eb1b"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="2820"/>
-            <column name="DATE_EDIT" valueDate="2019-03-21T09:23:21"/>
-            <column name="DATE_NEW" valueDate="2019-03-21T09:23:21"/>
-            <column name="FILENAME" value="20181002_Dokumentenmanagement.txt"/>
-            <column name="ID" value="d16ec3bc-07a1-4343-b0ee-439f5b418831"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/17f1c477322bb191430e50a1d9de6e20"/>
-            <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
-            <column name="TABLENAME" value="CONTACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
-            <column name="DATASIZE" valueNumeric="389"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T10:19:20"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T10:19:20"/>
-            <column name="FILENAME" value="DemoLeadimport.csv"/>
-            <column name="ID" value="d3823171-82b0-4add-a87b-effec63cf476"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
-            <column name="ROW_ID" value="781c9457-3892-4794-80b4-9a4fed9bf413"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/bc8f1f5b42dad335e916b1ceb4ce1ff4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="41096"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:47:00"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:47:00"/>
-            <column name="FILENAME" value="EinzeleinladungTelefonkonferenz.htm"/>
-            <column name="ID" value="d6ba04b6-1470-4804-98d1-0ae2a9e32a3d"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="dfe476e5-0624-4298-b49d-82ae08d828d4"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/670d53f8afc15262779fdd5d30c0067e"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="57068"/>
-            <column name="DATE_EDIT" valueDate="2019-07-27T11:31:58"/>
-            <column name="DATE_NEW" valueDate="2019-07-27T11:31:58"/>
-            <column name="FILENAME" value="2018_11_29_WeitereInfos_Firma.png"/>
-            <column name="ID" value="d802b6b7-cc99-44df-8638-497faa12bbf6"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ff1d70b43b211db9f56032eb197599da"/>
-            <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
-            <column name="TABLENAME" value="CONTACT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b15fb7570d77e81948aac92c347638bf"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="21722"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:00:32"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:00:32"/>
-            <column name="FILENAME" value="Erstkontakt meineFirma.eml"/>
-            <column name="ID" value="d9b64af4-4c91-42ba-bfc0-a8688faf638f"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/302b5fa29e39c8a02a8c1448ff3910b3"/>
-            <column name="DATASIZE" valueNumeric="887484"/>
-            <column name="DATE_EDIT" valueDate="2019-10-15T09:06:19"/>
-            <column name="DATE_NEW" valueDate="2019-10-15T09:06:19"/>
-            <column name="FILENAME" value="crmKontakte -Teil1.csv"/>
-            <column name="ID" value="da23010a-c3dd-4df8-81b1-a49c99b50605"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/04a8e899e701a284e67a4c5e07f19903"/>
-            <column name="ROW_ID" value="05071d57-c74c-405d-b89c-43ff5005306f"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/624076ebf52efb7b94e80b198c6c19b2"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="47252"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T10:08:07"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T10:08:07"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="da89e27b-b68f-46cf-b14a-2ef578c885a3"/>
-            <column name="KEYWORD" value="undefined"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="21e9b19f-98d8-4610-8f30-9f7647282ab4"/>
-            <column name="TABLENAME" value="ACTIVITY"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="953856"/>
-            <column name="DATE_EDIT" valueDate="2019-08-30T11:04:36"/>
-            <column name="DATE_NEW" valueDate="2019-08-30T11:04:36"/>
-            <column name="FILENAME" value="Geschaeftspapiere.docx"/>
-            <column name="ID" value="da90d13c-a91b-43a3-aa7b-c301f1edb014"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="34bea077-5dc4-4063-9646-17337f48e4d5"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/72e03deaab4283f1f0f8ac0dcbec5d9f"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="41301"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:01:31"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:01:31"/>
-            <column name="FILENAME" value="SerieneinladungTelefonkonferenz.html"/>
-            <column name="ID" value="dab3b3eb-1fb5-46de-af85-bd79c6584185"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a47b9712f19a2276108994bc82da447a"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="105"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:11:23"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:11:23"/>
-            <column name="FILENAME" value="Angebotsfußtext mit Dank.txt"/>
-            <column name="ID" value="dc1d9429-831f-4687-9362-d9a01a2a9b68"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/524bee188cb50feb8ce69490bff251da"/>
-            <column name="ROW_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/58d526fe1ec32f07facc7c52e04619b3"/>
-            <column name="CONTAINERNAME" value="IMAGE"/>
-            <column name="DATASIZE" valueNumeric="41554"/>
-            <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
-            <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
-            <column name="DESCRIPTION" value="Image of the profile"/>
-            <column name="FILENAME" value="ProfileImage"/>
-            <column name="ID" value="dfb81242-520b-4bd6-95f0-84882f4e61ae"/>
-            <column name="MIMETYPE" value="image/png"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/41b5b566200a8bf6784cc5c6ea8931d6"/>
-            <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-            <column name="TABLENAME" value="PERSON"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
-            <column name="DATASIZE" valueNumeric="354366"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T08:03:33"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T08:03:33"/>
-            <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
-            <column name="ID" value="dff33d08-e7c0-457b-a8fc-9bfe0f6fbeb2"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
-            <column name="ROW_ID" value="509f8eb4-cf04-45d6-a06a-4a53ffaf0f95"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/cc0d984337d631cfa16c588b449f21b8"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978394"/>
-            <column name="DATE_EDIT" valueDate="2019-10-17T09:04:31"/>
-            <column name="DATE_NEW" valueDate="2019-10-17T09:04:31"/>
-            <column name="FILENAME" value="Erstkontakt.eml"/>
-            <column name="ID" value="e185fd6a-0134-43a8-9f62-4459ed595ac4"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/fc4aa67f3f465efd278d8471a9afc970"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="41096"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:46:24"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:46:24"/>
-            <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
-            <column name="ID" value="e417291d-f718-407e-aebf-a3847ee4a8d3"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="1778521a-1ba6-45eb-afaa-77c34bacf74d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
-            <column name="DATASIZE" valueNumeric="354366"/>
-            <column name="DATE_EDIT" valueDate="2019-10-10T09:02:28"/>
-            <column name="DATE_NEW" valueDate="2019-10-10T09:02:28"/>
-            <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
-            <column name="ID" value="e58ef463-fd4b-4fce-bf0b-c553c16800c8"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
-            <column name="ROW_ID" value="5f986c0d-8c4d-4111-93ca-bcbf5263d35e"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4407373"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:46:44"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:46:44"/>
-            <column name="FILENAME" value="DemoDaten_Einzelbrief.docx"/>
-            <column name="ID" value="e8fd78fc-a861-4cc2-82d3-417ea852e051"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="f1bca769-87e8-4103-b25f-c6592317741c"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4978985"/>
-            <column name="DATE_EDIT" valueDate="2019-09-04T02:56:44"/>
-            <column name="DATE_NEW" valueDate="2019-09-04T02:56:44"/>
-            <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
-            <column name="ID" value="e9198094-f2fa-4b21-91f6-09daedc2bb33"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="970c8ca0-b24c-4275-8b45-2a0c3af3980f"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6deedcdb0edd41abf5834c8ac6f69fa2"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="4407392"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T08:48:43"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T08:48:43"/>
-            <column name="FILENAME" value="DemoDaten_Serienbrief.docx"/>
-            <column name="ID" value="ea3f54dd-82f2-4c78-9ffa-e66513773f9c"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="17e2499f-86dc-418c-876d-9f895da3354b"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c0d5b740056d6825c8d4eab32a4e2e5a"/>
-            <column name="DATASIZE" valueNumeric="3440718"/>
-            <column name="DATE_EDIT" valueDate="2019-10-11T08:13:02"/>
-            <column name="DATE_NEW" valueDate="2019-10-11T08:13:02"/>
-            <column name="FILENAME" value="crmKontakte.csv"/>
-            <column name="ID" value="ec70ec28-f390-4a22-abb7-9a075684e1c9"/>
-            <column name="KEYWORD" value="MAINDOCUMENT"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/261655987485e2a158d679cd234b63b0"/>
-            <column name="ROW_ID" value="ddf07c49-8481-44f7-b99d-f6178ee91032"/>
-            <column name="TABLENAME" value="LEADIMPORT"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/69b7cd8968644958ba4c7f7f2eaf5004"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="50052"/>
-            <column name="DATE_EDIT" valueDate="2019-10-08T09:00:52"/>
-            <column name="DATE_NEW" valueDate="2019-10-08T09:00:52"/>
-            <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
-            <column name="ID" value="ed5b3682-31e1-4368-92b1-1c51a59dcdba"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="8909fb30-cfcb-4241-8c12-813260d8215d"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/ad90364f7929e36777304d76c8a1ff6e"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="3469"/>
-            <column name="DATE_EDIT" valueDate="2019-08-22T03:59:53"/>
-            <column name="DATE_NEW" valueDate="2019-08-22T03:59:53"/>
-            <column name="FILENAME" value="Erstkontakt_Anlagen_Maschinenbau.eml"/>
-            <column name="ID" value="f15c11c2-6fe0-43de-8ea6-7950cdb86277"/>
-            <column name="MIMETYPE" value="text/plain"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/e6171f88ac2cacb0c73fc84eee151c1e"/>
-            <column name="ROW_ID" value="9a323aaa-6779-4388-88c0-5a32a778f195"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1a89c2cc804288ea43899e39105256ad"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="13"/>
-            <column name="DATE_EDIT" valueDate="2019-08-02T09:40:58"/>
-            <column name="DATE_NEW" valueDate="2019-08-02T09:40:14"/>
-            <column name="FILENAME" value="Kontaktdaten.txt"/>
-            <column name="ID" value="f513da6e-a150-481a-85e4-ee1ee435e850"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="7d3258f9-33d9-40d9-a751-2f5170c39b83"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/64b7d469d3c0b79da072d821de5f31da"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="37617"/>
-            <column name="DATE_EDIT" valueDate="2019-07-31T12:34:45"/>
-            <column name="DATE_NEW" valueDate="2019-07-31T12:34:45"/>
-            <column name="FILENAME" value="Test.txt"/>
-            <column name="ID" value="f78fa27f-f1f1-4cf6-ab3d-fec88c8c11d5"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="b7382ffd-691a-4913-9455-345174942287"/>
-            <column name="TABLENAME" value="BULKMAIL"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/19404e8c6e0d7620a4fc2d0d2f5c8dbc"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="162284"/>
-            <column name="DATE_EDIT" valueDate="2019-05-29T06:42:47"/>
-            <column name="DATE_NEW" valueDate="2019-05-29T06:42:47"/>
-            <column name="FILENAME" value="Rahmenvertrag.docx"/>
-            <column name="ID" value="f7d30418-7727-459c-8b6e-0ef41e16f3fd"/>
-            <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
-            <column name="ROW_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
-            <column name="TABLENAME" value="ACTIVITY"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/689020ca7b4c5c70c92f0506e869c8e6"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="51487"/>
-            <column name="DATE_EDIT" valueDate="2019-09-04T02:58:42"/>
-            <column name="DATE_NEW" valueDate="2019-09-04T02:58:42"/>
-            <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
-            <column name="ID" value="fb4d4b26-6b2d-4f69-ae7f-a4ed4e86c3b9"/>
-            <column name="MIMETYPE" value="text/html"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
-            <column name="ROW_ID" value="cfbe9ef8-457d-4600-84f5-3058b35c32cf"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="49856"/>
-            <column name="DATE_EDIT" valueDate="2019-09-13T11:17:36"/>
-            <column name="DATE_NEW" valueDate="2019-09-13T11:17:36"/>
-            <column name="FILENAME" value="Geschaeftspapiere.odt"/>
-            <column name="ID" value="fec3067c-1a4b-4669-a63f-5f6f81e18463"/>
-            <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
-            <column name="ROW_ID" value="e20dadf7-fb86-40c9-bc6b-56307bfa05d3"/>
-            <column name="TABLENAME" value="SERIALLETTER"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/74aeda3171338236e373094c930b2ebd"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="168193"/>
-            <column name="DATE_EDIT" valueDate="2019-09-23T02:38:36"/>
-            <column name="DATE_NEW" valueDate="2019-09-23T02:38:36"/>
-            <column name="FILENAME" value="Rahmenvertrag.pdf"/>
-            <column name="ID" value="ffce8eeb-b723-438f-aaa5-ddcbee28ecc2"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="application/pdf"/>
-            <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/895f169c7fea615c680f9c9859e671ad"/>
-            <column name="ROW_ID" value="db95a661-d0ac-4541-b876-b546c82354b9"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-        <insert tableName="ASYS_BINARIES">
-            <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/72f0f500-e7b7-4b0d-90e3-240d9edc88ee"/>
-            <column name="CONTAINERNAME" value="DOCUMENT"/>
-            <column name="DATASIZE" valueNumeric="7416"/>
-            <column name="DATE_EDIT" valueDate="2020-03-24T14:50:41"/>
-            <column name="DATE_NEW" valueDate="2020-03-24T14:50:41"/>
-            <column name="FILENAME" value="Angebotsanfrage.eml"/>
-            <column name="ID" value="867995aa-5a62-4121-ba1f-880cdb18eed1"/>
-            <column name="KEYWORD" value="TEMPLATE"/>
-            <column name="MIMETYPE" value="message/rfc822"/>
-            <column name="ROW_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
-            <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
-            <column name="USER_EDIT" value="Admin"/>
-            <column name="USER_NEW" value="Admin"/>
-        </insert>
-    </changeSet>
+  <changeSet author="autogenerated" id="30f4cb5c8ac53ef6c27cadb9edb3252b">
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-27T11:42:38"/>
+      <column name="FILENAME" value="address.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-07-27T11:42:38"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="011eb0ce-b209-44e2-a5bf-5d5c9d056372"/>
+      <column name="DATASIZE" valueNumeric="12037"/>
+      <column name="ROW_ID" value="a1b00343-1b45-40e2-a3d0-e54847a14eb8"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e990531850d88c95118c75ed34b42615"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-29T05:02:35"/>
+      <column name="FILENAME" value="platzhalterword.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-07-29T05:02:35"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="0844e0e3-e456-4517-aaa0-a43834a70bbb"/>
+      <column name="DATASIZE" valueNumeric="12253"/>
+      <column name="ROW_ID" value="7861355c-251d-4483-a040-6cd93b9fbe2d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:03:41"/>
+      <column name="FILENAME" value="Standardbriefvorlage.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:03:41"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="0a0588bb-b75e-4be5-88f5-c3eb0e07dee8"/>
+      <column name="DATASIZE" valueNumeric="4412370"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/ef3d15d33c3023a91985372805270dc6"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T02:06:04"/>
+      <column name="FILENAME" value="DemoLeadimport.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T02:06:04"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="0a3ddc5a-0463-4da2-9264-d7ff13a56f84"/>
+      <column name="DATASIZE" valueNumeric="389"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="f85740b9-6180-4d4f-8d9b-34c057073dab"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T11:43:20"/>
+      <column name="FILENAME" value="DemoLeadimport.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T11:43:20"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="0af4991d-5d5b-4dc9-8eb0-ce9ceb843523"/>
+      <column name="DATASIZE" valueNumeric="389"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="048f0744-d7d9-46e5-bfdb-3be766818969"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/d53815eeeac3c3fa5d5c4d60ee9a6954"/>
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the profile"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
+      <column name="FILENAME" value="ProfileImage"/>
+      <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="0c9e1a2e-220c-4574-9d04-870b8ee22000"/>
+      <column name="DATASIZE" valueNumeric="41554"/>
+      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="TABLENAME" value="PERSON"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5dbfcfef4e102c68982c8dccc390f3e0"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-22T02:57:18"/>
+      <column name="FILENAME" value="platzhalterword.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-07-22T02:57:18"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="15369b8b-0ad6-4eee-96b3-cd88dd27c273"/>
+      <column name="DATASIZE" valueNumeric="12106"/>
+      <column name="ROW_ID" value="841f7cf6-554b-47c4-ac57-dd71a2272fdd"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a7b09b2698dede8200596089a8fa7750"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-25T09:59:14"/>
+      <column name="FILENAME" value="Test.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-07-25T09:59:14"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="18f7ff65-175d-461f-a898-52a681c1e534"/>
+      <column name="DATASIZE" valueNumeric="46836"/>
+      <column name="ROW_ID" value="ce6727f6-b61f-467c-89eb-bca14f649fbc"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/77030fb819d7bed57f5fc12e981b287b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-10T01:16:32"/>
+      <column name="FILENAME" value="Geschaeftspapiere.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-09-10T01:16:32"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="1cbfe5b5-283f-48c0-8dba-9d132cc3f693"/>
+      <column name="DATASIZE" valueNumeric="953856"/>
+      <column name="ROW_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-11-15T12:12:57"/>
+      <column name="FILENAME" value="Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-11-15T12:12:57"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="1db694f7-2118-46e7-a575-bd02f1d7cfb6"/>
+      <column name="DATASIZE" valueNumeric="4914307"/>
+      <column name="ROW_ID" value="c4bd88c3-6205-4b91-8ba6-fd44fda2f19d"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/cc0d984337d631cfa16c588b449f21b8"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T08:30:09"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T08:30:09"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="1e027de6-c2c3-486b-9375-efdfd0faf3b0"/>
+      <column name="DATASIZE" valueNumeric="51593"/>
+      <column name="ROW_ID" value="fff23f0a-b1ff-4901-8009-639dc2044a4d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/15f74fdb15de7c73d2c1a61ee27a1f01"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T02:57:23"/>
+      <column name="FILENAME" value="Geschaeftspapiere.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-09-04T02:57:23"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="1f0282f8-c67e-4c18-96b8-605063fe918a"/>
+      <column name="DATASIZE" valueNumeric="953856"/>
+      <column name="ROW_ID" value="dc222632-edae-4744-b6d5-e8f4967c8f7a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T10:52:26"/>
+      <column name="FILENAME" value="platzhalterword.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T10:52:26"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="24ee0123-4e06-43f6-b853-8ca56dbcb504"/>
+      <column name="DATASIZE" valueNumeric="12253"/>
+      <column name="ROW_ID" value="728b9256-1064-42f2-847b-7692212a5a0c"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T11:46:13"/>
+      <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T11:46:13"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="28e80dac-8bae-49fd-acc4-d70bcf8bbece"/>
+      <column name="DATASIZE" valueNumeric="40945"/>
+      <column name="ROW_ID" value="86ae6c77-1ed6-47a7-a43c-03aa0d331062"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4a3bfd07a9b138ba352c8705a88fe306"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:40:38"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:40:38"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="2a8e424f-061e-4206-bc77-f0eeef0fba14"/>
+      <column name="DATASIZE" valueNumeric="4978985"/>
+      <column name="ROW_ID" value="d5fcbcae-601f-4036-9803-0e762872f1cd"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T08:55:34"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T08:57:40"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="2f977ef9-de2d-4b25-8a8e-01b71a71ddff"/>
+      <column name="DATASIZE" valueNumeric="4978985"/>
+      <column name="ROW_ID" value="8e4c15db-2092-49a9-bc75-466a42ecc840"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:47:24"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:47:24"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="2fce606e-42b3-4b7d-b810-41c33ac25f8b"/>
+      <column name="DATASIZE" valueNumeric="158014"/>
+      <column name="ROW_ID" value="fe9f1d8d-e24a-46d2-91d5-b79390e8f0dd"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/45d34705f664040f9248eb8bacc2a28b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/1934b9888d931bd006964206bd7eb82e"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:03:06"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:03:06"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="328ccfd4-4f11-4312-bc91-04becea90161"/>
+      <column name="DATASIZE" valueNumeric="37675"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cb0d2bc68c1e07516437657c37fb79c"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T09:34:14"/>
+      <column name="FILENAME" value="Kontaktdatenkorrektur.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T09:34:14"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="32cf8fb2-160d-47d5-a28f-8a953b286a9f"/>
+      <column name="DATASIZE" valueNumeric="37751"/>
+      <column name="ROW_ID" value="d6a2d85b-3ecd-4d41-b220-a8b4fe98b3f2"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e8cc6344b63e91066ff9741cee273ce7"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-29T06:31:39"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T06:31:39"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="3bf01e81-3d28-469b-b6d0-9e78e4e7dff0"/>
+      <column name="DATASIZE" valueNumeric="162284"/>
+      <column name="ROW_ID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
+      <column name="TABLENAME" value="CONTRACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/19404e8c6e0d7620a4fc2d0d2f5c8dbc"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/50013a45c80a2ced78eaa5416d39898c"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-19T02:48:33"/>
+      <column name="FILENAME" value="Platzhalter.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-19T02:48:33"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="3c233fad-0ec1-4849-be35-b0ed06e8049f"/>
+      <column name="DATASIZE" valueNumeric="210"/>
+      <column name="ROW_ID" value="65f5f23d-ea6f-4691-80f7-88787bcd6200"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e22d050388d09c6a9cdeb6cef75e48ff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/8ab69b8b0429fd6bf17496702467645e"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:02:37"/>
+      <column name="FILENAME" value="footer_meineFrima.html"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:02:37"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="3c261dc5-e2d1-46b5-9259-467449fa1002"/>
+      <column name="DATASIZE" valueNumeric="5212"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1b3576d77942d79cdfb6c96a6a834f6b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:06:22"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:06:22"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="3f03df17-d8ad-410c-be6b-4305c3e0da3a"/>
+      <column name="DATASIZE" valueNumeric="159601"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/974524534e4e9e56d03ff7e4e4b669b7"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T10:25:45"/>
+      <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T10:25:45"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="40b6357d-e90d-4fda-8ee4-a106068aacd5"/>
+      <column name="DATASIZE" valueNumeric="354366"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="7430ff07-fb29-4820-8c68-3983c670d62e"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:49:11"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:49:11"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="4146a457-edaf-4b9e-80f5-4020b6d1290c"/>
+      <column name="DATASIZE" valueNumeric="49856"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="1eba9d1a-09e0-4574-a66e-5ea0b0a12f8a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5c32d4940b6672e0259b96e0b4a99c1b"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T12:47:32"/>
+      <column name="FILENAME" value="kopftext förmlic.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T12:47:32"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="4453809e-a153-4c7f-ae01-2b59ca3325e3"/>
+      <column name="DATASIZE" valueNumeric="26"/>
+      <column name="ROW_ID" value="ea745b17-2836-42e0-bb0c-ad66eb8f0bab"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/912b40dae75b14b49e6d3653201a45a7"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/64bceac916eae42b500d8b3b568d0dc4"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:03:19"/>
+      <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:03:19"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="44af8cfe-84b6-497c-bd93-f7a5c5ac8159"/>
+      <column name="DATASIZE" valueNumeric="44736"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e3ba3d891ab9cbc43367cd4cce7eeb55"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-19T02:50:22"/>
+      <column name="FILENAME" value="platzhalterword.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-07-19T02:50:22"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="45de5848-c7eb-4596-bfec-5265b4ed3564"/>
+      <column name="DATASIZE" valueNumeric="12106"/>
+      <column name="ROW_ID" value="88dc292a-2b9b-4d6c-97e3-e951eb886ee3"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a7b09b2698dede8200596089a8fa7750"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T12:52:06"/>
+      <column name="FILENAME" value="WG ADITO  Agenda Workshop.msg"/>
+      <column name="DATE_EDIT" valueDate="2019-05-17T12:52:06"/>
+      <column name="MIMETYPE" value="application/vnd.ms-outlook"/>
+      <column name="ID" value="46d08998-5025-4e4d-8dc5-971215218605"/>
+      <column name="DATASIZE" valueNumeric="46592"/>
+      <column name="ROW_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f942a0dfecf75f3ef29e4cd6db41bc7b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T11:41:57"/>
+      <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T11:41:57"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="47ec6c01-d320-454d-9fb6-ea1d20fcfd7a"/>
+      <column name="DATASIZE" valueNumeric="36694"/>
+      <column name="ROW_ID" value="afc69e14-9ff8-4073-89df-f85decc18c85"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9c4bb8163207a504d9bd902b211d6919"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/0f49a3883a4b1a63c95e253c3a6f5b49"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T11:26:01"/>
+      <column name="FILENAME" value="AID017-DE - ADITO Technikbroschüre.pdf"/>
+      <column name="DATE_EDIT" valueDate="2019-05-23T11:26:01"/>
+      <column name="MIMETYPE" value="application/pdf"/>
+      <column name="ID" value="48f0f57c-c60a-4714-83bb-3a31c999f766"/>
+      <column name="DATASIZE" valueNumeric="1054110"/>
+      <column name="ROW_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/33a4966b814800097ed23edc98e72bdf"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b4bfc8e6756252b9cf027eee5afa4eb4"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T10:44:15"/>
+      <column name="FILENAME" value="Platzhalter.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T10:44:15"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="4afda35f-f6a3-43a5-93fa-e2c219f9cd7e"/>
+      <column name="DATASIZE" valueNumeric="361"/>
+      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c590cab1baa844ae40fcca7eae9f7120"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:48:20"/>
+      <column name="FILENAME" value="platzhalterword.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:48:20"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="4c06b694-038b-44f9-a145-bce042a02bdd"/>
+      <column name="DATASIZE" valueNumeric="12253"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="a0b9b996-3046-47e4-aea5-c2a679e30b0f"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0a850a8bb6eef7ba9ecdb285c79d9739"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the product"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-15T04:11:11"/>
+      <column name="FILENAME" value="ProductImage"/>
+      <column name="DATE_EDIT" valueDate="2019-07-19T01:48:26"/>
+      <column name="MIMETYPE" value="application/octet-stream"/>
+      <column name="ID" value="4dfcf37a-72de-4472-b6b1-0eaa87e63bc8"/>
+      <column name="DATASIZE" valueNumeric="15"/>
+      <column name="ROW_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
+      <column name="TABLENAME" value="PRODUCT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1b285ebd615271bbda4eccdc78b29843"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-25T10:02:19"/>
+      <column name="FILENAME" value="Test.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-07-25T10:02:19"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="5087734c-ee95-4be9-8be0-0c12a33b5230"/>
+      <column name="DATASIZE" valueNumeric="46836"/>
+      <column name="ROW_ID" value="bc44d430-2835-4051-9f6f-eda2cc05df1a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1927df681b9076243156a34b466ba04d"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-30T08:38:01"/>
+      <column name="FILENAME" value="Serienbrieftest.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-30T08:38:01"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="5143d1cf-3aac-42f9-a242-4da2a644349b"/>
+      <column name="DATASIZE" valueNumeric="4593"/>
+      <column name="ROW_ID" value="88696542-cc87-4a7a-b529-a7ed3405e95c"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T03:19:35"/>
+      <column name="FILENAME" value="Test ohne Inhalt.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-09-04T03:19:35"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="58542ae5-4c6a-4a1b-9687-e3993dd12634"/>
+      <column name="DATASIZE" valueNumeric="11983"/>
+      <column name="ROW_ID" value="bad97238-a5c4-4e7c-b87a-0b521afc2856"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/2d856782350505ebc0e17b35a3e696c0"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T09:00:29"/>
+      <column name="FILENAME" value="DemoDaten_Einzelbrief.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T09:00:29"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="5d00316c-b2a3-4e8c-acf0-fae48675fd8d"/>
+      <column name="DATASIZE" valueNumeric="4407373"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="b328f059-11f0-4aca-bc46-a7ede953be4e"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5acb881f3923c6cddb89c89e9e42a937"/>
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the profile"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
+      <column name="FILENAME" value="ProfileImage"/>
+      <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="62030aa4-908b-48c7-abc5-6074a3a2e611"/>
+      <column name="DATASIZE" valueNumeric="41554"/>
+      <column name="ROW_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
+      <column name="TABLENAME" value="PERSON"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ded1e6efa24a8a98c418771334381ee0"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T11:22:21"/>
+      <column name="FILENAME" value="DemoLeadimport.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T11:22:21"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="63234827-9874-49bf-affc-4ba454a4c6af"/>
+      <column name="DATASIZE" valueNumeric="399"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="c77e7528-c5ab-4945-9c92-3ba8bee5f66d"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a9b8f41f0a4bedb7d6a38d5d52f85b1b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T08:49:49"/>
+      <column name="FILENAME" value="Erstkontakt_Branchenneutral.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T08:49:49"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="680e7267-ca2a-4b39-af99-44057e347980"/>
+      <column name="DATASIZE" valueNumeric="48700"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="d2a8ab6d-3761-4e16-8cc7-45add62d2dcd"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9a76ec5d3fcd843340434d26b6b249ad"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/629fbc9558d4bd91809bd795dfcf346a"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-29T04:50:12"/>
+      <column name="FILENAME" value="test.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-29T04:50:33"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="6a71ae64-60ec-41b9-b0aa-8bdd8e1a74a4"/>
+      <column name="DATASIZE" valueNumeric="10580"/>
+      <column name="ROW_ID" value="a5968e5c-a5a6-46ac-aebf-92930fd33874"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/d769a1cf1c8bba2335080db19cf99f13"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T11:02:40"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T11:02:40"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="6db41c79-bbea-4a8a-8f72-d63489c251f6"/>
+      <column name="DATASIZE" valueNumeric="51593"/>
+      <column name="ROW_ID" value="34fc4969-4998-4443-aa37-3484ad4d8474"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/15f74fdb15de7c73d2c1a61ee27a1f01"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T08:31:15"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T08:31:15"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="71c971c1-f73b-4e08-8bc4-3f648ec4a8f1"/>
+      <column name="DATASIZE" valueNumeric="4978985"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="2b3c04aa-f3ba-4c04-abe7-4954fa1ff6e3"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/598beafd86d131dff1af1448fa6399b3"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-30T11:02:40"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-08-30T11:02:40"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="72d20e81-917c-4bcb-ae81-9f978cb5f798"/>
+      <column name="DATASIZE" valueNumeric="4495"/>
+      <column name="ROW_ID" value="35177875-151f-4856-b263-c693eead9ccc"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/78aad2436b5dbd1a878f9e4f9e29fbf1"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:44:13"/>
+      <column name="FILENAME" value="Gewinnspiel.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:44:13"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="7cdb8038-c2b6-4a3d-92e2-80b5b8a95eca"/>
+      <column name="DATASIZE" valueNumeric="47439"/>
+      <column name="ROW_ID" value="764acd0b-928a-4548-8311-3f50f463e19c"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f0e5ee0a296504b006a4333e1c9b24a9"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-29T05:06:28"/>
+      <column name="FILENAME" value="Test.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-29T05:06:28"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="827bc032-5d52-4947-9491-185ebcb5f336"/>
+      <column name="DATASIZE" valueNumeric="37287"/>
+      <column name="ROW_ID" value="fbc7ef6d-bc48-492e-94a4-fd404a9e8255"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/81f883491d9a080a6e51ab8c5d2c7e8d"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:46:04"/>
+      <column name="FILENAME" value="DemoDaten_Serienbrief.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:46:04"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="82c6105f-b89a-4f29-a355-a68c561c2aba"/>
+      <column name="DATASIZE" valueNumeric="4407373"/>
+      <column name="ROW_ID" value="4d01f5dc-639b-45ed-98ec-860e344ed57a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2020-03-24T02:50:41"/>
+      <column name="FILENAME" value="Angebotsanfrage.eml"/>
+      <column name="DATE_EDIT" valueDate="2020-03-24T02:50:41"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="867995aa-5a62-4121-ba1f-880cdb18eed1"/>
+      <column name="DATASIZE" valueNumeric="7416"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="fb237ade-ce63-40bd-aa41-33d7417fca2c"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0c4a6e963ff9cbcc1a89de3c3c172333"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:51:27"/>
+      <column name="FILENAME" value="Geschaeftspapiere_final.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:51:27"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="8e73bdba-f17d-4f05-b04c-33020ac5b4b0"/>
+      <column name="DATASIZE" valueNumeric="49816"/>
+      <column name="ROW_ID" value="ebb3a038-0c45-4e43-b14c-0c56d85457e3"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/038811d652198c99d5150b3329312bdd"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-15T09:01:38"/>
+      <column name="FILENAME" value="DemoLeadimport.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-15T09:01:38"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="8f5bc5e7-b6b3-45cd-b783-7f33bfc3dd1b"/>
+      <column name="DATASIZE" valueNumeric="389"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="d1f86f63-d946-43c6-a483-34c5faa95b8f"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/41265ae22b98babc2cf2661287a1f6d5"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-23T08:24:21"/>
+      <column name="FILENAME" value="Platzhalter.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-23T08:24:21"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="94b958a7-a5de-4c25-8465-b5bf207ea1ab"/>
+      <column name="DATASIZE" valueNumeric="280"/>
+      <column name="ROW_ID" value="31f4525b-eb00-4c68-8f9e-2026fb60f5cc"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a19a7f7561d606fb6c815b05cd57949a"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/21a4e763b2b80382fdaca19842904279"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:09:56"/>
+      <column name="FILENAME" value="Angebotskopftext mit Dank.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:09:56"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="95604c6a-f56c-4bc0-a118-6c301b6069a9"/>
+      <column name="DATASIZE" valueNumeric="98"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/226c22fda5fe7fb1c1fdc48286baa9c5"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T09:50:32"/>
+      <column name="FILENAME" value="Serienbrieftest.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T09:50:32"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="9c7709e1-6a05-4d7f-964d-56989e38e948"/>
+      <column name="DATASIZE" valueNumeric="4593"/>
+      <column name="ROW_ID" value="02c4e51d-a849-4025-83eb-6890fad3529d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-09T04:53:18"/>
+      <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-09T05:04:40"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="9d35ce3a-e67e-4bd6-b653-5dc9ea56aa60"/>
+      <column name="DATASIZE" valueNumeric="354366"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="5f358e92-6b50-4592-853f-11f47cf86e7b"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b4bfc8e6756252b9cf027eee5afa4eb4"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T11:56:55"/>
+      <column name="FILENAME" value="Platzhalter.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T11:56:55"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="9f82917e-f7a0-4a84-802e-1a161211f043"/>
+      <column name="DATASIZE" valueNumeric="361"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="TABLENAME" value="OFFER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c590cab1baa844ae40fcca7eae9f7120"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/3b321504aadfd778470cfece67754346"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T11:29:14"/>
+      <column name="FILENAME" value="Erstkontakt_Anlagen_Maschinenbau.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T11:29:14"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="a1e4ef39-143a-4379-865f-f3a9d8e4b2e6"/>
+      <column name="DATASIZE" valueNumeric="4130"/>
+      <column name="ROW_ID" value="b92473c7-089b-40c1-a1f0-25e5b96ecd43"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/abdb7b1c9af8d02a13428625b2c4b7c4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/fd86b34ae674763936fee3276f16e051"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-19T01:16:37"/>
+      <column name="FILENAME" value="Testmail.html"/>
+      <column name="DATE_EDIT" valueDate="2019-08-19T01:16:37"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="a3afcd9a-2375-44da-8737-b0d76d3ef6b3"/>
+      <column name="DATASIZE" valueNumeric="130"/>
+      <column name="ROW_ID" value="a4f6309c-0d0c-4fca-a64a-dfb8758561fb"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c24edfbfc63866dd659e07ef03f45988"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T04:31:55"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T04:31:55"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="a59687b0-7119-4a51-80ab-36892e25f4bb"/>
+      <column name="DATASIZE" valueNumeric="158024"/>
+      <column name="ROW_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5413f77e981a3653876b1c707671f8fa"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ac694a18953310e00f82a3da0cb30648"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-02T09:50:39"/>
+      <column name="FILENAME" value="Serienbrieftest.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-08-02T09:50:39"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="a6ab9367-2f9d-4a4a-a258-404a80c4e252"/>
+      <column name="DATASIZE" valueNumeric="4593"/>
+      <column name="ROW_ID" value="292762c1-c004-4cf4-8718-0167dfdbfa78"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6a09b1ea637b6e54324869dfd5d3e7cc"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T08:24:51"/>
+      <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T08:24:51"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="a80d89c5-86d0-4161-89dd-fc55e05673d7"/>
+      <column name="DATASIZE" valueNumeric="354366"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="509f8eb4-cf04-45d6-a06a-4a53ffaf0f95"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-03T04:31:34"/>
+      <column name="FILENAME" value="Nutzung des Neon Ticket-Systems.html"/>
+      <column name="DATE_EDIT" valueDate="2019-09-03T04:31:34"/>
+      <column name="MIMETYPE" value="application/octet-stream"/>
+      <column name="ID" value="ac878df9-2310-40d7-be80-544578956331"/>
+      <column name="DATASIZE" valueNumeric="95628"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="e6527bda-0475-42e0-9b7c-29c8ce4db58a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/acd976c80b510dbe81e1908ecf3c12f5"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:37:37"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:37:37"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="aeccedaa-cef0-41c9-8fae-5337c6c45bec"/>
+      <column name="DATASIZE" valueNumeric="4978985"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="9bfa24a1-4e46-4643-a3ce-eb0056088f8a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-25T09:52:59"/>
+      <column name="FILENAME" value="Unbenannt.html"/>
+      <column name="DATE_EDIT" valueDate="2019-07-25T09:52:59"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="b01f1280-8498-4ea5-9019-3d0193d4d617"/>
+      <column name="DATASIZE" valueNumeric="47419"/>
+      <column name="ROW_ID" value="3a498982-60ba-4c0a-9dcc-e6f2241e570d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01acc8b4c71e3e221cb5960f566991b5"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-06-11T04:36:47"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-06-11T04:36:47"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="b06ece8b-1b35-454a-9d67-74adc0e912dd"/>
+      <column name="DATASIZE" valueNumeric="158024"/>
+      <column name="ROW_ID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
+      <column name="TABLENAME" value="CONTRACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5413f77e981a3653876b1c707671f8fa"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-29T05:03:39"/>
+      <column name="FILENAME" value="Test.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-07-29T05:03:39"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="b177b8db-a917-4457-a3dc-843a86cea630"/>
+      <column name="DATASIZE" valueNumeric="46836"/>
+      <column name="ROW_ID" value="ec32511a-dabb-4151-9ceb-edefb721a698"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1927df681b9076243156a34b466ba04d"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-25T10:42:28"/>
+      <column name="FILENAME" value="Testmail.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-25T10:42:28"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="b27d7e5a-4889-4c5c-9ddc-0c50462c6f98"/>
+      <column name="DATASIZE" valueNumeric="37287"/>
+      <column name="ROW_ID" value="ca1b94ce-344f-44a4-acf6-d6ff08d6c34f"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/81f883491d9a080a6e51ab8c5d2c7e8d"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/e20351259564192e04ca73b46bd938d1"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T10:27:33"/>
+      <column name="FILENAME" value="Emails_überarbeitet.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T10:27:33"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="b2e57791-af02-4a1e-a334-fcad134046db"/>
+      <column name="DATASIZE" valueNumeric="1819"/>
+      <column name="ROW_ID" value="dab2b50f-e524-4a4d-aff8-8a53d6217f5c"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c33c633bdc271e837d3a979a9d5fff69"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-15T02:40:19"/>
+      <column name="FILENAME" value="Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-10-15T02:40:19"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="b35e8149-ea3f-4eb2-9ec8-2dd77cfd0df1"/>
+      <column name="DATASIZE" valueNumeric="4978393"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="d77f966e-e43d-482c-90fc-4c286a2f4bb7"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5c3b9bf8852fce3729aa0556a4a780e1"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T08:29:46"/>
+      <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T08:29:46"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="b3904a52-9e7d-449e-83de-cceb3596d3db"/>
+      <column name="DATASIZE" valueNumeric="51487"/>
+      <column name="ROW_ID" value="814ef0c0-52b1-4551-aec0-31878550e48f"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/689020ca7b4c5c70c92f0506e869c8e6"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:39:39"/>
+      <column name="FILENAME" value="Gewinnspiel.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:39:39"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="ba8558e2-4517-4b82-9b11-fbb1eee74588"/>
+      <column name="DATASIZE" valueNumeric="47426"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="5ac971fd-2c52-4fbb-8151-a61b4571f058"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/d6e22dc7b559e3350c8dd9022fbefdc2"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/04a8e899e701a284e67a4c5e07f19903"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T09:58:09"/>
+      <column name="FILENAME" value="crmKontakte -Teil1.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T09:58:09"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="bb407845-807c-4dcc-9536-8c1de0a45fef"/>
+      <column name="DATASIZE" valueNumeric="887484"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="5f2df795-0c59-4183-9930-a884c0469ec5"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/302b5fa29e39c8a02a8c1448ff3910b3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/a5d872a35697fea105c043a5d79a9a11"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:51:27"/>
+      <column name="FILENAME" value="SerieneinladungTelefonkonferenz.html"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:52:45"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="bd4c9292-5429-4aa2-8f38-21161776b902"/>
+      <column name="DATASIZE" valueNumeric="36691"/>
+      <column name="ROW_ID" value="9f55b65f-7e78-4dec-9dec-36e5933439b4"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f9c9eae8183b9c9340f03876b39a3362"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T09:02:16"/>
+      <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T09:02:16"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="bdb8e01b-9fd0-49da-9475-cb04fa161229"/>
+      <column name="DATASIZE" valueNumeric="50024"/>
+      <column name="ROW_ID" value="9e64bb57-2895-4b89-968d-73bbb6545139"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/49d3146cb185e61df669506d15c319cb"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/261655987485e2a158d679cd234b63b0"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T03:53:54"/>
+      <column name="FILENAME" value="crmKontakte.CSV"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T03:53:54"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="c2ba7e69-c88d-49b0-aa50-44ced00eebf6"/>
+      <column name="DATASIZE" valueNumeric="3440718"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="3c61945f-3699-44a8-8243-68369a3b8ef9"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c0d5b740056d6825c8d4eab32a4e2e5a"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-23T01:16:23"/>
+      <column name="FILENAME" value="Kunden begeistern mit passgenauem Online-Marketing Teil 1 - Teilnehmerbericht.xlsx"/>
+      <column name="DATE_EDIT" valueDate="2019-05-23T01:16:23"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
+      <column name="ID" value="c4f11f5c-0fbe-4a7c-894c-968f9d605bc0"/>
+      <column name="DATASIZE" valueNumeric="6203"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4f28ca232405b199c36a2a322c604840"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-30T11:27:13"/>
+      <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-07-30T11:27:13"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="c71dd680-8d48-42f2-8ffe-06540b49ea5a"/>
+      <column name="DATASIZE" valueNumeric="37751"/>
+      <column name="ROW_ID" value="daa63509-937b-4ce3-aed8-a79863225ef2"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e8cc6344b63e91066ff9741cee273ce7"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/4d2fdaebe7a657843273c9714729df48"/>
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the profile"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
+      <column name="FILENAME" value="ProfileImage"/>
+      <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="ca0db8c3-e51a-45da-8fe4-7c727396d52e"/>
+      <column name="DATASIZE" valueNumeric="41554"/>
+      <column name="ROW_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
+      <column name="TABLENAME" value="PERSON"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/9386121ffea926a30b9fa54870968dd1"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/1bafbc350fd7bb88105555e14ef98d93"/>
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the profile"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
+      <column name="FILENAME" value="ProfileImage"/>
+      <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="ca8d0195-db3f-4b04-98be-9c46e060e67b"/>
+      <column name="DATASIZE" valueNumeric="41554"/>
+      <column name="ROW_ID" value="73d72f18-e7f5-11e8-9f32-f2801f1b9fd1"/>
+      <column name="TABLENAME" value="PERSON"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/5f2406211e3a21439aed5714ab3db571"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:45:54"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:45:54"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="cb09f02d-2981-4ce4-b44f-ad9cc65a7852"/>
+      <column name="DATASIZE" valueNumeric="49856"/>
+      <column name="ROW_ID" value="54c20fa2-e182-4e5e-b919-122a983996e5"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/17f1c477322bb191430e50a1d9de6e20"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-03-21T09:23:21"/>
+      <column name="FILENAME" value="20181002_Dokumentenmanagement.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-03-21T09:23:21"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="d16ec3bc-07a1-4343-b0ee-439f5b418831"/>
+      <column name="DATASIZE" valueNumeric="2820"/>
+      <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4f8d2fbe1fa680acfddecbf6a2d7eb1b"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/5460bc319cbfe6bbef1ff441a45291cf"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T10:19:20"/>
+      <column name="FILENAME" value="DemoLeadimport.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T10:19:20"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="d3823171-82b0-4add-a87b-effec63cf476"/>
+      <column name="DATASIZE" valueNumeric="389"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="781c9457-3892-4794-80b4-9a4fed9bf413"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/669cd65bbfb0b83a95c1a4110ff5d7f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:47:00"/>
+      <column name="FILENAME" value="EinzeleinladungTelefonkonferenz.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:47:00"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="d6ba04b6-1470-4804-98d1-0ae2a9e32a3d"/>
+      <column name="DATASIZE" valueNumeric="41096"/>
+      <column name="ROW_ID" value="dfe476e5-0624-4298-b49d-82ae08d828d4"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/bc8f1f5b42dad335e916b1ceb4ce1ff4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ff1d70b43b211db9f56032eb197599da"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-27T11:31:58"/>
+      <column name="FILENAME" value="2018_11_29_WeitereInfos_Firma.png"/>
+      <column name="DATE_EDIT" valueDate="2019-07-27T11:31:58"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="d802b6b7-cc99-44df-8638-497faa12bbf6"/>
+      <column name="DATASIZE" valueNumeric="57068"/>
+      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="TABLENAME" value="CONTACT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/670d53f8afc15262779fdd5d30c0067e"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:00:32"/>
+      <column name="FILENAME" value="Erstkontakt meineFirma.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:00:32"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="d9b64af4-4c91-42ba-bfc0-a8688faf638f"/>
+      <column name="DATASIZE" valueNumeric="21722"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b15fb7570d77e81948aac92c347638bf"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/04a8e899e701a284e67a4c5e07f19903"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-15T09:06:19"/>
+      <column name="FILENAME" value="crmKontakte -Teil1.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-15T09:06:19"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="da23010a-c3dd-4df8-81b1-a49c99b50605"/>
+      <column name="DATASIZE" valueNumeric="887484"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="05071d57-c74c-405d-b89c-43ff5005306f"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/302b5fa29e39c8a02a8c1448ff3910b3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T10:08:07"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T10:08:07"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="da89e27b-b68f-46cf-b14a-2ef578c885a3"/>
+      <column name="DATASIZE" valueNumeric="47252"/>
+      <column name="KEYWORD" value="undefined"/>
+      <column name="ROW_ID" value="21e9b19f-98d8-4610-8f30-9f7647282ab4"/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/624076ebf52efb7b94e80b198c6c19b2"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-30T11:04:36"/>
+      <column name="FILENAME" value="Geschaeftspapiere.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-08-30T11:04:36"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="da90d13c-a91b-43a3-aa7b-c301f1edb014"/>
+      <column name="DATASIZE" valueNumeric="953856"/>
+      <column name="ROW_ID" value="34bea077-5dc4-4063-9646-17337f48e4d5"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/b165a5edf2c5c97423b46dff3800b4f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:01:31"/>
+      <column name="FILENAME" value="SerieneinladungTelefonkonferenz.html"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:01:31"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="dab3b3eb-1fb5-46de-af85-bd79c6584185"/>
+      <column name="DATASIZE" valueNumeric="41301"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/72e03deaab4283f1f0f8ac0dcbec5d9f"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/524bee188cb50feb8ce69490bff251da"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:11:23"/>
+      <column name="FILENAME" value="Angebotsfußtext mit Dank.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:11:23"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="dc1d9429-831f-4687-9362-d9a01a2a9b68"/>
+      <column name="DATASIZE" valueNumeric="105"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a47b9712f19a2276108994bc82da447a"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/41b5b566200a8bf6784cc5c6ea8931d6"/>
+      <column name="CONTAINERNAME" value="IMAGE"/>
+      <column name="DESCRIPTION" value="Image of the profile"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-01-21T01:24:43"/>
+      <column name="FILENAME" value="ProfileImage"/>
+      <column name="DATE_EDIT" valueDate="2019-01-21T01:24:43"/>
+      <column name="MIMETYPE" value="image/png"/>
+      <column name="ID" value="dfb81242-520b-4bd6-95f0-84882f4e61ae"/>
+      <column name="DATASIZE" valueNumeric="41554"/>
+      <column name="ROW_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+      <column name="TABLENAME" value="PERSON"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/58d526fe1ec32f07facc7c52e04619b3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T08:03:33"/>
+      <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T08:03:33"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="dff33d08-e7c0-457b-a8fc-9bfe0f6fbeb2"/>
+      <column name="DATASIZE" valueNumeric="354366"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="509f8eb4-cf04-45d6-a06a-4a53ffaf0f95"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-17T09:04:31"/>
+      <column name="FILENAME" value="Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-10-17T09:04:31"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="e185fd6a-0134-43a8-9f62-4459ed595ac4"/>
+      <column name="DATASIZE" valueNumeric="4978394"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/cc0d984337d631cfa16c588b449f21b8"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:46:24"/>
+      <column name="FILENAME" value="SerieneinladungTelefonkonferenz.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:46:24"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="e417291d-f718-407e-aebf-a3847ee4a8d3"/>
+      <column name="DATASIZE" valueNumeric="41096"/>
+      <column name="ROW_ID" value="1778521a-1ba6-45eb-afaa-77c34bacf74d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/fc4aa67f3f465efd278d8471a9afc970"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/b7d9f93c85c124774965969d8a32975a"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-10T09:02:28"/>
+      <column name="FILENAME" value="Kaufadressen_MuAB (1).csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-10T09:02:28"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="e58ef463-fd4b-4fce-bf0b-c553c16800c8"/>
+      <column name="DATASIZE" valueNumeric="354366"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="5f986c0d-8c4d-4111-93ca-bcbf5263d35e"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c9c8f90d0bee877f5d5b32a2b7d8ced3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:46:44"/>
+      <column name="FILENAME" value="DemoDaten_Einzelbrief.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:46:44"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="e8fd78fc-a861-4cc2-82d3-417ea852e051"/>
+      <column name="DATASIZE" valueNumeric="4407373"/>
+      <column name="ROW_ID" value="f1bca769-87e8-4103-b25f-c6592317741c"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/01cfc06e3fba701ba35cb439826a3bc3"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T02:56:44"/>
+      <column name="FILENAME" value="Email Vorlage Erstkontakt.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-09-04T02:56:44"/>
+      <column name="MIMETYPE" value="message/rfc822"/>
+      <column name="ID" value="e9198094-f2fa-4b21-91f6-09daedc2bb33"/>
+      <column name="DATASIZE" valueNumeric="4978985"/>
+      <column name="ROW_ID" value="970c8ca0-b24c-4275-8b45-2a0c3af3980f"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/3cf5ccf77878aeb1fe1d8ada5e67deff"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T08:48:43"/>
+      <column name="FILENAME" value="DemoDaten_Serienbrief.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T08:48:43"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="ea3f54dd-82f2-4c78-9ffa-e66513773f9c"/>
+      <column name="DATASIZE" valueNumeric="4407392"/>
+      <column name="ROW_ID" value="17e2499f-86dc-418c-876d-9f895da3354b"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6deedcdb0edd41abf5834c8ac6f69fa2"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/261655987485e2a158d679cd234b63b0"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-11T08:13:02"/>
+      <column name="FILENAME" value="crmKontakte.csv"/>
+      <column name="DATE_EDIT" valueDate="2019-10-11T08:13:02"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="ec70ec28-f390-4a22-abb7-9a075684e1c9"/>
+      <column name="DATASIZE" valueNumeric="3440718"/>
+      <column name="KEYWORD" value="MAINDOCUMENT"/>
+      <column name="ROW_ID" value="ddf07c49-8481-44f7-b99d-f6178ee91032"/>
+      <column name="TABLENAME" value="LEADIMPORT"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/c0d5b740056d6825c8d4eab32a4e2e5a"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-10-08T09:00:52"/>
+      <column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-10-08T09:00:52"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="ed5b3682-31e1-4368-92b1-1c51a59dcdba"/>
+      <column name="DATASIZE" valueNumeric="50052"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="8909fb30-cfcb-4241-8c12-813260d8215d"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/69b7cd8968644958ba4c7f7f2eaf5004"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/e6171f88ac2cacb0c73fc84eee151c1e"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-22T03:59:53"/>
+      <column name="FILENAME" value="Erstkontakt_Anlagen_Maschinenbau.eml"/>
+      <column name="DATE_EDIT" valueDate="2019-08-22T03:59:53"/>
+      <column name="MIMETYPE" value="text/plain"/>
+      <column name="ID" value="f15c11c2-6fe0-43de-8ea6-7950cdb86277"/>
+      <column name="DATASIZE" valueNumeric="3469"/>
+      <column name="ROW_ID" value="9a323aaa-6779-4388-88c0-5a32a778f195"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/ad90364f7929e36777304d76c8a1ff6e"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-08-02T09:40:14"/>
+      <column name="FILENAME" value="Kontaktdaten.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-08-02T09:40:58"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="f513da6e-a150-481a-85e4-ee1ee435e850"/>
+      <column name="DATASIZE" valueNumeric="13"/>
+      <column name="ROW_ID" value="7d3258f9-33d9-40d9-a751-2f5170c39b83"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/1a89c2cc804288ea43899e39105256ad"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-07-31T12:34:45"/>
+      <column name="FILENAME" value="Test.txt"/>
+      <column name="DATE_EDIT" valueDate="2019-07-31T12:34:45"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="f78fa27f-f1f1-4cf6-ab3d-fec88c8c11d5"/>
+      <column name="DATASIZE" valueNumeric="37617"/>
+      <column name="ROW_ID" value="b7382ffd-691a-4913-9455-345174942287"/>
+      <column name="TABLENAME" value="BULKMAIL"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/64b7d469d3c0b79da072d821de5f31da"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-29T06:42:47"/>
+      <column name="FILENAME" value="Rahmenvertrag.docx"/>
+      <column name="DATE_EDIT" valueDate="2019-05-29T06:42:47"/>
+      <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+      <column name="ID" value="f7d30418-7727-459c-8b6e-0ef41e16f3fd"/>
+      <column name="DATASIZE" valueNumeric="162284"/>
+      <column name="ROW_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
+      <column name="TABLENAME" value="ACTIVITY"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/19404e8c6e0d7620a4fc2d0d2f5c8dbc"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/ed6230aa697b4b1b1a00f09285b4f58f"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-04T02:58:42"/>
+      <column name="FILENAME" value="Kontaktdatenkorrektur.htm"/>
+      <column name="DATE_EDIT" valueDate="2019-09-04T02:58:42"/>
+      <column name="MIMETYPE" value="text/html"/>
+      <column name="ID" value="fb4d4b26-6b2d-4f69-ae7f-a4ed4e86c3b9"/>
+      <column name="DATASIZE" valueNumeric="51487"/>
+      <column name="ROW_ID" value="cfbe9ef8-457d-4600-84f5-3058b35c32cf"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/689020ca7b4c5c70c92f0506e869c8e6"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-13T11:17:36"/>
+      <column name="FILENAME" value="Geschaeftspapiere.odt"/>
+      <column name="DATE_EDIT" valueDate="2019-09-13T11:17:36"/>
+      <column name="MIMETYPE" value="application/vnd.oasis.opendocument.text"/>
+      <column name="ID" value="fec3067c-1a4b-4669-a63f-5f6f81e18463"/>
+      <column name="DATASIZE" valueNumeric="49856"/>
+      <column name="ROW_ID" value="e20dadf7-fb86-40c9-bc6b-56307bfa05d3"/>
+      <column name="TABLENAME" value="SERIALLETTER"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/e0d42df706e285af3e9f7feff28b93f4"/>
+    </insert>
+    <insert tableName="ASYS_BINARIES">
+      <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/895f169c7fea615c680f9c9859e671ad"/>
+      <column name="CONTAINERNAME" value="DOCUMENT"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-09-23T02:38:36"/>
+      <column name="FILENAME" value="Rahmenvertrag.pdf"/>
+      <column name="DATE_EDIT" valueDate="2019-09-23T02:38:36"/>
+      <column name="MIMETYPE" value="application/pdf"/>
+      <column name="ID" value="ffce8eeb-b723-438f-aaa5-ddcbee28ecc2"/>
+      <column name="DATASIZE" valueNumeric="168193"/>
+      <column name="KEYWORD" value="TEMPLATE"/>
+      <column name="ROW_ID" value="db95a661-d0ac-4541-b876-b546c82354b9"/>
+      <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+      <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/74aeda3171338236e373094c930b2ebd"/>
+    </insert>
+  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/72f0f500-e7b7-4b0d-90e3-240d9edc88ee b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/0c4a6e963ff9cbcc1a89de3c3c172333
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/72f0f500-e7b7-4b0d-90e3-240d9edc88ee
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/0c4a6e963ff9cbcc1a89de3c3c172333
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/6f1a18491d368b9b87091abcbcfcba15 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/3cb0d2bc68c1e07516437657c37fb79c
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/6f1a18491d368b9b87091abcbcfcba15
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/3cb0d2bc68c1e07516437657c37fb79c
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/0f474ccbf77d31f899cd5eab5f9a3c24 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/e3ba3d891ab9cbc43367cd4cce7eeb55
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/0f474ccbf77d31f899cd5eab5f9a3c24
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/e3ba3d891ab9cbc43367cd4cce7eeb55
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORD.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORD.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a6f40ba8f6adc5ae3b24908183812c2379ffd912
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORD.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="a3ab487e13de1dcf0fd316bb801a216f">
+    <insert tableName="ASYS_RECORD">
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ID" value="6f27c617-6d9a-4dee-b70a-b5712611e91a"/>
+      <column name="ROW_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="RECORDGROUP_ID" value="c4511641-b962-467b-8b42-6c32a049d627"/>
+    </insert>
+    <insert tableName="ASYS_RECORD">
+      <column name="OBJECT_TYPE" value="Offer"/>
+      <column name="ID" value="82ad1c9d-2dee-4e3e-8cd9-eadd08225f9f"/>
+      <column name="ROW_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
+      <column name="RECORDGROUP_ID" value="145c4277-869c-4e09-af42-47d8a779b961"/>
+    </insert>
+    <insert tableName="ASYS_RECORD">
+      <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ID" value="9c7ac3d8-3ae7-495e-a737-5a2130331371"/>
+      <column name="ROW_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
+      <column name="RECORDGROUP_ID" value="a6956edb-95c0-4b15-ae7b-e16ea0b3cea4"/>
+    </insert>
+    <insert tableName="ASYS_RECORD">
+      <column name="OBJECT_TYPE" value="Person"/>
+      <column name="ID" value="f2d50104-0916-4750-a578-80ecafd856b4"/>
+      <column name="ROW_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
+      <column name="RECORDGROUP_ID" value="a6956edb-95c0-4b15-ae7b-e16ea0b3cea4"/>
+    </insert>
+    <insert tableName="ASYS_RECORD">
+      <column name="OBJECT_TYPE" value="Organisation"/>
+      <column name="ID" value="f5154c24-20b0-477c-a153-e4959bd8cb6f"/>
+      <column name="ROW_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="RECORDGROUP_ID" value="c4511641-b962-467b-8b42-6c32a049d627"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3490a6d6c42ff1b9b82b8d8b7aeb0d3080873df8
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml
@@ -0,0 +1,23 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="autogenerated" id="8773cf0a00f717af17bfcefb9a3ee9a5">
+    <insert tableName="ASYS_RECORDGROUP">
+      <column name="USER_ID" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="ID" value="145c4277-869c-4e09-af42-47d8a779b961"/>
+      <column name="GROUP_TYPE" value="FAVORITE_GROUP"/>
+      <column name="TITLE" value="Abschluss in 2020"/>
+    </insert>
+    <insert tableName="ASYS_RECORDGROUP">
+      <column name="USER_ID" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="ID" value="a6956edb-95c0-4b15-ae7b-e16ea0b3cea4"/>
+      <column name="GROUP_TYPE" value="FAVORITE_GROUP"/>
+      <column name="TITLE" value="weekly Austausch"/>
+    </insert>
+    <insert tableName="ASYS_RECORDGROUP">
+      <column name="USER_ID" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
+      <column name="ID" value="c4511641-b962-467b-8b42-6c32a049d627"/>
+      <column name="GROUP_TYPE" value="FAVORITE_GROUP"/>
+      <column name="TITLE" value="kontaktieren nächste Woche"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b64f62ea0f7bca50bca82cb051c542a489bb7409
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="ASYS_BINARIES.xml"/>
+	<include relativeToChangelogFile="true" file="ASYS_RECORD.xml"/>
+	<include relativeToChangelogFile="true" file="ASYS_RECORDGROUP.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
index 930cb4f1c91fd3722143cd4b09a29f2c4fa8ae0f..7d6b9e32c03a9ca576ca148e425dbdab920121ad 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/RecordContainerCache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.7">
   <name>RecordContainerCache_default</name>
   <serverId>default</serverId>
   <definitionName>RecordContainerCache</definitionName>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
index 5795e4d815a48cc716357f0e1fcfd511391b38a5..034dcbd3644485161e003e8c11ead2b4605d60cf 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.7">
   <name>_____CONFIGURATION</name>
   <serverId>default</serverId>
   <definitionName>_____CONFIGURATION</definitionName>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
index 3069c0fabce3f4f08b02fcd710664a6d4232fbd2..d91a1a491dc8c420c7aa33a902a8f68e9cee9742 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sysDbVersion xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/sysDbVersion/1.2.0">
   <name>_____SYSTEM_SYSDB_VERSION</name>
-  <systemDbVersion>2.8.5</systemDbVersion>
+  <systemDbVersion>2.8.8</systemDbVersion>
 </sysDbVersion>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
index 37e7e783d6892eb1390bba54778e26d6a34ed997..12db6be6309eca767726c7e7daf5c010bca432f4 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.7">
   <name>f50ee138-12d9-420d-a4f9-9b8257e207e4</name>
   <description>jdbc:derby://localhost:1527/basic_data</description>
   <serverId>default</serverId>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
index 5eb83b66cac9ed8a68d01ce0e6c3f93523a23096..ef5ab4cdee352c825851b1e6f63300f5629f5628 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/defaultDbRepository.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.7">
   <name>defaultDbRepository_default</name>
   <serverId>default</serverId>
   <definitionName>defaultDbRepository</definitionName>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
index bed14237c350bfc9561427fe948b64c425fb8ca6..9c090e2837f813c87a6555875d33e46b56b194f5 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/mailServerIMAP.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.4">
+<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.7">
   <name>mailServerIMAP_default</name>
   <serverId>default</serverId>
   <definitionName>mailServerIMAP</definitionName>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
index 6d12b9e01e434b2fa48c0344532be9766eeafba5..017cb8a587875706dcd111a717478dd086ab69b2 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
@@ -1,67 +1,66 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermanns" id="7ca1d19b-434b-4c19-a856-fa3d717a1935">
+  <changeSet author="autogenerated" id="cbf300f635702261f33cd6796496880c">
     <insert tableName="ASYS_ALIASCONFIG">
-        <column name="ALIASID" value="_____CONFIGURATION"/>
-        <column name="DATE_EDIT" valueDate="2019-01-21T13:24:43.5"/>
-        <column name="DATE_NEW" valueDate="2019-01-21T13:24:43.492"/>
-        <column name="ID" value="f4a33c35-5033-4699-b55a-9520b465b4c5"/>
-        <column name="KIND" valueNumeric="105"/>
-        <column name="NAME" value="_____CONFIGURATION"/>
-        <column name="SERVERID" value="default"/>
-        <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
-        <column name="USER_NEW" value="_____DESIGNERANONYM"/>
-        <column name="XMLDATA" valueBlobFile="defaultBlob/_____configuration.xml"/>
+      <column name="KIND" valueNumeric="105"/>
+      <column name="DESCRIPTION" value="jdbc:derby://localhost:1527/basic_data"/>
+      <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+      <column name="SERVERID" value="default"/>
+      <column name="XMLDATA" valueBlobFile="defaultBlob/data_alias.xml"/>
+      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="DATE_NEW" valueDate="2020-09-28T04:50:35"/>
+      <column name="ALIASID" value="Data_alias"/>
+      <column name="NAME" value="f50ee138-12d9-420d-a4f9-9b8257e207e4"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:36"/>
+      <column name="ID" value="0d4296d2-8685-4558-b1f2-0b627ae64fcc"/>
     </insert>
     <insert tableName="ASYS_ALIASCONFIG">
-        <column name="ALIASID" value="Data_alias"/>
-        <column name="DATE_EDIT" valueDate="2019-01-21T13:24:43.561"/>
-        <column name="DATE_NEW" valueDate="2019-01-21T13:24:43.547"/>
-        <column name="DESCRIPTION" value="jdbc:derby://localhost:1527/basic_data"/>
-        <column name="ID" value="23cba7a4-e8dd-48a0-b61e-f5f0f789d02b"/>
-        <column name="KIND" valueNumeric="105"/>
-        <column name="NAME" value="f50ee138-12d9-420d-a4f9-9b8257e207e4"/>
-        <column name="SERVERID" value="default"/>
-        <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
-        <column name="USER_NEW" value="_____DESIGNERANONYM"/>
-        <column name="XMLDATA" valueBlobFile="defaultBlob/data_alias.xml"/>
+      <column name="KIND" valueNumeric="105"/>
+      <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+      <column name="SERVERID" value="default"/>
+      <column name="XMLDATA" valueBlobFile="defaultBlob/mailServerIMAP.xml"/>
+      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="DATE_NEW" valueDate="2020-09-28T04:50:36"/>
+      <column name="ALIASID" value="mailServerIMAP"/>
+      <column name="NAME" value="mailServerIMAP_default"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:36"/>
+      <column name="ID" value="339e22b3-9c93-4c3e-90f5-d2e66cd83053"/>
     </insert>
-
     <insert tableName="ASYS_ALIASCONFIG">
-      <column name="ALIASID" value="mailServerIMAP"/>
-      <column name="DATE_EDIT" valueDate="2019-06-25T01:14:32"/>
-      <column name="DATE_NEW" valueDate="2019-06-25T01:14:32"/>
-      <column name="ID" value="530a2f77-c1c3-4d93-b1fe-41ebe7410695"/>
       <column name="KIND" valueNumeric="105"/>
-      <column name="NAME" value="mailServerIMAP_default"/>
-      <column name="SERVERID" value="default"/>
       <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+      <column name="SERVERID" value="default"/>
+      <column name="XMLDATA" valueBlobFile="defaultBlob/RecordContainerCache.xml"/>
       <column name="USER_NEW" value="_____DESIGNERANONYM"/>
-      <column name="XMLDATA" valueBlobFile="defaultBlob/mailServerIMAP.xml"/>
+      <column name="DATE_NEW" valueDate="2020-09-28T04:50:36"/>
+      <column name="ALIASID" value="RecordContainerCache"/>
+      <column name="NAME" value="RecordContainerCache_default"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:36"/>
+      <column name="ID" value="c55768e4-845f-4bf5-b559-5b2643f9db29"/>
     </insert>
     <insert tableName="ASYS_ALIASCONFIG">
-      <column name="ALIASID" value="defaultDbRepository"/>
-      <column name="DATE_EDIT" valueDate="2019-06-25T01:14:46"/>
-      <column name="DATE_NEW" valueDate="2019-06-25T01:14:35"/>
-      <column name="ID" value="b2ae3180-afd2-493c-a17b-16038e3a3860"/>
       <column name="KIND" valueNumeric="105"/>
-      <column name="NAME" value="defaultDbRepository_default"/>
-      <column name="SERVERID" value="default"/>
       <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
-      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="SERVERID" value="default"/>
       <column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
+      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="DATE_NEW" valueDate="2020-09-28T04:50:36"/>
+      <column name="ALIASID" value="defaultDbRepository"/>
+      <column name="NAME" value="defaultDbRepository_default"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:36"/>
+      <column name="ID" value="c82132ea-1d81-4be2-b180-6a6d491e9e5e"/>
     </insert>
     <insert tableName="ASYS_ALIASCONFIG">
-        <column name="ALIASID" value="RecordContainerCache"/>
-        <column name="DATE_EDIT" valueDate="2020-08-24 17:43:39"/>
-        <column name="DATE_NEW" valueDate="2020-08-24 17:43:38"/>
-        <column name="ID" value="dbe6d005-37ed-4fa0-b164-a3d4450932a2"/>
-        <column name="KIND" valueNumeric="105"/>
-        <column name="NAME" value="RecordContainerCache_default"/>
-        <column name="SERVERID" value="default"/>
-        <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
-        <column name="USER_NEW" value="_____DESIGNERANONYM"/>
-        <column name="XMLDATA" valueBlobFile="defaultBlob/RecordContainerCache.xml"/>
+      <column name="KIND" valueNumeric="105"/>
+      <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+      <column name="SERVERID" value="default"/>
+      <column name="XMLDATA" valueBlobFile="defaultBlob/_____configuration.xml"/>
+      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="DATE_NEW" valueDate="2020-09-28T04:50:36"/>
+      <column name="ALIASID" value="_____CONFIGURATION"/>
+      <column name="NAME" value="_____CONFIGURATION"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:36"/>
+      <column name="ID" value="c1664cb5-c128-4b93-b3e4-274b97d305e6"/>
     </insert>
-</changeSet>
-</databaseChangeLog>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permission.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permission.xml
index da7712754cc67a3ee72eac62fb13ec3facc78bd5..626716f1cca08ec40ac344b2292fec7ad03c3eff 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permission.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permission.xml
@@ -1,138 +1,65 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.leipold" id="3d4baf88-48c0-4ad2-9ceb-72dd8a1a9f6z">
-        
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_METADATA          "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionMetaData_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_METADATA          "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_METADATA       "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionMetaData_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_ACTION            "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionAction_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_ACTION            "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_ACTION         "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionAction_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionDetail_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_DETAIL            "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_DETAIL         "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionDetail_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionOverview_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_OVERVIEW       "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;PermissionOverview_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_ROLE              "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;Role_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSION">
-            <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_ROLE              "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_ROLE           "/>
-            <column name="COND" value="{&quot;entity&quot;:&quot;Role_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
-            <column name="CONDTYPE" valueNumeric="1"/>
-        </insert>
-        
-        <rollback>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_ENTITY_METADATA          " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_RECORD_METADATA          " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_ENTITY_ACTION            " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_RECORD_ACTION            " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_ENTITY_DETAIL            " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_RECORD_DETAIL            " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_ENTITY_OVERVIEW          " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_RECORD_OVERVIEW          " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_ENTITY_ROLE              " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERM_RECORD_ROLE              " />
-                </whereParams>
-            </delete>
-        </rollback>
-        
-    </changeSet>
-</databaseChangeLog>
+  <changeSet author="autogenerated" id="aea1cb46e1326dedcfde8ae649b28238">
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_METADATA          "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionMetaData_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_METADATA       "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_METADATA          "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionMetaData_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_ACTION            "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionAction_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_ACTION         "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_ACTION            "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionAction_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionDetail_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_DETAIL         "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_DETAIL            "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionDetail_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionOverview_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_OVERVIEW       "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;PermissionOverview_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_ENTITY_ROLE              "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;Role_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSION">
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_RECORD_ROLE           "/>
+      <column name="ASYS_PERMISSIONID" value="ADMIN_PERM_RECORD_ROLE              "/>
+      <column name="CONDTYPE" valueNumeric="1"/>
+      <column name="COND" value="{&quot;entity&quot;:&quot;Role_entity&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[]}}"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionaction.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionaction.xml
index 3abb262430cbc72e7b4d2f4027f8adebfd43f3f1..0ebdb02a11c8a4134e5b4318e7200368257ff1ba 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionaction.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionaction.xml
@@ -1,293 +1,130 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.leipold" id="b01f6744-e732-45a2-a550-070fb1f1f2c">
-        
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_METADATA      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_METADATA          "/>
-            <column name="ACTION" value="view"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_METADATA    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_METADATA          "/>
-            <column name="ACTION" value="create"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_METADATA      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
-            <column name="ACTION" value="read"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_METADATA    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
-            <column name="ACTION" value="update"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_METADATA    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
-            <column name="ACTION" value="delete"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_ACTION        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ACTION            "/>
-            <column name="ACTION" value="view"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_ACTION      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ACTION            "/>
-            <column name="ACTION" value="create"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_ACTION        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
-            <column name="ACTION" value="read"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_ACTION      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
-            <column name="ACTION" value="update"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_ACTION      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
-            <column name="ACTION" value="delete"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_DETAIL        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
-            <column name="ACTION" value="view"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_DETAIL      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
-            <column name="ACTION" value="create"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_DETAIL        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
-            <column name="ACTION" value="read"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_DETAIL      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
-            <column name="ACTION" value="update"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_DETAIL      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
-            <column name="ACTION" value="delete"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_OVERVIEW      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
-            <column name="ACTION" value="view"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_OVERVIEW    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
-            <column name="ACTION" value="create"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_OVERVIEW      "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
-            <column name="ACTION" value="read"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_OVERVIEW    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
-            <column name="ACTION" value="update"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_OVERVIEW    "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
-            <column name="ACTION" value="delete"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_ROLE          "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ROLE              "/>
-            <column name="ACTION" value="view"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_ROLE        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ROLE              "/>
-            <column name="ACTION" value="create"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_ROLE          "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
-            <column name="ACTION" value="read"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_ROLE        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
-            <column name="ACTION" value="update"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONACTION">
-            <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_ROLE        "/>
-            <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
-            <column name="ACTION" value="delete"/>
-        </insert>
-        
-        <rollback>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_VIEW_METADATA      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_CREATE_METADATA    " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_READ_METADATA      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_UPDATE_METADATA    " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_DELETE_METADATA    " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_VIEW_ACTION        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_CREATE_ACTION      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_READ_ACTION        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_UPDATE_ACTION      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_DELETE_ACTION      " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_VIEW_DETAIL        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_CREATE_DETAIL      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_READ_DETAIL        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_UPDATE_DETAIL      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_DELETE_DETAIL      " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_VIEW_OVERVIEW      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_CREATE_OVERVIEW    " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_READ_OVERVIEW      " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_UPDATE_OVERVIEW    " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_DELETE_OVERVIEW    " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_VIEW_ROLE          " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_CREATE_ROLE        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_READ_ROLE          " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_UPDATE_ROLE        " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONACTION">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMACTION_DELETE_ROLE        " />
-                </whereParams>
-            </delete>
-        </rollback>
-        
-    </changeSet>
-</databaseChangeLog>
+  <changeSet author="autogenerated" id="e9f3b07f1309e85da1b9dae00eabb4b2">
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_METADATA      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_METADATA          "/>
+      <column name="ACTION" value="view"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_METADATA    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_METADATA          "/>
+      <column name="ACTION" value="create"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_METADATA      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
+      <column name="ACTION" value="read"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_METADATA    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
+      <column name="ACTION" value="update"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_METADATA    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_METADATA          "/>
+      <column name="ACTION" value="delete"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_ACTION        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ACTION            "/>
+      <column name="ACTION" value="view"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_ACTION      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ACTION            "/>
+      <column name="ACTION" value="create"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_ACTION        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
+      <column name="ACTION" value="read"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_ACTION      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
+      <column name="ACTION" value="update"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_ACTION      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ACTION            "/>
+      <column name="ACTION" value="delete"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_DETAIL        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
+      <column name="ACTION" value="view"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_DETAIL      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_DETAIL            "/>
+      <column name="ACTION" value="create"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_DETAIL        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
+      <column name="ACTION" value="read"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_DETAIL      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
+      <column name="ACTION" value="update"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_DETAIL      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_DETAIL            "/>
+      <column name="ACTION" value="delete"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_OVERVIEW      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
+      <column name="ACTION" value="view"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_OVERVIEW    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_OVERVIEW          "/>
+      <column name="ACTION" value="create"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_OVERVIEW      "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
+      <column name="ACTION" value="read"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_OVERVIEW    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
+      <column name="ACTION" value="update"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_OVERVIEW    "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_OVERVIEW          "/>
+      <column name="ACTION" value="delete"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_VIEW_ROLE          "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ROLE              "/>
+      <column name="ACTION" value="view"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_CREATE_ROLE        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_ENTITY_ROLE              "/>
+      <column name="ACTION" value="create"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_READ_ROLE          "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
+      <column name="ACTION" value="read"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_UPDATE_ROLE        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
+      <column name="ACTION" value="update"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONACTION">
+      <column name="ASYS_PERMISSIONACTIONID" value="ADMIN_PERMACTION_DELETE_ROLE        "/>
+      <column name="ASYS_PERMISSION_ID" value="ADMIN_PERM_RECORD_ROLE              "/>
+      <column name="ACTION" value="delete"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionset.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionset.xml
index bd8e46b1f82581b04fa8ed8adf6461d753ebcccf..82da9054a4e03c3fda6176a68f1050e30ac0b03b 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionset.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_permissionset.xml
@@ -1,158 +1,70 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="s.leipold" id="3d4baf88-48c0-4ad2-9ceb-72dd8a1a9f6z">
-        
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="null"/>
-            <column name="ENTITY_ID" value="PermissionMetaData_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="E"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_METADATA       "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
-            <column name="ENTITY_ID" value="PermissionMetaData_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="R"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="null"/>
-            <column name="ENTITY_ID" value="PermissionAction_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="E"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_ACTION         "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
-            <column name="ENTITY_ID" value="PermissionAction_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="R"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="null"/>
-            <column name="ENTITY_ID" value="PermissionDetail_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="E"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_DETAIL         "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
-            <column name="ENTITY_ID" value="PermissionDetail_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="R"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="null"/>
-            <column name="ENTITY_ID" value="PermissionOverview_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="E"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_OVERVIEW       "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
-            <column name="ENTITY_ID" value="PermissionOverview_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="R"/>
-        </insert>
-        
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="null"/>
-            <column name="ENTITY_ID" value="Role_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="E"/>
-        </insert>
-        <insert tableName="ASYS_PERMISSIONSET">
-            <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_ROLE           "/>
-            <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
-            <column name="ENTITY_ID" value="Role_entity"/>
-            <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
-            <column name="FIELD_ID" value="null"/>
-            <column name="ACCESSTYPE" value="R"/>
-        </insert>
-        
-        <rollback>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_ENTITY_METADATA       " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_RECORD_METADATA       " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_ENTITY_ACTION         " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_RECORD_ACTION         " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_ENTITY_DETAIL         " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_RECORD_DETAIL         " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_ENTITY_OVERVIEW       " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_RECORD_OVERVIEW       " />
-                </whereParams>
-            </delete>
-            
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_ENTITY_ROLE           " />
-                </whereParams>
-            </delete>
-            <delete tableName="ASYS_PERMISSIONSET">
-                <where>ID = ?</where>
-                <whereParams>
-                    <param value="ADMIN_PERMSET_RECORD_ROLE           " />
-                </whereParams>
-            </delete>
-        </rollback>
-        
-    </changeSet>
-</databaseChangeLog>
+  <changeSet author="autogenerated" id="a3221d058629cff3f3d0fc0784edb91e">
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
+      <column name="ENTITY_ID" value="PermissionMetaData_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_METADATA       "/>
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_METADATA       "/>
+      <column name="ENTITY_ID" value="PermissionMetaData_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
+      <column name="ENTITY_ID" value="PermissionAction_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_ACTION         "/>
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ACTION         "/>
+      <column name="ENTITY_ID" value="PermissionAction_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
+      <column name="ENTITY_ID" value="PermissionDetail_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_DETAIL         "/>
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_DETAIL         "/>
+      <column name="ENTITY_ID" value="PermissionDetail_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
+      <column name="ENTITY_ID" value="PermissionOverview_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_OVERVIEW       "/>
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_OVERVIEW       "/>
+      <column name="ENTITY_ID" value="PermissionOverview_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="E"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
+      <column name="ENTITY_ID" value="Role_entity"/>
+    </insert>
+    <insert tableName="ASYS_PERMISSIONSET">
+      <column name="ACCESSTYPE" value="R"/>
+      <column name="ROLE_ID" value="INTERNAL_ADMINISTRATOR"/>
+      <column name="ASYS_PERMISSIONSETID" value="ADMIN_PERMSET_RECORD_ROLE           "/>
+      <column name="ASYS_PERMISSIONSET_ID" value="ADMIN_PERMSET_ENTITY_ROLE           "/>
+      <column name="ENTITY_ID" value="Role_entity"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
index b194d0c6dc85e01729f400bce0a957556307bfd0..ce35da6ca85580d76d0880aa405abb40f4691a24 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
@@ -1,24 +1,16 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermanns" id="3d4baf88-48c0-4ad2-9ceb-72dd8a1a9f6a">
+  <changeSet author="autogenerated" id="78b10ae152efbd6794899dcb4a18e3a2">
     <insert tableName="ASYS_SYSTEM">
-        <column name="ID" value="_____SYSTEM_SYSDB_VERSION                                      "/>
-        <column name="DATE_EDIT" valueDate="2020-05-14T11:06:09.420"/>
-        <column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
-        <column name="KIND" valueNumeric="600"/>
-        <column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
-        <column name="TITLE" value="2.8.5"/>
-        <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
-        <column name="USER_NEW" value="_____DESIGNERANONYM"/>
-        <column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
+      <column name="KIND" valueNumeric="600"/>
+      <column name="DATE_EDIT" valueDate="2020-09-28T04:50:35"/>
+      <column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
+      <column name="ID" value="_____SYSTEM_SYSDB_VERSION                                      "/>
+      <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+      <column name="TITLE" value="2.8.8"/>
+      <column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
+      <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+      <column name="DATE_NEW" valueDate="2018-05-24T02:53:57"/>
     </insert>
-    <rollback>
-        <delete tableName="ASYS_SYSTEM">
-            <where>ID = ?</where>
-            <whereParams>
-                    <param value="_____SYSTEM_SYSDB_VERSION                                      " />
-            </whereParams>
-        </delete>
-    </rollback>
-</changeSet>
-</databaseChangeLog>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
index 40c7f7e18defefdb60f37453fd5eea0e5ad5354c..84b8857d8d5e08885c286dde38ffc6a9c93b1701 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
@@ -5,23 +5,26 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_ALIASCONFIG_ID"/>
         </column>
-        <column name="ALIASID" type="VARCHAR(63)"/>
-        <column name="DESCRIPTION" type="CLOB"/>
-        <column name="ICON" type="LONGBLOB"/>
+        <column name="USER_EDIT" type="VARCHAR(63)"/>
+        <column name="USER_NEW" type="VARCHAR(63)"/>
+        <column name="DATE_EDIT" type="DATETIME"/>
+        <column name="DATE_NEW" type="DATETIME"/>
         <column name="KIND" type="INTEGER">
             <constraints nullable="false"/>
         </column>
-        <column name="NAME" type="VARCHAR(63)">
+        <column name="NAME" type="NVARCHAR(63)">
             <constraints nullable="false"/>
         </column>
+        <column name="TITLE" type="NVARCHAR(63)"/>
+        <column name="DESCRIPTION" type="NVARCHAR(255)"/>
+        <column name="ICON" type="LONGBLOB"/>        
+        <column name="XMLDATA" type="LONGBLOB"/>
         <column name="SERVERID" type="VARCHAR(63)"/>
+        <column name="ALIASID" type="VARCHAR(63)"/>
         <column name="TENANTID" type="VARCHAR(63)"/>
-        <column name="TITLE" type="VARCHAR(63)"/>
-        <column name="XMLDATA" type="LONGBLOB"/>
-        <column name="USER_EDIT" type="VARCHAR(63)"/>
-        <column name="USER_NEW" type="VARCHAR(63)"/>
-        <column name="DATE_EDIT" type="DATETIME"/>
-        <column name="DATE_NEW" type="DATETIME"/>
     </createTable>
+    <createIndex tableName="ASYS_ALIASCONFIG" indexName="IDX_ASYS_ALIASCONFIG_SERVERID">
+        <column name="SERVERID"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
index 7783a9014a9046cefdf3be6154b1c0f1b68e37a7..d700aacd49d12879155c7d8f10b08f3d619b7345 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
@@ -5,21 +5,21 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_BINARIES_ID"/>
         </column>
+        <column name="USER_EDIT" type="VARCHAR(63)"/>
+        <column name="USER_NEW" type="VARCHAR(63)"/>
+        <column name="DATE_EDIT" type="DATETIME"/>
+        <column name="DATE_NEW" type="DATETIME"/>
         <column name="BINDATA" type="LONGBLOB"/>
+        <column name="PARENTID" type="VARCHAR(1024)"/>
         <column name="CONTAINERNAME" type="VARCHAR(31)"/>
-        <column name="DATASIZE" type="BIGINT"/>
-        <column name="DESCRIPTION" type="VARCHAR(127)"/>
-        <column name="FILENAME" type="VARCHAR(127)"/>
+        <column name="TABLENAME" type="NVARCHAR(127)"/>
+        <column name="FILENAME" type="NVARCHAR(127)"/>
+        <column name="ROW_ID" type="CHAR(36)"/>
+        <column name="DESCRIPTION" type="NVARCHAR(127)"/>
         <column name="KEYWORD" type="VARCHAR(255)"/>
         <column name="MIMETYPE" type="VARCHAR(127)"/>
-        <column name="PARENTID" type="VARCHAR(1024)"/>
         <column name="PREVIEW" type="LONGBLOB"/>
-        <column name="ROW_ID" type="CHAR(36)"/>
-        <column name="TABLENAME" type="VARCHAR(127)"/>
-        <column name="USER_EDIT" type="VARCHAR(63)"/>
-        <column name="USER_NEW" type="VARCHAR(63)"/>
-        <column name="DATE_EDIT" type="DATETIME"/>
-        <column name="DATE_NEW" type="DATETIME"/>
+        <column name="DATASIZE" type="BIGINT"/>
     </createTable>
     <createIndex tableName="ASYS_BINARIES" indexName="IDX_ASYS_BINARIES_ROW_ID">
         <column name="ROW_ID"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
index 84c539ffe5d4270800704e7c2bcc19d72cc6e589..43355067f98d91449730305ba8c02412ea76eea9 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
@@ -5,20 +5,23 @@
         <column name="ID" type="CHAR(63)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_SYSTEM_ID"/>
         </column>
-        <column name="DATE_EDIT" type="DATETIME(3)"/>
+        <column name="DATE_EDIT" type="DATETIME"/>
         <column name="DATE_NEW" type="DATETIME"/>
-        <column name="DESCRIPTION" type="VARCHAR(255)"/>
-        <column name="ICON" type="LONGBLOB"/>
+        <column name="USER_EDIT" type="VARCHAR(63)"/>
+        <column name="USER_NEW" type="VARCHAR(63)"/>
         <column name="KIND" type="INTEGER">
             <constraints nullable="false"/>
         </column>
-        <column name="NAME" type="VARCHAR(63)">
+        <column name="NAME" type="NVARCHAR(63)">
             <constraints nullable="false"/>
         </column>
-        <column name="TITLE" type="VARCHAR(63)"/>
-        <column name="USER_EDIT" type="VARCHAR(63)"/>
-        <column name="USER_NEW" type="VARCHAR(63)"/>
+        <column name="TITLE" type="NVARCHAR(63)"/>
+        <column name="DESCRIPTION" type="NVARCHAR(255)"/>
+        <column name="ICON" type="LONGBLOB"/>
         <column name="XMLDATA" type="LONGBLOB"/>
     </createTable>
+    <createIndex indexName="idx_asyssystem_name" tableName="ASYS_SYSTEM">
+        <column name="NAME"/>
+    </createIndex>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
index 00947fe252c330e80ed185bab38e3023c5485fc7..c8d26b66bf9e3b832991f2f6f2be6522b0d58043 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
@@ -5,10 +5,12 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_USERS_ID"/>
         </column>
-        <column name="GROUPID" type="VARCHAR(63)">
+        <column name="DATE_NEW" type="DATETIME"/>
+        <column name="DATE_EDIT" type="DATETIME"/>
+        <column name="NAME" type="NVARCHAR(63)">
             <constraints nullable="false"/>
         </column>
-        <column name="NAME" type="VARCHAR(63)">
+        <column name="GROUPID" type="NVARCHAR(63)">
             <constraints nullable="false"/>
         </column>
         <column name="PROPKEY" type="VARCHAR(1024)">
@@ -16,15 +18,20 @@
         </column>
         <column name="PROPVAL" type="VARCHAR(1024)"/>
         <column name="PROPVAL_CLOB" type="CLOB"/>
-
-        <column name="DATE_EDIT" type="DATETIME"/>
-        <column name="DATE_NEW" type="DATETIME"/>
     </createTable>
+    <createIndex indexName="IDX_ASYS_USERS_NAME" tableName="ASYS_USERS">
+        <column name="NAME"/>
+    </createIndex>
     <createIndex indexName="idx_asysusers_groupid" tableName="ASYS_USERS">
         <column name="GROUPID"/>
     </createIndex>
-    <createIndex indexName="IDX_ASYS_USERS_NAME" tableName="ASYS_USERS">
-        <column name="NAME"/>
+    <!--normally a index should be created for propkey and propval but this causes due to it's length problems on some dbms-->
+    <!--<createIndex indexName="idx_asysusers_propkey" tableName="ASYS_USERS">
+        <column name="PROPKEY"/>
     </createIndex>
+    <createIndex indexName="idx_asysusers_propval" tableName="ASYS_USERS">
+        <column name="PROPVAL"/>
+    </createIndex>-->
+    
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml
index b12b894b6ceae23a0bb0e71a129fb46f361093bc..c2b37b4e1be47dd5b7b1c77eaf6ee27ef070e3f1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_usertoken.xml
@@ -5,19 +5,19 @@
         <column name="ID" type="CHAR(36)">
             <constraints primaryKey="true" primaryKeyName="PK_ASYS_USERTOKEN_ID"/>
         </column>
+        <column name="USER_EDIT" type="VARCHAR(63)"/>
+        <column name="USER_NEW" type="VARCHAR(63)"/>
         <column name="DATE_EDIT" type="DATETIME"/>
         <column name="DATE_NEW" type="DATETIME"/>
-        <column name="GROUP_ID" type="VARCHAR(63)"/>
         <column name="LOGIN_USER_ID" type="VARCHAR(63)">
             <constraints nullable="false"/>
         </column>
         <column name="REFERENCE_USER_ID" type="VARCHAR(63)"/>
-        <column name="USER_EDIT" type="VARCHAR(63)"/>
-        <column name="USER_NEW" type="VARCHAR(63)"/>
-        <column name="VALID" type="INTEGER"/>
         <column name="VALID_FROM" type="DATETIME"/>
-        <column name="VALID_ONCE" type="INTEGER"/>
         <column name="VALID_TO" type="DATETIME"/>
+        <column name="VALID_ONCE" type="INTEGER"/>
+        <column name="VALID" type="INTEGER"/>
+        <column name="GROUP_ID" type="NVARCHAR(63)"/>
     </createTable>
 </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 4bb598459a46fe027558f6c3c5da8c4e3d392366..31f424c2a728efc81f5090e9734c65277f7d9c1a 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1208,7 +1208,7 @@
                 <name>MEDIUM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1285,7 +1285,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <title>${COMM_ADDRESS}</title>
                 <description></description>
                 <customProperties>
@@ -6986,7 +6986,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>{$OBJECTLINK_OBJECT}</title>
                 <description></description>
@@ -8506,7 +8506,6 @@
             <idColumn>DOCUMENTTEMPLATELINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/documenttemplatelink/documentation.adoc</documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -9651,13 +9650,6 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>d9eb29b7-a77c-4b72-b98e-13a87bedfc2b</name>
-                    <entityName>CLASSIFICATIONTYPE</entityName>
-                    <fieldName>CLASSIFICATIONTYPE</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
             </entityFields>
           </entityDb>
@@ -10003,8 +9995,8 @@
                 <name>EMPLOYEE_INVOLVED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="250" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13115,20 +13107,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMEMAIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>DUPLICAT</name>
                 <dbName></dbName>
@@ -13143,20 +13121,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMBLOG</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>STATUS</name>
                 <dbName></dbName>
@@ -13171,20 +13135,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMLINKEDIN</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>MIDDLENAME</name>
                 <dbName></dbName>
@@ -13269,20 +13219,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMMOBIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>LEADIMPORT_ID</name>
                 <dbName></dbName>
@@ -13318,20 +13254,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>ISOLANGUAGE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>CONTACTPOSITION</name>
                 <dbName></dbName>
@@ -13444,20 +13366,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMXING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>PERSON_ID</name>
                 <dbName></dbName>
@@ -13549,20 +13457,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMPHONE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>GENDER</name>
                 <dbName></dbName>
@@ -13780,32 +13674,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>WORKFLOWSTARTCONFIG</name>
-            <dbName></dbName>
-            <idColumn>WORKFLOWSTARTCONFIGID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>TRIGGER_EVENT</name>
+                <name>O_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13815,25 +13689,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSTARTCONFIGID</name>
+                <name>O_COMMPHONE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSDEFINITION_KEY</name>
+                <name>O_COMMMOBIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13843,11 +13717,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>O_COMMEMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13856,32 +13730,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>WORKFLOWSIGNAL</name>
-            <dbName></dbName>
-            <idColumn>WORKFLOWSIGNALID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>SIGNAL_NAME</name>
+                <name>O_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13891,25 +13745,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSIGNALID</name>
+                <name>O_COMMBLOG</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGER_EVENT</name>
+                <name>P_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13919,11 +13773,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_CONDITION</name>
+                <name>P_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13933,11 +13787,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13947,11 +13801,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSDEFINITION_KEY</name>
+                <name>P_COMMBLOG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13961,11 +13815,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VARIABLES</name>
+                <name>P_COMMPHONE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMMOBIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>P_COMMEMAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13977,12 +13859,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>EXPORTTEMPLATEPLACEOFUSE</name>
+            <name>WORKFLOWSTARTCONFIG</name>
             <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEPLACEOFUSEID</idColumn>
+            <idColumn>WORKFLOWSTARTCONFIGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateplaceofuse/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -13995,7 +13877,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEPLACEOFUSEID</name>
+                <name>TRIGGER_EVENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKFLOWSTARTCONFIGID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14009,11 +13905,191 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PLACEOFUSE</name>
+                <name>PROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WORKFLOWSIGNAL</name>
+            <dbName></dbName>
+            <idColumn>WORKFLOWSIGNALID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>SIGNAL_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WORKFLOWSIGNALID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRIGGER_EVENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_CONDITION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROCESSDEFINITION_KEY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VARIABLES</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATEPLACEOFUSE</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATEPLACEOFUSEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateplaceofuse/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>EXPORTTEMPLATEPLACEOFUSEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PLACEOFUSE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14412,7 +14488,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14551,7 +14627,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14565,7 +14641,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14637,7 +14713,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14678,7 +14754,7 @@
                 <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14816,7 +14892,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14877,7 +14953,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14933,7 +15009,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14947,7 +15023,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14990,7 +15066,7 @@
                 <name>GRADING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15052,7 +15128,7 @@
                 <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15095,7 +15171,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15314,6 +15390,326 @@
               </entityFieldDb>
             </entityFields>
           </entityDb>
+          <entityDb>
+            <name>DISTRICT</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DISTRICT_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENTDISTRICT_DISTRICTID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_NUMBER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ISO3</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DISTRICTRESPONSIBLE</name>
+            <dbName></dbName>
+            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DISTRICTRESPONSIBLEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEPARTMENT_ATTRIBUTE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMPLOYEE_CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
         </entities>
       </entityGroup>
     </aliasDefDb>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
index 633ea8076f023b45b5944ebcb37cdab18455ab1d..013c797ac6b08eb3d113c1bb045c0e12cbc51558 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/organisation_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/documenttemplatelink/documentation.adoc b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/documenttemplatelink/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
index d5c240bd0adf3af2b3e0c1dd3c61e6a753e95577..4bd7c6c1a52c9aad21e9de60dde26fb5ba4de177 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
 result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
index d5c240bd0adf3af2b3e0c1dd3c61e6a753e95577..4bd7c6c1a52c9aad21e9de60dde26fb5ba4de177 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.text");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.text");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
 result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
index 0046811b3b14af08f749b46cdc3151f2109c0220..9f7c5917a2317799200776b01469d749759bd6bb 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesorder/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
index 633ea8076f023b45b5944ebcb37cdab18455ab1d..013c797ac6b08eb3d113c1bb045c0e12cbc51558 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/salesproject/entityfields/contact_id/customproperties/translate4log/property.js
@@ -1,8 +1,8 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = OrganisationUtils.getNameByContactId(params.value);
-result.string(res);
+import("Contact_lib");
+import("system.db");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = OrganisationUtils.getNameByContactId(params.value);
+result.string(res);
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/editor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
index 26c85ce005d6c71d8ddb60561653f4d1330bd24c..f35d37ab09f059046b3b6f3d672cf01c66fe58c4 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/task/entityfields/requestor_contact_id/customproperties/translate4log/property.js
@@ -1,7 +1,7 @@
-import("Contact_lib");
-import("system.result");
-import("Loghistory_lib");
-
-var params = Translate4LogParams.load();
-var res = ContactUtils.getFullTitleByContactId(params.value);
+import("Contact_lib");
+import("system.result");
+import("Loghistory_lib");
+
+var params = Translate4LogParams.load();
+var res = ContactUtils.getFullTitleByContactId(params.value);
 result.string(res);
\ No newline at end of file
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 256d8c050040618b929461f7232a0bf1ff123d9f..2885448e52c527d22571ddcc5b154cf307bae531 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -96,6 +96,10 @@
                 <kind v="10077" />
                 <title></title>
               </entityNode>
+              <entityNode>
+                <name>SalesprojectConversionRate</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
           <entityNode>
@@ -306,6 +310,10 @@
                 <name>Userhelp</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>District</name>
+                <kind v="10077" />
+              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
@@ -321,15 +329,14 @@
             <kind v="123" />
             <title></title>
             <childNodes>
-              <entityNode>
-                <name>PROJECT_HumanResources</name>
-                <kind v="159" />
-                <title></title>
-              </entityNode>
               <entityNode>
                 <name>Employee</name>
                 <kind v="10077" />
               </entityNode>
+              <entityNode>
+                <name>INTERNAL_ADMINISTRATOR</name>
+                <kind v="159" />
+              </entityNode>
             </childNodes>
           </entityNode>
           <entityNode>
@@ -345,7 +352,6 @@
               <entityNode>
                 <name>INTERNAL_ADMINISTRATOR</name>
                 <kind v="159" />
-                <title></title>
               </entityNode>
               <entityNode>
                 <name>PermissionMetaData</name>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/entitynode/childnodes/group12/documentation.adoc b/application/_____SYSTEM_APPLICATION_NEON/entitynode/childnodes/group12/documentation.adoc
deleted file mode 100644
index c2aae58aba84c5b17202b50395b1481f2f03dde3..0000000000000000000000000000000000000000
--- a/application/_____SYSTEM_APPLICATION_NEON/entitynode/childnodes/group12/documentation.adoc
+++ /dev/null
@@ -1 +0,0 @@
-This group has no roles assigned to make it invisible. It is still required, because the QuickEntry context could not show up otherwise.
\ No newline at end of file
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 87fc35a2bf575d8cd011a433bfb52389f1242752..e4125015133a7668cae22904bce30d1369e33115 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -4,6 +4,15 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/360Degree_entity/documentation.adoc</documentation>
   <title>360 Degree</title>
+  <siblings>
+    <element>Offer_entity</element>
+    <element>Salesproject_entity</element>
+    <element>Contract_entity</element>
+    <element>CampaignParticipant_entity</element>
+    <element>SupportTicket_entity</element>
+    <element>Order_entity</element>
+    <element>Campaign_entity</element>
+  </siblings>
   <grantUpdate v="false" />
   <grantDelete v="false" />
   <recordContainer>jdito</recordContainer>
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index 557b1ba4d81152d2f08cc024de03d17cd20a7148..3014803809e5526a81241581d3f12bc965edf216 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("system.util");
 import("system.db");
 import("system.vars");
@@ -12,7 +11,6 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
     var selectMap = ContextUtils.getSelectMap();
     if(vars.exists("$local.filter") && vars.get("$local.filter") )
     {
-        logging.log(JSON.stringify(vars.get("$local.filter")))
         var filter = vars.get("$local.filter");
         if (filter.filter)
             if(filter.filter.childs != null && filter.filter.childs.length > 0)
@@ -27,7 +25,12 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
     
     var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
     var contactId = vars.get("$param.ObjectRowId_param");
-    result.object(_get360Data(selectMap, contactId, contextList, active));   
+    var idValues;
+    if (vars.exists("$local.idvalues"))
+        idValues = vars.get("$local.idvalues");
+    
+    var res =  _get360Data(selectMap, contactId, contextList, active, idValues);
+    result.object(res);   
 } 
 else
 {
@@ -40,15 +43,40 @@ else
  * @param {String[]} pContactId the Contactid the 360 Degree tree should be loaded for
  * @param {String[]} pContextList list of contexts to load. Note that subcontexts use their own list, defined in ContextUtils
  * @param {Boolean} [pActive=undefined] if not undefined: it select only for active / inactive state
+ * @param {Array} [pUids=undefined] uids of the 360° entity that are used for filtering, each rowId needs the format: 
+ *                                    {id: "«rowid»", type: "«context id»"}
  *  
  *  @return {String[][]} the resulting data
  */
-function _get360Data(pSelectMap, pContactId, pContextList, pActive)
+function _get360Data(pSelectMap, pContactId, pContextList, pActive, pUids)
 {   
+    //if there are uids for filtering, group them per context:
+    var uidContextMap = new Map();//Map where key is the type (contextname) and value is an array of the rowIds for that type
+    if (pUids)
+    {
+        pUids.forEach(function (uid){
+            uid = JSON.parse(uid);
+            if (uidContextMap.has(uid.type))
+                uidContextMap.get(uid.type).push(uid.id);
+            else
+                uidContextMap.set(uid.type, [uid.id]);
+        });
+    }
+
     var resultList = [];
     pContextList.forEach(function (context) 
     {
-        var data = db.table(ContextUtils.getContextDataSql(context, JSON.parse(pContactId), true, pActive, true, true));
+        var rowIds;
+        if (pUids)
+        {
+            //when a Uid-filter exists, but there is no context for filtering we can skip that context, 
+            //otherwise we need to filter for the found row ids of that context
+            if (!uidContextMap.has(context))
+                return;
+            else
+                rowIds = uidContextMap.get(context);
+        }
+        var data = db.table(ContextUtils.getContextDataSql(context, JSON.parse(pContactId), true, pActive, true, true, rowIds));
         data.forEach(function (row) 
         {
             var active;
@@ -66,8 +94,9 @@ function _get360Data(pSelectMap, pContactId, pContextList, pActive)
             if(groupBy == "")
                 groupBy = ContextUtils.getEntityTitle(context, true);
             
+            var uid = JSON.stringify({id: row[0], type: context});
             resultList.push([
-                util.getNewUUID(), // UID
+                uid, // UID
                 row[0], // TARGET_ID
                 context, // TARGET_CONTEXT
                 row[1], // TITLE
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 2c1db410053bc7de32a801464ab0e60fb4c1ef63..9163db06e98eabcd7d5addaa2c6d2a2dfcd6f17a 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -4,9 +4,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
   <title>Activity</title>
-  <siblings>
-    <element>ActivityLink_entity</element>
-  </siblings>
   <grantDeleteProcess>%aditoprj%/entity/Activity_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Activity_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
@@ -160,7 +157,6 @@
       <title>Date (Month)</title>
       <contentType>TEXT</contentType>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
         <element>PROCESS</element>
@@ -317,6 +313,7 @@
       <documentation>%aditoprj%/entity/Activity_entity/entityfields/responsible/documentation.adoc</documentation>
       <title>Responsible</title>
       <consumer>Employees</consumer>
+      <groupable v="true" />
       <linkedContext>Person</linkedContext>
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/displayValueProcess.js</displayValueProcess>
@@ -397,7 +394,6 @@
       <name>ENTRYDAY</name>
       <title>Date (Day)</title>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>Attributes</name>
@@ -565,7 +561,6 @@
       <name>ENTRYYEAR</name>
       <title>Date (Year)</title>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>bindata</name>
@@ -628,12 +623,79 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>ActivityChildren</name>
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/activitychildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ActivityIDs_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>InsertLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Entrydate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Info_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Direction_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetDocuments_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Subject_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>VisitPlanEntryId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Category_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyInnate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <alias>Data_alias</alias>
       <maximumDbRows v="10000" />
+      <fromClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBInsert>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
@@ -767,6 +829,15 @@
           <isLookupFilter v="false" />
           <filtertype>BASIC</filtertype>
         </filterExtension>
+        <filterExtension>
+          <name>ResponsibleDepartment_filter</name>
+          <title>Responsible Department</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterConditionProcess.js</filterConditionProcess>
+          <isLookupFilter v="false" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Activity_entity/entityfields/activitychildren/documentation.adoc b/entity/Activity_entity/entityfields/activitychildren/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..0818a145c22862fefc05d196b547b2f61856ce64
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitychildren/documentation.adoc
@@ -0,0 +1,5 @@
+Provides Activities that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/entryday/valueProcess.js b/entity/Activity_entity/entityfields/entryday/valueProcess.js
deleted file mode 100644
index b5449ca198e2c3d9b4e8cdd2828a84b45acd1784..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/entryday/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.datetime");
-import("system.result");
-import("system.vars");
-
-var entryDate = vars.get("$field.ENTRYDATE");
-result.string(datetime.toDate(entryDate, "dd MMMM yyyy"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js b/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb6405c40f0c403616bc18c4d1d9941c2b771435
--- /dev/null
+++ b/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.datetime");
+import("system.result");
+import("system.vars");
+
+let m = vars.get("$field.ENTRYMONTH");
+
+if (m) {
+    // When convert the Number of the Month to the Month name it doesn't matter which Year is used, so here is the Year 2020 hard-coded.
+    let monthDate = new Date(2020, m-1);
+    result.string(translate.text(datetime.toDate(monthDate.getTime(), "MMMM", "UTC")));
+}
diff --git a/entity/Activity_entity/entityfields/entrymonth/valueProcess.js b/entity/Activity_entity/entityfields/entrymonth/valueProcess.js
deleted file mode 100644
index 12df6162c99935141ca3d79220e6aa099ff341f1..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/entrymonth/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.datetime");
-import("system.result");
-import("system.vars");
-
-var entryDate = vars.get("$field.ENTRYDATE");
-result.string(datetime.toDate(entryDate, "MMMM yyyy"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/entryyear/valueProcess.js b/entity/Activity_entity/entityfields/entryyear/valueProcess.js
deleted file mode 100644
index d0a0b4c3271e345217e289de3c0514efe3a6889a..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/entryyear/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.datetime");
-import("system.result");
-import("system.vars");
-
-var entryDate = vars.get("$field.ENTRYDATE");
-result.string(datetime.toDate(entryDate, "yyyy"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc b/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc
index 48189bd099eaec9aee0c943c78c0f796436f7c18..be9657253f5751d886fa7f9e600c84d1ec40e3c5 100644
--- a/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc
+++ b/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc
@@ -1,4 +1,4 @@
 = Activity_entity - LinkedObjects
 
 Provides records via ActivityLinks.
-Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activites of a specific contactperson)
\ No newline at end of file
+Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activities of a specific contactperson)
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 2abb513731d34f425411549b15ca8996d499a131..0b11a5004b58c4183c958973a80043c56bcac66f 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -16,7 +16,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
     var rowId = vars.get("$param.RowId_param");
     if (vars.get("$param.ObjectId_param") == "Person")
     {
-        //in the Person context, all activites linked to the person should be shown, so it is necessary to get all contactIds of that person
+        //in the Person context, all activities linked to the person should be shown, so it is necessary to get all contactIds of that person
         var allPersonRelatedContactIds = newSelect("personContacts.CONTACTID")
             .from("CONTACT")
             .join("CONTACT", "CONTACT.PERSON_ID = personContacts.PERSON_ID", "personContacts")
@@ -56,5 +56,8 @@ if (Utils.toBoolean(vars.get("$param.OnlyInnate_param")))
         condition.noResult();
 }
 
+condition.andIfSet("ACTIVITY.PARENT_ID", "$param.ParentId_param");
+condition.andIfSet("ACTIVITY.PARENT_CONTEXT", "$param.ParentContext_param");
+
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(condition.toString());
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
index 3e01b63784b6fc8afc75c743bfdcff5b64ad2268..4114f9a3389dba072a6e50478ab5e837a0d632e1 100644
--- a/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/isunlinked/filterConditionProcess.js
@@ -9,15 +9,16 @@ var rawvalue = vars.get("$local.rawvalue");
 var operator2 = vars.get("$local.operator2");
 var sqlCond = "";
 
-if(operator == "1" && rawvalue == "1" ||  operator == "2" && rawvalue == "0")
+rawvalue = (rawvalue == "true");
+
+if(operator == "1" && !rawvalue ||  operator == "2" && rawvalue )
     operator2 = SqlBuilder.IN();
-else if(operator == "1" && rawvalue == "0" ||  operator == "2" && rawvalue == "1")
+else if(operator == "1" && rawvalue ||  operator == "2" && !rawvalue)
     operator2 = SqlBuilder.NOT_IN();
 else 
     sqlCond = "1=1";
 
 if (sqlCond == "")
-    sqlCond = new SqlBuilder().where("ACTIVITY.ACTIVITYID", new SqlBuilder().select("ACTIVITYLINK.ACTIVITY_ID").from("ACTIVITYLINK").groupBy("ACTIVITYLINK.ACTIVITY_ID"), operator2);
-
+    sqlCond = new SqlBuilder().where("ACTIVITY.ACTIVITYID", newSelect("ACTIVITYLINK.ACTIVITY_ID").from("ACTIVITYLINK").groupBy("ACTIVITYLINK.ACTIVITY_ID"), operator2).toString();
 
 result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterConditionProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9af3c32fd61ca49d1d8bebea820009b918b19059
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterConditionProcess.js
@@ -0,0 +1,21 @@
+import("system.tools");
+import("Sql_lib");
+import("Attribute_lib");
+import("system.logging");
+import("system.vars");
+import("PermissionCalendar_lib");
+import("system.result");
+
+var contactIDs = [];
+
+var data = tools.getUsersByAttribute("department", AttributeUtil.getAllChildren([vars.get("$local.rawvalue")]).concat([vars.get("$local.rawvalue")]));
+
+for (let i = 0; i < data.length; i++) {
+    contactIDs.push(data[i].params.contactID);
+}
+                
+if (data.length > 0) {
+    result.string(newWhere("ACTIVITY.RESPONSIBLE", contactIDs, SqlBuilder.IN()).toString());
+} else {
+    result.string(newWhere("1 = 2").toString());
+}
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterValuesProcess.js b/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..542e998eaa79b285be88e4bc9ef1cbca67019315
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/filterextensions/responsibledepartment_filter/filterValuesProcess.js
@@ -0,0 +1,13 @@
+import("Sql_lib");
+import("AttributeRegistry_basic");
+import("Attribute_lib");
+import("system.result");
+import("system.translate");
+
+let data = newSelect("AB_ATTRIBUTE.AB_ATTRIBUTEID, AB_ATTRIBUTE.ATTRIBUTE_NAME").from("AB_ATTRIBUTE").where("AB_ATTRIBUTE.AB_ATTRIBUTEID", AttributeUtil.getAllChildren($AttributeRegistry.departments()), SqlBuilder.IN()).table()
+
+for (let row of data){
+    row[1] = translate.text(row[1]);
+}
+
+result.object(data);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/fromClauseProcess.js b/entity/Activity_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38457662e0435aab336720b80a32461538ff046d
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY left join CONTACT on CONTACT.CONTACTID = ACTIVITY.RESPONSIBLE left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID");
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
index 16e52cf56f25ce13d1ec215f89b0ff025c3e28aa..d76ea5ff3f0c536caf6e83749b3aa7309e7bafc3 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js
@@ -1,5 +1,8 @@
+import("system.SQLTYPES");
+import("Sql_lib");
 import("system.result");
 import("Sql_lib");
 
-var helper = new SqlMaskingUtils();
-result.string(helper.dayFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
+var sqlHelper = new SqlMaskingUtils();
+
+result.string(sqlHelper.cast(sqlHelper.dayFromDate("ACTIVITY.ENTRYDATE"), SQLTYPES.CHAR, 2));
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
index b6df066c20a80a4d681fd728675fd4fdbcbf581e..9cb7c78c1a4e579465b38287b907078fc903bcd6 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entrymonth.value/expression.js
@@ -1,5 +1,8 @@
+import("system.SQLTYPES");
+import("Sql_lib");
 import("system.result");
 import("Sql_lib");
 
-var helper = new SqlMaskingUtils();
-result.string(helper.monthFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
+var sqlHelper = new SqlMaskingUtils();
+
+result.string(sqlHelper.cast(sqlHelper.monthFromDate("ACTIVITY.ENTRYDATE"), SQLTYPES.CHAR, 2));
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
index a882e16947555c4a61161d10feb39b8fe0041ae5..d13d775080729714d5fd7456b970c7de156ff8c8 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryyear.value/expression.js
@@ -1,5 +1,8 @@
+import("system.SQLTYPES");
+import("Sql_lib");
 import("system.result");
 import("Sql_lib");
 
-var helper = new SqlMaskingUtils();
-result.string(helper.yearFromDate("ACTIVITY.ENTRYDATE"));
\ No newline at end of file
+var sqlHelper = new SqlMaskingUtils();
+
+result.string(sqlHelper.cast(sqlHelper.yearFromDate("ACTIVITY.ENTRYDATE"), SQLTYPES.CHAR, 4));
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
index fdec89201f8a11f9163187314f21c55ba7f15735..e5f6d2a4902ec5e2ffaa71188b089757bb66701e 100644
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
@@ -1,4 +1,4 @@
-import("system.result");
 import("Person_lib");
+import("system.result");
 
-result.string(PersUtils.getResolvingDisplaySubSql("RESPONSIBLE"))
\ No newline at end of file
+result.string(PersUtils.getDisplaySqlExpression());
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index f5c5c28ad4ea69e6f8fb54df8aba5ccc77808aba..4f1ed59385145f4ad623b3590763ae1ff9ad8a25 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -130,7 +130,7 @@
     </entityField>
     <entityField>
       <name>BUILDINGNO</name>
-      <title>Nr</title>
+      <title>House number</title>
     </entityField>
     <entityProvider>
       <name>StreetValidation</name>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index d91f52f018b02ef0a9c86c163927ee0cc6dbd5b7..6f51538041ffc0b890e44450ea85fd73235b5185 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -24,6 +24,7 @@
     </entityField>
     <entityField>
       <name>DESCRIPTION</name>
+      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/description/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>CLASSIFICATION</name>
diff --git a/entity/Appointment_entity/entityfields/description/valueProcess.js b/entity/Appointment_entity/entityfields/description/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4dca60cdc128e47437941dace41524b7f651fdd2
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/description/valueProcess.js
@@ -0,0 +1,17 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param") && vars.get("$this.value") == null)
+{
+    var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+    if(event[calendars.DESCRIPTION])
+        result.string(event[calendars.DESCRIPTION]);
+}
+else
+    result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js b/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js
index dee096dc42852294e12d6b87c3e77ac60c2689f5..58834f8f20c9a23e4391afc08a50ad567d1b16b2 100644
--- a/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Appointment_entity/entityfields/newactivity/onActionProcess.js
@@ -1,23 +1,25 @@
-import("system.db");
 import("KeywordRegistry_basic");
-import("Contact_lib");
 import("system.vars");
 import("ActivityTask_lib");
-import("Context_lib");
-import("Sql_lib");
+import("system.entities");
 
-var uid = vars.get("$field.UID");
+var appointmentLinkConfig = entities.createConfigForLoadingConsumerRows().consumer("AppointmentLinks")
+                                                                         .fields(["OBJECTID", "OBJECTTYPE"]);
+var appointmentLinks = entities.getRows(appointmentLinkConfig);
 
-var objectdata = newSelect("OBJECT_TYPE, OBJECT_ROWID")
-    .from("AB_APPOINTMENTLINK")
-    .where("AB_APPOINTMENTLINK.APPOINTMENT_ID", "$field.UID")
-    .arrayRow();
-
-var links = [];
-
-if (objectdata.length > 0)
-{
-    links.push(objectdata);
+//filter only for objectTypes that may bet set in Activity (In AppointmentLink_entity there can be linked more objects than in the ActivityLink_entity)
+//this needs to be done if links exists, otherwise we can spare this for better performance
+if (appointmentLinks.length > 0)
+{    
+    var availableActivityObjectTypesSet = ActivityUtils.getLinkableObjectTypes();
+    var links = [];
+    appointmentLinks.forEach(function(appointmentLink){
+        var linkType = appointmentLink["OBJECTTYPE"];
+        var isLinkableType = availableActivityObjectTypesSet.has(linkType);
+        if (isLinkableType)
+            links.push([linkType, appointmentLink["OBJECTID"]]);
+    });
 }
 
-ActivityUtils.createNewActivity(undefined, links, ContextUtils.getCurrentContextId(), vars.get("$field.UID"), vars.get("$field.SUMMARY"), vars.get("$field.DESCRIPTION"), $KeywordRegistry.activityDirection$outgoing());
+//pParentContext and pParentId have been set to null because an appoint can not be the predecessor of an activity at the moment
+ActivityUtils.createNewActivity(undefined, links, null, null, vars.get("$field.SUMMARY"), vars.get("$field.DESCRIPTION"), $KeywordRegistry.activityDirection$outgoing());
diff --git a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
index 8c557caa9b6b62169cea92902fa269f0c678bbc9..c501306c787ed2ea99fafce699b725c12c5d94bf 100644
--- a/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
+++ b/entity/AroundLocation_entity/entityfields/contactids/valueProcess.js
@@ -5,12 +5,14 @@ import("system.indexsearch");
 import("system.neon");
 
 var contactIds = [];
+var hitCount = 0;
+var totalHitCount = 0;
 
 var radius = vars.get("$field.SearchRadius");
 var lat  = vars.get("$param.LocationLat_param");
 var lon  = vars.get("$param.LocationLon_param");
 
-if (radius && lat && lon)
+if (radius && lat && lon && !vars.get("$sys.validationerrors"))
 {
     //filter our origin uid because otherwise we would have the origin organisation in our resultset
     var excludedUid = vars.get("$param.OriginUid_param");
@@ -50,8 +52,10 @@ if (radius && lat && lon)
         contactIds = indexResult.HITS.map(function (e){
             return e[indexsearch.FIELD_ID];
         });
-        neon.setFieldValue("$field.HitCount", contactIds.length);
-        neon.setFieldValue("$field.TotalHitCount", indexResult.TOTALHITS);
+    hitCount = contactIds.length;
+    totalHitCount = indexResult.TOTALHITS;
 }
 
+neon.setFieldValue("$field.HitCount", hitCount);
+neon.setFieldValue("$field.TotalHitCount", totalHitCount);
 result.string(JSON.stringify(contactIds));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValidation.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValidation.js
index 5f316e6a87fb56fd605ef1cae23200845e99cab6..9dbc7c5c1db5489e5c49d94cc59408d91900993e 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValidation.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValidation.js
@@ -4,5 +4,5 @@ import("system.result");
 import("system.vars");
 
 var attributeId = vars.get("$local.value");
-if (AttributeUtil.getAttributeType(attributeId) == $AttributeTypes.GROUP)
+if (AttributeUtil.getAttributeType(attributeId) == AttributeTypes.GROUP())
     result.string(translate.text("Attribute groups can't be selected"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index 97c8e742a97441ce6eec2aa71b4c8deb6445e575..b5337ee20f4280c527eacf1890f5f42399537096 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -15,9 +15,9 @@ if (idvalues)
 
 var typeWhitelist, typeBlacklist;
 if (vars.getString("$param.GetTheme_param") == "true")
-    typeWhitelist = [$AttributeTypes.THEME.toString()];
+    typeWhitelist = [AttributeTypes.THEME()];
 else
-    typeBlacklist = [$AttributeTypes.THEME.toString()];
+    typeBlacklist = [AttributeTypes.THEME()];
     
 var loadEmptyAttributes = vars.getString("$param.ShowEmpty_param") == "true";
 var filteredAttributeIds = vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param");
@@ -78,7 +78,7 @@ var attributeQueryMaker = {
             if (attributeChildren.length > 0)
             {
                 attributeIdCondition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", attributeChildren, SqlBuilder.IN())
-                attributeIdCondition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL());
+                attributeIdCondition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL());
             }
 
             // return nothing if filteredAttributeIds is an empty array. (--> and 1=2)
@@ -119,7 +119,7 @@ var attributeQueryMaker = {
         else
             attributeQuery.join("AB_ATTRIBUTERELATION", attributeRelationCond);
 
-        attributeQuery.leftJoin("AB_ATTRIBUTE", "COMBOVAL.AB_ATTRIBUTEID = " + $AttributeTypes.COMBO.databaseField, "COMBOVAL");
+        attributeQuery.leftJoin("AB_ATTRIBUTE", "COMBOVAL.AB_ATTRIBUTEID = " + AttributeTypes.COMBO.databaseField, "COMBOVAL");
         
         return attributeQuery;
     }
@@ -174,7 +174,7 @@ attributeRelations = attributeRelations.map(function (row)
     }
     var value = row[AttributeTypeUtil.getTypeColumnIndex(attrType) + attributeQueryMaker.defaultQueryFields.length];
     var viewValue;
-    if (attrType == $AttributeTypes.COMBO)
+    if (attrType == AttributeTypes.COMBO())
         viewValue = translate.text(comboViewVal);
     else 
         viewValue = AttributeTypeUtil.getAttributeViewValue(attrType, value, dropDownDef);
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 34e9a227c42527fdb1474598687e4f5c7a754d4c..6f00c57a63fb54566d003715a274b58dcc3ffbc0 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -156,6 +156,12 @@
           <fieldName>Departments</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>71cfeddd-a315-4692-8299-08813ca1dc19</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Departments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -179,6 +185,10 @@
           <name>ChildType_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <description>parent id, this is used for filtering by the parent in the content process</description>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
diff --git a/entity/Attribute_entity/afterUiInit.js b/entity/Attribute_entity/afterUiInit.js
index 70936b24c9587c4a54617842edf91e1a9871369e..6b8fdf31cc1343aeaae4e44e0ce204b800d711a8 100644
--- a/entity/Attribute_entity/afterUiInit.js
+++ b/entity/Attribute_entity/afterUiInit.js
@@ -7,7 +7,7 @@ import("Context_lib");
 import("Attribute_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW 
-    && vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE
+    && vars.get("$field.ATTRIBUTE_TYPE").trim() != AttributeTypes.COMBOVALUE()
     && vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param"))
 {
     var parentId = vars.get("$param.AttrParentId_param");
diff --git a/entity/Attribute_entity/documentation.adoc b/entity/Attribute_entity/documentation.adoc
index b51e812c57faacb5b16bff63a7abd88ac01e2da3..c2d554f9f40d2e5e974f5e06ce71761d71d9de33 100644
--- a/entity/Attribute_entity/documentation.adoc
+++ b/entity/Attribute_entity/documentation.adoc
@@ -19,7 +19,7 @@ while an AttributeRelation represents the value set for one attribute and datase
 == Attribute types
 
 There are different types of attributes that can hold different kinds of values, like text, dates or numbers. Besides these also exist special types like groups, selections or
-object selections. These types are defined by the keyword "AttributeType". Behind every keyword entry of that keyword lies an entry in the object "$AttributeTypes" in the Attribute_lib,
+object selections. These types are defined by the keyword "AttributeType". Behind every keyword entry of that keyword lies an entry in the object "AttributeTypes" in the Attribute_lib,
 where properties such as the content type, the database field to store the value or other special properties are defined. In that library there also are functions to get these properties
 in AttributeTypeUtil. This logic makes it possible to handle attributes in the code in a generic way. Because of this, new attribute types could be added without
 too much effort.
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
index 436eee50e0e8ab0553ed6caf94c68c41527dbd5a..cc791cbd804be610c0264c8a69b53c49f1e2f1fe 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
@@ -4,7 +4,7 @@
 //import("Attribute_lib");
 //
 //var fieldState;
-//if(vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.COMBOVALUE)
+//if(vars.get("$field.ATTRIBUTE_TYPE").trim() == AttributeTypes.COMBOVALUE())
 //    fieldState = neon.COMPONENTSTATE_READONLY;
 //else
 //    fieldState = neon.COMPONENTSTATE_AUTO;
diff --git a/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js b/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js
index 633db405769cb96db238f1306f8ea4602097bd06..4d7f516bc8eae047359410aab114cca366e50102 100644
--- a/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeusages/children/disablemincount_param/valueProcess.js
@@ -3,4 +3,4 @@ import("system.result");
 import("Attribute_lib")
 
 var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-result.string(type == $AttributeTypes.VOID);
\ No newline at end of file
+result.string(type == AttributeTypes.VOID());
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js b/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js
index ce839fd25662eec6b92b1a49076fce4f7eec821d..f5ca4e1bae3ff499bc64a7ef3cb4ed409297f70d 100644
--- a/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeusages/stateProcess.js
@@ -4,7 +4,7 @@ import("system.vars");
 import("Attribute_lib");
 
 var state = neon.COMPONENTSTATE_EDITABLE;
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.COMBOVALUE)
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == AttributeTypes.COMBOVALUE())
     state = neon.COMPONENTSTATE_INVISIBLE;
 
 result.string(state);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
index 2ac4fdfe746f195614b2929afe827b16af8a8609..1888819bd70e3347596c0f1929902ce80c0f4158 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/dropDownProcess.js
@@ -7,7 +7,7 @@ import("Attribute_lib");
 
 var res = [];
 var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-var getDropDownFn = type && $AttributeTypes[type] && $AttributeTypes[type].getDropDownDefinitions;
+var getDropDownFn = type && AttributeTypes[type] && AttributeTypes[type].getDropDownDefinitions;
 if (getDropDownFn instanceof Function)
     res = getDropDownFn.call();
 result.object(res);
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
index 7ef97b2dfac662713a40a02d0974ef2494ae311f..ba378a119d9b896e9edabdbdabb7df1f743a4816 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/placeholderProcess.js
@@ -1,11 +1,6 @@
 import("system.translate");
-import("system.neon");
 import("system.vars");
 import("system.result");
 import("Attribute_lib");
 
-var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type == $AttributeTypes.KEYWORD)
-    result.string(translate.text("Keyword"));
-else if (type == $AttributeTypes.OBJECTSELECTION)
-    result.string(translate.text("Module"));
+result.string(translate.text(AttributeTypeUtil.getDropDownDefinitionTitle(vars.get("$field.ATTRIBUTE_TYPE"))));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
index af384e2e38a1ffee1430e22f799ffbdf90cfbf49..7d544038317ed502315a9d964113718794496241 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/stateProcess.js
@@ -5,7 +5,7 @@ import("Attribute_lib");
 
 var fieldState = neon.COMPONENTSTATE_INVISIBLE;
 var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type && $AttributeTypes[type] && $AttributeTypes[type].getDropDownDefinitions)
+if (type && AttributeTypes[type] && AttributeTypes[type].getDropDownDefinitions)
 {
     if (AttributeUtil.hasRelations(vars.get("$field.UID")))
         fieldState = neon.COMPONENTSTATE_READONLY;
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
index 7ef97b2dfac662713a40a02d0974ef2494ae311f..ba378a119d9b896e9edabdbdabb7df1f743a4816 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/titleProcess.js
@@ -1,11 +1,6 @@
 import("system.translate");
-import("system.neon");
 import("system.vars");
 import("system.result");
 import("Attribute_lib");
 
-var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type == $AttributeTypes.KEYWORD)
-    result.string(translate.text("Keyword"));
-else if (type == $AttributeTypes.OBJECTSELECTION)
-    result.string(translate.text("Module"));
+result.string(translate.text(AttributeTypeUtil.getDropDownDefinitionTitle(vars.get("$field.ATTRIBUTE_TYPE"))));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js b/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
index 009292106e86fe94de4b2037ef16349f24a83719..d44ff329df79b2541e8b7c2bba9a878ce20df523 100644
--- a/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdowndefinition/valueProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
 import("Attribute_lib");
 
 var type = vars.get("$field.ATTRIBUTE_TYPE").trim();
-if (type && $AttributeTypes[type] && typeof($AttributeTypes[type].getDropDownDefinitions) !== "function")
+if (type && AttributeTypes[type] && typeof(AttributeTypes[type].getDropDownDefinitions) !== "function")
     result.string("");
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdownfilter/stateProcess.js b/entity/Attribute_entity/entityfields/dropdownfilter/stateProcess.js
index 0d13ea84ec0e7723dc5c5a8197483e6134c86e94..699e137a8e2bae3feff898b1e82b8b57c87eb7b4 100644
--- a/entity/Attribute_entity/entityfields/dropdownfilter/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdownfilter/stateProcess.js
@@ -4,7 +4,7 @@ import("system.result");
 import("Attribute_lib");
 
 var fieldState = neon.COMPONENTSTATE_INVISIBLE;
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.OBJECTSELECTION)
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == AttributeTypes.OBJECTSELECTION())
     fieldState = neon.COMPONENTSTATE_EDITABLE;
 
 result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/dropdownfilter/valueProcess.js b/entity/Attribute_entity/entityfields/dropdownfilter/valueProcess.js
index 1a58da7930c5d7b7ce9fd8966da4aa2274cd63fe..0e9d7f5b939ded478dcb9c91db263d1cf738e21c 100644
--- a/entity/Attribute_entity/entityfields/dropdownfilter/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/dropdownfilter/valueProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
 import("system.result");
 import("Attribute_lib");
 
-if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.OBJECTSELECTION 
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == AttributeTypes.OBJECTSELECTION()
     && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
 {
     var entity = vars.getString("$field.DROPDOWNDEFINITION");
diff --git a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
index 847edb29078d3b70b31c6dbaa2768c4044666a5f..ab49a0100f201c5f1b890b0fe1f16c796a426c4c 100644
--- a/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/keywordattributetypes/children/whitelistids_param/valueProcess.js
@@ -12,7 +12,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.re
     else if (vars.get("$field.ATTRIBUTE_PARENT_ID"))
         type = AttributeUtil.getAttributeType(vars.get("$field.ATTRIBUTE_PARENT_ID"));
     else
-        type = $AttributeTypes.GROUP.toString(); //GROUP can have everything except COMBOVALUE as child
+        type = AttributeTypes.GROUP(); //GROUP can have everything except COMBOVALUE as child
     
     var possibleTypes = AttributeTypeUtil.getPossibleChildren(type);
     
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index c5b4ef81cd90cbed5092819e4282f71ea2d97322..b3cebd106309c5d1eaf9fe95100bec14667f766e 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -49,9 +49,9 @@ else if (objectType)  //if there's an objectType, it comes from the AttributeRel
 
     if (Utils.isEmpty(ids))
         condition.noResult();
-
-    condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN());
-    condition.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.THEME, !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
+    else
+        condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID", ids, SqlBuilder.IN())
+            .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.THEME(), !themeObjectRowId ? SqlBuilder.NOT_EQUAL() : undefined);
 }
 else if (parentId)
 {
@@ -80,7 +80,7 @@ var filterCondition = new FilterSqlTranslator(vars.get("$local.filter"), "AB_ATT
             {
                 case "EQUAL":
                 case "NOT_EQUAL":
-                    subSelect.and(["AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTE_ID", "attrUse"], pValue);
+                    subSelect.and(["AB_ATTRIBUTEUSAGE", "OBJECT_TYPE", "attrUse"], pValue);
                 case "ISNULL":
                 case "ISNOTNULL":
                     return cond.and(null, subSelect, pOperator == "NOT_EQUAL" || pOperator == "ISNULL" ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS());
@@ -133,7 +133,8 @@ for (let i = 0, l = allNames.length; i < l; i++)
 }
 var nameCache = {};
 
-result.object(_buildAttributeTable(attributes, usages));
+var res = _buildAttributeTable(attributes, usages);
+result.object(res);
 
 //sorts the records in a way that a tree can be built and adds values
 function _buildAttributeTable (pAttributes, pUsages) 
@@ -165,7 +166,7 @@ function _buildAttributeTable (pAttributes, pUsages)
     for (let i in rows)
     {
         let rowData = rows[i].data;
-        if (pUsages && rowData[7].trim() != $AttributeTypes.COMBOVALUE && i in pUsages)
+        if (pUsages && rowData[7].trim() != AttributeTypes.COMBOVALUE() && i in pUsages)
         {
             rowData[9] = pUsages[i].map(function (usage)
             {
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
index 9678a3d086a347c391ac075a2efc38028f26259f..0299b3290de6d826d7c40ba7e93f7653950fe572 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -25,7 +25,7 @@ new SqlBuilder().insertFields({
     "SORTING" : sorting
 }, "AB_ATTRIBUTE");
 
-if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== $AttributeTypes.COMBOVALUE.toString() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
+if (rowdata["ATTRIBUTE_PARENT_ID.value"] && rowdata["ATTRIBUTE_TYPE.value"] !== AttributeTypes.COMBOVALUE() && vars.get("$param.GetOnlyFirstLevelChildren_param"))
 {
     var parentUsages = newSelect("OBJECT_TYPE")
         .from("AB_ATTRIBUTEUSAGE")
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index 7e9ddd1f31add168e9c478740166f88d79dcbab5..95b5c59685bfe4317f636f6a4301150861bbefe4 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -59,7 +59,7 @@
       <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
-      <name>comingFrom_param</name>
+      <name>ObjectType_param</name>
       <expose v="true" />
     </entityParameter>
     <entityField>
@@ -81,6 +81,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>ContactFilter_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 4b3206dc22331837d39d9e4aa4e7634336c3e2da..02d7fa1e679412972c3aca009bf79212db5b41e1 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,38 +1,24 @@
+import("Util_lib");
 import("system.eMath");
-import("FilterviewMenuAction_lib");
-import("Contact_lib");
+import("FilterViewAction_lib");
 import("system.result");
 import("Bulkmail_lib");
-import("KeywordRegistry_basic");
-import("system.util");
-import("system.db");
 import("Sql_lib");
 import("system.vars");
 import("system.neon");
 
-var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
-var comingfrom = vars.getString("$param.comingFrom_param");
-var contactIds;
-
-if(!Array.isArray(selection)) //if selection is an array, data has been selected
-{
-    var condition = selection.condition;
-    if(comingfrom == "Organisation")
-        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
-    else if (comingfrom == "Person")
-        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
-}
-
 var bulkMailId = vars.get("$field.BULKMAIL_ID");
-
-var res;
 if (bulkMailId)
 {
+    var contactIds = Utils.parseJSON(vars.get("$param.ContactIds_param"));
+    var contactFilter = vars.get("$param.ContactFilter_param");
+    var context = vars.getString("$param.ObjectType_param");
+
+    contactIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, contactIds, contactFilter);
+
     var recipients = BulkMailUtils.filterNewRecipients(bulkMailId, contactIds);
-    res = JSON.stringify(recipients);
     neon.setFieldValue("$field.notAddedRecipients", eMath.subInt(parseInt(contactIds.length), parseInt(recipients.length)));
+    result.string(JSON.stringify(recipients));
 }
 else
-    res = null;
-    
-result.string(res);
\ No newline at end of file
+    result.string(null);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/grantDeleteProcess.js b/entity/BulkMail_entity/grantDeleteProcess.js
index 98a724e2fcb7effc7a393d982585e4194d5c62ac..28bfe1f78be38012df50953c85c7a033684d3f5e 100644
--- a/entity/BulkMail_entity/grantDeleteProcess.js
+++ b/entity/BulkMail_entity/grantDeleteProcess.js
@@ -8,7 +8,7 @@ var currentContext = ContextUtils.getCurrentContextId();
 
 var canDelete = new HasLinkedObjectTester()
     .andNoEntityRows("BulkMailRecipient_entity", "BulkMailRecipients", {BulkMailId_param : rowId}) //Recipients
-    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
+    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
     .validate();
 
 result.string(canDelete);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js b/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
index d0d6d13510e00a5910eb93432d98a6163d8ce175..7626ea2ecbb54be6241b0f6d4214ac16388e7bb3 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
@@ -30,8 +30,6 @@ if (template && template.content && BulkMailUtils.isValidTemplateType(template.t
         template.filename = bulkMailName + ".html";
     
     SingleBinaryUtils.set("BULKMAIL", "DOCUMENT", vars.get("$local.uid"), template.content, template.filename);
-    
-    neon.refresh(["$field.content"]);
 }
 
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 739af475cf32f3e866ad3e7f5937df224dbb4712..447fef3d4393c2b2dc7924ab017ea3d896006850 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -7,7 +7,6 @@
   <siblings>
     <element>CampaignParticipant_entity</element>
   </siblings>
-  <onValidation>%aditoprj%/entity/CampaignAddParticipants_entity/onValidation.js</onValidation>
   <recordContainer>datalessConfig</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
index da55ecfd803c8c1409ddc353064db1f037f49583..b2c37dfa07d393af2fbd10b50ae3ea3dcac816b4 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
@@ -1,28 +1,28 @@
 import("system.neon");
-import("Sql_lib");
 import("system.vars");
 import("system.db");
 import("system.util");
 import("Campaign_lib");
+import("Sql_lib");
 
 var cols = [];
 
-var participantRowIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param"));
 var participantCondition = "";
+var participantRowIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param"));
 var conditionSourceTableName = vars.getString("$param.dataSourceTableName_param");
 
+var isUpdate = vars.get("$field.isUpdate");
 var campaignId = vars.getString("$field.CAMPAIGN_ID");
 var newCampaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
-var isUpdate = vars.get("$field.isUpdate");
 
 var colNamesCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnNames();
 
 if(participantRowIds != null && participantRowIds.length > 0)
 {
-    let contactIdsToHandle = participantRowIds;
+    var contactIdsToHandle = participantRowIds;
     
     if(isUpdate == "false")
-        contactIdsToHandle = vars.get("$field.campaignparticipantContactIds");
+        contactIdsToHandle = JSON.parse(vars.get("$field.campaignparticipantContactIds"));
     
     _handleRowIds(contactIdsToHandle, campaignId);
 }
@@ -37,13 +37,13 @@ if (!vars.exists("$param.currentCampaignId_param") || !vars.get("$param.currentC
 
 function _handleCondition(pCampaignId, pTargetTableName, pCondition)
 {
-    let contactIdsToHandle = [];
+    var contactIdsToHandle = [];
+    var contextComingFrom = "Person";
     
-    let useRightJoinToGetOrgs = "false";
     if(pTargetTableName == "ORGANISATION")
     {
-        useRightJoinToGetOrgs = "true";
-        pCondition += "  and PERSON.PERSONID is NULL"
+        pCondition += "  and PERSON.PERSONID is NULL";
+        contextComingFrom = "Organisation";
     }
         
     /*
@@ -55,10 +55,10 @@ function _handleCondition(pCampaignId, pTargetTableName, pCondition)
      */
     if(isUpdate == "true")
     {
-        contactIdsToHandle = CampaignUtils.GetContactIdsInCampaignByCondition(pCampaignId, pCondition, useRightJoinToGetOrgs)
+        contactIdsToHandle = CampaignUtils.GetContactIdsInCampaignByCondition(pCampaignId, pCondition);
     }
     else
-        contactIdsToHandle = CampaignUtils.GetContactIdsNotInCampaignByCondition(pCampaignId, pCondition, useRightJoinToGetOrgs);
+        contactIdsToHandle = CampaignUtils.GetContactIdsNotInCampaignByCondition(pCampaignId, pCondition, contextComingFrom);
     
     _handleRowIds(contactIdsToHandle, pCampaignId);
 }
@@ -66,59 +66,67 @@ function _handleCondition(pCampaignId, pTargetTableName, pCondition)
 function _handleRowIds(pParticipantRowIds, pCampaignId)
 {
     var oldStepIds = {};
+    
     if(isUpdate == "true")
     {
-        cols = [ "CAMPAIGNSTEP_ID",
-        "USER_EDIT",
-        "DATE_EDIT"
+        cols = [
+            "CAMPAIGNSTEP_ID",
+            "USER_EDIT",
+            "DATE_EDIT"
         ];
-        let oldSteps = newSelect("CAMPAIGNPARTICIPANTID, CAMPAIGNSTEP_ID")
-        .from("CAMPAIGNPARTICIPANT")
-        .whereIfSet("CAMPAIGNPARTICIPANT.CONTACT_ID", pParticipantRowIds, SqlBuilder.IN())
-        .and("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId)
-        .table(true);
+    
+        var oldSteps = newSelect("CAMPAIGNPARTICIPANTID, CAMPAIGNSTEP_ID")
+                            .from("CAMPAIGNPARTICIPANT")
+                            .whereIfSet("CAMPAIGNPARTICIPANT.CONTACT_ID", pParticipantRowIds, SqlBuilder.IN())
+                            .and("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId)
+                            .table(true);
                         
-        oldSteps.forEach(function (step)
+        oldSteps.forEach(function(step)
         {
             this[step[0]] = step[1];
         }, oldStepIds);
     }
     else
     {
-        cols = [ "CAMPAIGNPARTICIPANTID"
-        ,"CONTACT_ID"
-        ,"CAMPAIGN_ID"
-        ,"CAMPAIGNSTEP_ID"
-        ,"USER_NEW"
-        ,"DATE_NEW"
+        cols = [
+            "CAMPAIGNPARTICIPANTID",
+            "CONTACT_ID",
+            "CAMPAIGN_ID",
+            "CAMPAIGNSTEP_ID",
+            "USER_NEW",
+            "DATE_NEW"
         ];
     }
 
-    let statementArray = [];
-    let logArray = [];
+    var statementArray = [];
+    var logArray = [];
 
-    for (let participant in pParticipantRowIds)
+    for (var participant in pParticipantRowIds)
     {
-        let campaignParticipantLogId = util.getNewUUID();
-
+        var campaignParticipantLogId = util.getNewUUID();
+        var valsCampaignParticipantLog;
         if(isUpdate == "true")
         {
-            let oldCampaignStepId = oldStepIds[pParticipantRowIds[participant]] || "";
-            let updatedValues = [newCampaignStepId,
-            vars.get("$sys.user"),
-            vars.get("$sys.date")];
+            var oldCampaignStepId = oldStepIds[pParticipantRowIds[participant]] || "";
+            
+            var updatedValues = [
+                newCampaignStepId,
+                vars.get("$sys.user"),
+                vars.get("$sys.date")
+            ];
 
-            let condition = newWhere("CAMPAIGNPARTICIPANT.CONTACT_ID", pParticipantRowIds[participant])
-            .or("CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID", pParticipantRowIds[participant]);
+            var condition = newWhere("CAMPAIGNPARTICIPANT.CONTACT_ID", pParticipantRowIds[participant])
+                                .and("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId)
+                                .or("CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID", pParticipantRowIds[participant]);
                                  
-            let valsCampaignParticipantLog = [
-            pParticipantRowIds[participant], 
-            campaignId, 
-            newCampaignStepId, 
-            campaignParticipantLogId,
-            vars.get("$sys.user"), 
-            vars.get("$sys.date"), 
-            oldCampaignStepId
+            valsCampaignParticipantLog = [
+                campaignParticipantLogId,
+                campaignId, 
+                newCampaignStepId, 
+                pParticipantRowIds[participant], 
+                vars.get("$sys.user"), 
+                vars.get("$sys.date"), 
+                oldCampaignStepId
             ];
 
             statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, updatedValues, condition.build()]);
@@ -126,28 +134,39 @@ function _handleRowIds(pParticipantRowIds, pCampaignId)
         }
         else
         {
-            let campaignParticipantId = util.getNewUUID();
-
-            let valsCampaignParticipant = [ campaignParticipantId
-            , pParticipantRowIds[participant]
-            , campaignId
-            , newCampaignStepId
-            , vars.get("$sys.user")
-            , vars.get("$sys.date")
+            var campaignParticipantId = util.getNewUUID();
+
+            var valsCampaignParticipant = [
+                campaignParticipantId,
+                pParticipantRowIds[participant],
+                campaignId,
+                newCampaignStepId,
+                vars.get("$sys.user"),
+                vars.get("$sys.date")
             ];
 
-            let valsCampaignParticipantLog = new Array(campaignParticipantId, campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
+            valsCampaignParticipantLog = [
+                campaignParticipantLogId,
+                campaignId, 
+                newCampaignStepId, 
+                campaignParticipantId, 
+                vars.get("$sys.user"), 
+                vars.get("$sys.date"), 
+                ""
+            ];
 
             statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, valsCampaignParticipant]);
+            logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
         }
     }
+    
     if(isUpdate == "true")
     {
         db.updates(statementArray)
     }
     else
         db.inserts(statementArray);
+    
     if(logArray.length > 0)
         db.inserts(logArray);
-}
-
+}
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
index be5aec2ba0d4f21dc0a169a53489021c880b3c8b..8271cfcda5c3966074453a2c2c22d86b086388ce 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
@@ -5,4 +5,11 @@ import("system.vars");
 if (vars.get("$sys.validationerrors"))
     result.string(neon.COMPONENTSTATE_DISABLED);
 else
-    result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
+{
+    var contactCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
+    if (contactCount == 0)
+        result.string(neon.COMPONENTSTATE_DISABLED);
+    else
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+    
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
index e831ec632cbba7601e7085e0e59fdbf772e58725..ff279849cebaa73eaaad7f251b821d9379d06ad5 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
@@ -1,29 +1,45 @@
-import("Campaign_lib");
 import("system.eMath");
-import("FilterviewMenuAction_lib");
 import("system.result");
 import("system.vars");
 import("system.neon");
+import("FilterViewAction_lib");
+import("Campaign_lib");
+
 
 if(vars.get("$field.CAMPAIGN_ID"))
 {
+    var contactIds, filteredContactIds;
+    var isUpdate = vars.getString("$param.isUpdate_param");
     var comingfrom = vars.getString("$param.dataSourceTableName_param");
-    var contactIds;
-    var filteredContactIds;
-    var selection = vars.getString("$param.campaignParticipantsRowIds_param");
+    var selection = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param"));
     
-    if(vars.exists("$param.campaignParticipantsCondition_param") && vars.get("$param.campaignParticipantsCondition_param"))
+    if(vars.exists("$param.campaignParticipantsCondition_param") && vars.get("$param.campaignParticipantsCondition_param") && !isUpdate)
     {
         selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+        
         if(comingfrom == "Organisation")
-            filteredContactIds = FilterviewMenuActionUtils.organisationIdsFilter(selection);
+            filteredContactIds = FilterViewActionUtils.organisationIdsFilter(selection);
         else if(comingfrom == "Person")
-            filteredContactIds = FilterviewMenuActionUtils.contactIdsFilter(selection)
-        contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), filteredContactIds);
+            filteredContactIds = FilterViewActionUtils.contactIdsFilter(selection)
+        
+        contactIds = CampaignUtils.GetContactIdsNotInCampaignByCondition(vars.get("$field.CAMPAIGN_ID"), selection, comingfrom);
     }
-    else
+    else if(isUpdate)
+    {
+        if (vars.get("$param.campaignParticipantsCondition_param"))
+        {
+            var contactFilterCondition = JSON.parse(vars.get("$param.campaignParticipantsCondition_param")).condition;
+            contactIds = CampaignUtils.GetContactIdsNotInCampaignByCondition(vars.get("$field.CAMPAIGN_ID"), contactFilterCondition, comingfrom);
+        } 
+        else
+        {
+            contactIds = selection;
+        }
+    }
+    else 
     {
         contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), JSON.parse(selection));
     }
+    
     result.string(JSON.stringify(contactIds));
 }
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
index b08b067a18d8abf3bfcb5b27d61390176a9141de..a962faa8460527ec241f6d7d408b0191a62a8215 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
@@ -1,36 +1,48 @@
 import("system.eMath");
-import("FilterviewMenuAction_lib");
 import("system.translate");
 import("system.result");
 import("system.vars");
+import("Campaign_lib");
+import("FilterViewAction_lib");
 
 var res = "";
-var resNotAdded = "\n\
-";
+var resNotAdded = "\n";
+
 if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.campaignparticipantContactIds") && !vars.get("$sys.validationerrors"))
 {
-    var validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
     var selectedIds;
+    var isUpdate = vars.get("$param.isUpdate_param");
+    var validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
     var comingfrom = vars.get("$param.dataSourceTableName_param");
     
-    if (validCount && !vars.get("$sys.validationerrors") && vars.get("$field.CAMPAIGN_ID"))
+    if (validCount && !vars.get("$sys.validationerrors") && vars.get("$field.CAMPAIGN_ID") && !isUpdate)
     {
         if (validCount != 0)
         {
             res = translate.withArguments("%0 new participants will be added to the campaign.", [validCount]);
+            
             if(vars.exists("$param.campaignParticipantsRowIds_param") && vars.getString("$param.campaignParticipantsRowIds_param"))
                 selectedIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param")).length;
             else
             {
                 var selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
+                
                 if(comingfrom == "Organisation")
-                    selectedIds = FilterviewMenuActionUtils.organisationIdsFilter(selection).length;
+                    selectedIds = FilterViewActionUtils.organisationIdsFilter(selection).length;
                 else if(comingfrom == "Person")
-                    selectedIds = FilterviewMenuActionUtils.contactIdsFilter(selection).length;
+                    selectedIds = FilterViewActionUtils.contactIdsFilter(selection).length;
             }
-            var alreadyParticipant = eMath.subInt(selectedIds, validCount)
+            if (selectedIds != undefined) {
+                var alreadyParticipant = eMath.subInt(selectedIds, validCount)
             resNotAdded += translate.withArguments("%0 of the chosen records are already in the campaign", [alreadyParticipant]);
+            }
         }
     }
+    else if(isUpdate){
+        validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
+        var maxParticipantCounting = CampaignUtils.getParticipantCount(vars.get("$field.CAMPAIGN_ID"));
+        res = translate.withArguments("%0/%1 participant(s) will be added to the selected campaign step", [validCount, maxParticipantCounting]);
+    }
 }
+
 result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
index 512ffebcbe138c38a1bb1d1160217ff6fc6d8e69..915d12d13a1e2162e16c58f84573bb7246a0a7cd 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
@@ -63,7 +63,7 @@ if(selectedCampaignId != '')
         participantCondition = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
         
         let useRightJoinToGetOrgs = "false";
-        if(targetTable == "ORGANISATION")
+        if(targetTable == "Organisation")
         {
             useRightJoinToGetOrgs = "true";
             
diff --git a/entity/CampaignAddParticipants_entity/onValidation.js b/entity/CampaignAddParticipants_entity/onValidation.js
deleted file mode 100644
index 26f9361c063cd11c177e8a1778ab28d1feda9bf6..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/onValidation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$field.isOperationValid") == "false") 
-{
-    result.object(translate.text("no valid selection"));    
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 8481518fc08e1d768446eeaadd32cb8eb8f63730..2af24acc0d0ade0e8fbe9d0df0397c5b4c1a2ced 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -184,17 +184,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityActionGroup>
-      <name>alter</name>
-      <children>
-        <entityActionField>
-          <name>edit</name>
-          <onActionProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="true" />
-          <iconId>NEON:PENCIL</iconId>
-        </entityActionField>
-      </children>
-    </entityActionGroup>
     <entityParameter>
       <name>CampaignId_param</name>
       <expose v="true" />
diff --git a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
deleted file mode 100644
index 2f19601f3e8f533982bac2823f085588c6f8dd7e..0000000000000000000000000000000000000000
--- a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-var params = {
-    "Uid_param" : vars.get("$sys.uid")
-}
-neon.openContext("CampaignCost", "CampaignCostEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index d6224666455e9a5cd83cec9e3a0a03cb60ccc19c..3c8e5a5655f3c8320c4188939e9588988e7b9b44 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -9,6 +9,7 @@
     <element>CampaignParticipantChart_entity</element>
   </siblings>
   <afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
+  <useFavorites v="true" />
   <titlePlural>Participants</titlePlural>
   <recordContainer>ParticipantsDbRecordContainer</recordContainer>
   <entityFields>
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
index 1537b3bbbc7edc2d2149dc80c799697e1d02e8ea..5f2f7a2cfa299eb520877db19056edad8bbef2f6 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -9,7 +9,7 @@ var campaignStepId = vars.get("$field.CAMPAIGNSTEP_ID")
 
 if(sysSelection.length > 0) //selektierte IDs als Array
 {
-    CampaignUtils.openSetCampaignStepViewByRowIds(vars.getString("$sys.selection"), campaignId, campaignStepId);
+    CampaignUtils.openSetCampaignStepViewByRowIds(JSON.stringify(vars.get("$sys.selection")), campaignId, campaignStepId);
 }
 else
 {
diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
index b3b5019620eeb8f41f7fdf43f8769f9c275b2888..67d5159a7b988831992b8af18bbaad5ed190c03e 100644
--- a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
+++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
@@ -4,6 +4,7 @@ import("system.vars");
 
 var condition = newWhere()
     .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", "$param.CampaignId_param")
-    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param");
+    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param")
+    .andIfSet("CAMPAIGNPARTICIPANT.CONTACT_ID", "$param.ContactId_param");
 
 result.string(condition.toString());
diff --git a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index b062fc853db217bf25b5c47160f6a3c0ce59ee84..9f1541d2f9b4b072bcdb0a64bdf3c8c84baf1d7a 100644
--- a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -17,8 +17,17 @@ var TARGET_CONTEXT_ELEMENT = "CampaignStep";
 var campaignRows = {};
 var stepIds = {};
 
-var stepsRows = stepCondition.select("CAMPAIGNSTEPID, CAMPAIGNSTEP.\"NAME\", CAMPAIGNSTEP.PREDECESSORSTEP_ID,"
-                                   + " CAMPAIGNSTEP.DESCRIPTION, CAMPAIGNSTEP.DATE_START, CAMPAIGNSTEP.DATE_END, CAMPAIGNID, CAMPAIGN.\"NAME\", CAMPAIGN.STATUS")
+var columnName = "\"NAME\"";
+var alias = vars.get("$sys.dbalias");
+var isMariaDB = db.getDatabaseType(alias) == db.DBTYPE_MARIADB10;
+
+if (isMariaDB)
+{
+    columnName = "\`NAME\`";
+}
+
+var stepsRows = stepCondition.select("CAMPAIGNSTEPID, CAMPAIGNSTEP."+ columnName + ", CAMPAIGNSTEP.PREDECESSORSTEP_ID,"
+                                   + " CAMPAIGNSTEP.DESCRIPTION, CAMPAIGNSTEP.DATE_START, CAMPAIGNSTEP.DATE_END, CAMPAIGNID, CAMPAIGN."+ columnName +", CAMPAIGN.STATUS")
                              .from("CAMPAIGN")
                              .join("CAMPAIGNSTEP", "CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID")
                              .orderBy("SORTING")
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 3d7c9f806c352bfc9482f5053276afb8d7d19479..38abc14be1b8c632764cc2e8ad4081a5b798d5f3 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -57,6 +57,7 @@
       <name>EMPLOYEE_CONTACT_ID</name>
       <title>Responsible</title>
       <consumer>Employees</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
@@ -85,11 +86,13 @@
       <inputFormat>dd.MM.yyyy</inputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/valueProcess.js</valueProcess>
+      <onValidation>%aditoprj%/entity/CampaignStep_entity/entityfields/date_end/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>STATUS</name>
       <title>Status</title>
       <consumer>KeywordStates</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
@@ -391,6 +394,7 @@
       <name>STEPMEDIUM</name>
       <title>Medium</title>
       <consumer>CampaignStepMedium</consumer>
+      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/stepmedium/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityActionField>
@@ -461,6 +465,7 @@
         <dbRecordFieldMapping>
           <name>EMPLOYEE_CONTACT_ID.value</name>
           <recordfield>CAMPAIGNSTEP.EMPLOYEE_CONTACT_ID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>NAME.value</name>
diff --git a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..e78e41c7b9eaffe04db493e15240f467dd6ffbaf
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
@@ -0,0 +1,12 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+
+var startDate = vars.get("$field.DATE_START");
+var localValue = vars.get("$local.value");
+
+if (startDate && localValue <= startDate)
+{
+    result.string(translate.text("The end date has to be after the start."));
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/grantDeleteProcess.js b/entity/CampaignStep_entity/grantDeleteProcess.js
index 769ff1a44e48d86ec06265c07ed247132d51e762..7e11b9474dcadfa51a41b1a6cf718ebd4e4c89d3 100644
--- a/entity/CampaignStep_entity/grantDeleteProcess.js
+++ b/entity/CampaignStep_entity/grantDeleteProcess.js
@@ -7,7 +7,7 @@ var rowId = vars.get("$field.CAMPAIGNSTEPID");
 var currentContext = ContextUtils.getCurrentContextId();
 
 var canDelete = new HasLinkedObjectTester()
-    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
+    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
     .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : rowId}) //Tasks
     .validate();
 
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index d53f98b1c051076175ed65fda62b0ca261df1d52..37416e7b55c7aa8aeec8dc400816f6df5b390cae 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -70,6 +70,7 @@
       <name>EMPLOYEE_CONTACT_ID</name>
       <title>Person in charge</title>
       <consumer>Employee</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
@@ -123,6 +124,7 @@
       <name>STATUS</name>
       <title>Status</title>
       <consumer>KeywordStates</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Campaign_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
@@ -272,7 +274,6 @@
     <entityConsumer>
       <name>Tasks</name>
       <title>Tasks</title>
-      <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>Task_entity</entityName>
@@ -677,14 +678,14 @@
         </filterExtensionSet>
         <filterExtension>
           <name>DateStart_filter</name>
-          <title>Startdatum</title>
+          <title>Startdate</title>
           <contentType>DATE</contentType>
           <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
         <filterExtension>
           <name>DateEnd_filter</name>
-          <title>Enddatum</title>
+          <title>Enddate</title>
           <contentType>DATE</contentType>
           <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/dateend_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
@@ -713,6 +714,15 @@
           <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtension>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <groupedRecordField></groupedRecordField>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Campaign_entity/entityfields/description/valueProcess.js b/entity/Campaign_entity/entityfields/description/valueProcess.js
index 65e38624eb4cbf930ce78521ab04ee36f367a03d..f410607cb7949d96ee9b88651ad0d2ae8b82f61c 100644
--- a/entity/Campaign_entity/entityfields/description/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/description/valueProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.description_param") && vars.get("$param.description_param")) 
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.description_param") && vars.get("$param.description_param") && !vars.get("$this.value")) 
 {
     result.string(vars.get("$param.description_param"));
 }
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js b/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
index 2f4b53c92dc95c4b2e185fe4dbb4356673b1cc48..04046053e32189ddf0521ec4c014092fc503e9e2 100644
--- a/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/employee_contact_id/valueProcess.js
@@ -5,7 +5,7 @@ import("Employee_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) 
 {
-    if(vars.exists("$param.emplContactId_param") && vars.get("$param.emplContactId_param"))
+    if(vars.exists("$param.emplContactId_param") && vars.get("$param.emplContactId_param") && !vars.get("$this.value"))
         result.string(vars.get("$param.emplContactId_param"));
     else if(vars.get("$this.value") == null)
         result.string(EmployeeUtils.getCurrentContactId());
diff --git a/entity/Campaign_entity/entityfields/name/valueProcess.js b/entity/Campaign_entity/entityfields/name/valueProcess.js
index da922d4af5d21c64d4fae65c901d3479732b2b70..2c8e28aa36ecb0800ec59eccd8579a6a5d31ef10 100644
--- a/entity/Campaign_entity/entityfields/name/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/name/valueProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.name_param") && vars.get("$param.name_param")) 
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.name_param") && vars.get("$param.name_param") && !vars.get("$this.value")) 
 {
     result.string(vars.get("$param.name_param"));
 }
\ No newline at end of file
diff --git a/entity/Campaign_entity/entityfields/status/valueProcess.js b/entity/Campaign_entity/entityfields/status/valueProcess.js
index 2593cb9a9879f1bbdcd91a08c5ca3ed99eea0c4a..e772e08d2c7b872067cd42a3605f157f9e41f4b9 100644
--- a/entity/Campaign_entity/entityfields/status/valueProcess.js
+++ b/entity/Campaign_entity/entityfields/status/valueProcess.js
@@ -5,7 +5,7 @@ import("KeywordRegistry_basic");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    if(vars.exists("$param.state_param") && vars.get("$param.state_param"))
+    if(vars.exists("$param.state_param") && vars.get("$param.state_param") && !vars.get("$this.value"))
         result.string(vars.get("$param.state_param"));
     else if (vars.get("$this.value") == null)
         result.string($KeywordRegistry.campaignState$planning());
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index 80bfe7f5212f2df2dac845d90873e9f2315c379d..b56a17e4e112b773aa2b1f6f5339c986b5d205bf 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -1,19 +1,25 @@
 import("system.db");
+import("system.neon");
 import("system.result");
 import("system.vars");
 import("Employee_lib");
 import("Sql_lib");
 
 
+var recordState = vars.get("$sys.recordstate");
+
 if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
     result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
-} else {
+} else if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
     var condition = new SqlBuilder()
         .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
         .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
         ;
 
     result.string(condition.toString());
+} else {
+    
+    result.string(newWhere().toString());
 }
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a2fdfdb69a4f0e0b4e752d9bb6cfff63e45f76e
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("CAMPAIGN.CAMPAIGNID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97692e13aa5f4ed03bcb9bccd4ac3b5b11872be4
--- /dev/null
+++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("Favorites_lib");
+import("system.result");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
index 11c77729428dc5d1d87aa9a2a1e4a46366a4c9e1..510c61f479969118c5e33f8c21cf3861579d0f64 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_end.value/expression.js
@@ -1,4 +1,12 @@
+import("system.neon");
 import("system.result");
+import("system.vars");
 
 
-result.string("STEPDATEEND_ALIAS");
\ No newline at end of file
+var recordState = vars.get("$sys.recordstate");
+
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
+    result.string("STEPDATEEND_ALIAS");
+} else {
+    result.string("0");
+}
diff --git a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
index ab23a74c472325d5e8bfd26ddf91f1687fbbf718..77d1b3dde659a3522bd8f4f6d682a091a8a13dc0 100644
--- a/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
+++ b/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/date_start.value/expression.js
@@ -1,4 +1,12 @@
+import("system.neon");
 import("system.result");
+import("system.vars");
 
 
-result.string("STEPDATESTART_ALIAS");
\ No newline at end of file
+var recordState = vars.get("$sys.recordstate");
+
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) {
+    result.string("STEPDATESTART_ALIAS");
+} else {
+    result.string("0");
+}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 2ceed05d81c4a6e9e8c9a6c4e5376d38b040f6eb..dc74f4716b87e075d26e2926315c508bdf77726c 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -7,7 +7,9 @@
   <title>Classification</title>
   <grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
   <iconId>VAADIN:LIST_OL</iconId>
+  <iconIdProcess>%aditoprj%/entity/ClassificationAdmin_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jDito</recordContainer>
   <entityFields>
@@ -63,7 +65,6 @@
     </entityField>
     <entityField>
       <name>UID</name>
-      <linkedContextProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js</linkedContextProcess>
     </entityField>
     <entityField>
       <name>OBJECT_TYPE</name>
diff --git a/entity/ClassificationAdmin_entity/contentTitleProcess.js b/entity/ClassificationAdmin_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9cedc1b443b456616494927893d95f000ee5532c
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/contentTitleProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var objectType = vars.get("$field.OBJECT_TYPE.displayValue");
+var classificationGroupTitle = vars.get("$field.CLASSIFICATIONGROUP.displayValue");
+var classificationTypeTitle = vars.get("$field.CLASSIFICATIONTYPEID.displayValue");
+
+var res = objectType || classificationGroupTitle || classificationTypeTitle || "";
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
index 97abbd14640708a9dd1004bded626fbd89c6a7d5..7c575abe671e6435262aa761d4723c350accdbba 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationtypeid/valueProcess.js
@@ -6,5 +6,5 @@ import("Classification_lib");
 
 if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
     result.string(util.getNewUUID());
-else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value"))
-    result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER());
\ No newline at end of file
+else if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$this.value")) // this means we are editing one of the classificationgroups
+    result.string($ClassificationPlaceholder.TOPSECRETPLACEHOLDER()); //this placeholder is set for the onUpdateProcess further explanation in there
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
index a2973102df1e5d7e7eb825ed08e9fb82890ef992..22539b26e09b6166510840fc3fd9c28e751c9a5f 100644
--- a/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
+++ b/entity/ClassificationAdmin_entity/entityfields/object_type/onValueChange.js
@@ -1,4 +1,3 @@
 import("system.neon");
 
-neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
-neon.refresh("$field.CLASSIFICATIONGROUP")
\ No newline at end of file
+neon.setFieldValue("$field.CLASSIFICATIONGROUP", "");
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
index 163b952b7230f5054874557333c9639947c0a158..45336b55ef94109330b4bc6ec35aebcf28a1a83b 100644
--- a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
@@ -3,14 +3,22 @@ import("Classification_lib");
 import("system.result");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)
+var cat = vars.get("$field.recordCategory");
+var res;
+switch (cat) 
 {
-    var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
-    
-    res = ClassificationUtils.decode(value)
-    if(res)
-        result.string(res);
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+        res = "ClassificationType";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+        res = "ClassificationGroup";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE():
+        res = "ClassificationGroup";
+        break;
+    default:
+        res = "";
+        break;
 }
 
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js b/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
deleted file mode 100644
index 7f329d1a50578f9ffb0d21a71b95493888ca0e9f..0000000000000000000000000000000000000000
--- a/entity/ClassificationAdmin_entity/entityfields/uid/linkedContextProcess.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//import("system.neon");
-//import("system.text");
-//import("system.vars");
-//import("system.result");
-//import("system.logging");
-//
-//var value = vars.get("$this.value");
-//
-//if(value)
-//{
-//    var res;
-//    if(value.charAt(0) != ";" && value.charAt(value.length) != ";")
-//        res = "ClassificationGroup";
-//    else
-//    {
-//        decodedIdvalues = text.decodeMS(value);
-//        if(decodedIdvalues[0].charAt(0) != ";" && decodedIdvalues[0].charAt(decodedIdvalues[0].length) != ";")
-//            res = "ClassificationGrading";
-//        else
-//            res = "ClassificationScore";
-//    }
-//    neon.setFieldValue("$field.TARGET_CONTEXT" , res)
-//    logging.log(res)
-//}
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/iconIdProcess.js b/entity/ClassificationAdmin_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b69514355bf1fe9a366c719bfd2ac7c430bd2b
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
index b0b953dde1e57131c6c8c5eade9b4d7d9fdada09..c7da129c3b05bfcf9fd0f48988914efa532bc5ac 100644
--- a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js
@@ -51,12 +51,12 @@ function _delete()
             table = ["CLASSIFICATIONGRADING"];
             var multiplicand = maxScore/gradingTable[0][1];
             var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+            .updateData(true, table, column, null, [maxScore]);
 
             for (let i = 1; i < gradingTable.length; i++) 
             {
                 update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+                .updateData(true, table, column, null, [parseInt(gradingTable[i][1] * multiplicand)]);
             }
         }
     }
diff --git a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
index b5eae575a499261c58669f1e479afebed20e73e4..43a6304543f7b01dab728e1774e8d6f9e06980e0 100644
--- a/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js
@@ -1,12 +1,12 @@
+import("Classification_lib");
+import("Sql_lib");
+import("system.db");
+import("system.eMath");
 import("system.entities");
-import("system.util");
-import("system.text");
 import("system.neon");
-import("system.db");
-import("Sql_lib");
+import("system.text");
+import("system.util");
 import("system.vars");
-import("Classification_lib");
-import("system.eMath");
 
 try
 {
@@ -45,11 +45,12 @@ function _update()
 
     var i;
     var isGroupDataSet = false;
-    if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER())
+//    the classificationtypeId.value has the placeholder set when editing a classificationgroup dataset to allow us 
+//    to handle the updating differently depending on whether its an classifcation group dataset or an classification type dataset
+//    since you want changes to the name of groups to effect only the group name and changes to the group of an classificationtype to change it's group
+    if(rowdata["CLASSIFICATIONTYPEID.value"] == $ClassificationPlaceholder.TOPSECRETPLACEHOLDER()) 
         isGroupDataSet = true;
 
-
-
     vars.get("$local.changed").forEach(function (field, i)
     {
         var dbField = dbFields[field];
@@ -63,14 +64,14 @@ function _update()
 
     if(!isGroupDataSet) //-> update the classification type dataset
     {
-        var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE"));
+        var groupIds = ClassificationUtils.getAllGroups(vars.get("$field.OBJECT_TYPE")); //gets all existing groups of the object_type
         var newGroupId;
         var newGroupName;
         var insertGroup = false;
         var groupchange = true;
         var newId;
         for (i = 0; i < columns.length; i++) {
-            if(columns[i] == "CLASSIFICATIONGROUP_ID")
+            if(columns[i] == "CLASSIFICATIONGROUP_ID")//if the classificationgroup_Id changed: determine whether or not a new group has to be inserted
             {
                 if(!groupIds.toString().includes(values[i]))
                 {
@@ -101,23 +102,27 @@ function _update()
                 }
         }
 
-
         if(groupchange == true)
         {
             var gradeColumn, gradeTable, multiplicand, update, gradingTable;
             var oldGroup = ClassificationUtils.getClassificationGroup(text.decodeMS(uid)[1]);
             var newMax = ClassificationUtils.getMaxScoreExcludeType(oldGroup, text.decodeMS(uid)[1]);
             gradingTable = ClassificationUtils.getGradingTableByGroupId(oldGroup); 
-            var lostScore = parseInt(newSelect("max(SCORE)").from("CLASSIFICATIONSCORE").where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1]).cell());
-            if(insertGroup)
+            
+            var lostScore = parseInt(newSelect("max(SCORE)")
+                                                .from("CLASSIFICATIONSCORE")
+                                                .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", text.decodeMS(uid)[1])
+                                                .cell()); //the greatest score of the "moved" classificationtype affects the classificationGradings
+            
+            if(insertGroup) //new group has to be inserted
             {
                 var maxSorting = newSelect("distinct CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID, CLASSIFICATIONGROUP.SORTING")
                                             .from("CLASSIFICATIONGROUP")
                                             .join("CLASSIFICATIONTYPE", "CLASSIFICATIONTYPE.CLASSIFICATIONGROUP_ID = CLASSIFICATIONGROUP.CLASSIFICATIONGROUPID")
                                             .where("CLASSIFICATIONTYPE.OBJECT_TYPE", vars.get("$field.OBJECT_TYPE"))
                                             .orderBy("CLASSIFICATIONGROUP.SORTING desc")
-                                            .table()[0][1];
-                db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group
+                                            .table()[0][1]; //gets the greatest sorting value of the object_type
+                db.insertData("CLASSIFICATIONGROUP", ["CLASSIFICATIONGROUPID", "TITLE", "SORTING"], null, [newGroupId, newGroupName, eMath.addInt(maxSorting, 1)]) //insert the new group (sorting is greater than the greatest one
 
                 var gradingColumns = [
                 "CLASSIFICATIONGRADINGID",
@@ -133,13 +138,13 @@ function _update()
                 newGroupId
                 ];
 
-                db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue
+                db.insertData("CLASSIFICATIONGRADING", gradingColumns, null, gradingValues); // insert a "dummy" classificationGradingValue, since not having one results in problems
             }
-            else
+            else // classificationtype has to be moved to another classificatingroup
             {
-                newId = vars.get("$field.CLASSIFICATIONGROUP");
-                newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); 
-                newNewMax = eMath.addInt(newMax, lostScore)
+                newId = vars.get("$field.CLASSIFICATIONGROUP"); //we know that the field has the classificationgroupId of the new group set
+                newGradingTable = ClassificationUtils.getGradingTableByGroupId(newId); //we use this id to get the gradingtable of the new group
+                newNewMax = eMath.addInt(newGradingTable[0][1], lostScore) //maxvalue of the gradingtable with the added lostScore = the new maxValue
                 if(newGradingTable[0][1] != newNewMax) //update existing classificationGrading if the maxValue has changed
                 {
                     gradeColumn = ["MAXGRADEFORSCORE"];
@@ -173,7 +178,6 @@ function _update()
             }
         }
 
-
         cond = newWhereIfSet("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = '" + text.decodeMS(uid)[1] + "'");
         columns.push("SCORETYPE");
         values.push(vars.get("$field.CLASSIFICATIONTYPEIDDISPLAYVALUE"));
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index e82162ec53830890f0318084f9f519df8e11eb08..fdf4e999952bbfc3804623512cf5fe978d900612 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -20,6 +20,7 @@
     </entityField>
     <entityField>
       <name>MAXGRADEFORSCORE</name>
+      <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc</documentation>
       <title>Max Value</title>
       <contentType>NUMBER</contentType>
       <outputFormat>#####</outputFormat>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 51332fbd2ec4c92c2c75f876709dd9275bc39931..b24809498150ef8eca45712cbaa279277a9607d6 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -38,7 +38,6 @@
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
       <mandatory v="true" />
-      <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
     </entityField>
     <entityProvider>
       <name>ClassificationScores</name>
diff --git a/entity/ClassificationScore_entity/entityfields/score/onValidation.js b/entity/ClassificationScore_entity/entityfields/score/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
index 4feb1dc30761452716df0f169ffef60f0945c21a..f45ecc8306bdd9f82d4249c83fa66b0f8543ac71 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js
@@ -21,12 +21,12 @@ try
         var table = ["CLASSIFICATIONGRADING"];
         var multiplicand = maxScore/gradingTable[0][1];
         var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+                                .updateData(true, table, column, null, column, db.getCurrentAlias(), [maxScore]);
 
         for (let i = 1; i < gradingTable.length; i++) 
         {
             update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+                            .updateData(true, table, column, null, [parseInt(gradingTable[i][1] * multiplicand)]);
         }
     }
 }
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
index 5cfa69ab83d180289ed03ff802d37ecd44d023b5..dc07afd47acdfced255c79862004b15ea01f911a 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/onDBUpdate.js
@@ -20,12 +20,12 @@ try
         var table = ["CLASSIFICATIONGRADING"];
         var multiplicand = maxScore/gradingTable[0][1];
         var update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[0][0])
-                                .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [maxScore]);
+                                .updateData(true, table, column, null, [maxScore]);
 
         for (let i = 1; i < gradingTable.length; i++) 
         {
             update = newWhere("CLASSIFICATIONGRADING.CLASSIFICATIONGRADINGID", gradingTable[i][0])
-                            .updateData(true, table, column,  db.getColumnTypes("CLASSIFICATIONGRADING", column, db.getCurrentAlias()), [parseInt(gradingTable[i][1] * multiplicand)]);
+                            .updateData(true, table, column, null, [parseInt(gradingTable[i][1] * multiplicand)]);
         }
     }
 }
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index d86c079f7b68f2f527fb56ee8044e50dab3afbbf..faf8305ab8185d249fd38216f9954fd7d857dcb9 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -39,6 +39,7 @@
     </entityField>
     <entityConsumer>
       <name>ClassificationScores</name>
+      <refreshParent v="true" />
       <dependency>
         <name>dependency</name>
         <entityName>ClassificationScore_entity</entityName>
diff --git a/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
index 07815a1f88e787ef8647c0580f565279772f5efc..1aec260db1641b4b7b282eacb60d756408b1f086 100644
--- a/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
+++ b/entity/ClassificationType_entity/entityfields/infofield/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.neon");
 import("system.translate");
 import("Entity_lib");
 import("system.result");
@@ -16,7 +17,7 @@ var maxScore = 0;
 var i;
 var randomScoreId;
 
-result.string(translate.text("Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!"))
+var res = ClassificationUtils.getTranslatedInfo();
 if(rows.length > 0)
 {
     for (i = 0; i < rows.length; i++) 
@@ -54,7 +55,7 @@ if(rows.length > 0)
                 for (i = 0; i < gradingTable.length; i++) 
                 {
                     oldToNewValueString += gradingTable[i][2] + ": " + gradingTable[i][1] + "->" + parseInt(gradingTable[i][1] * multiplicand) + "\n\
-            ";
+    ";
                 }
             }
             else 
@@ -67,9 +68,9 @@ if(rows.length > 0)
             ";
                 }
             }
-            var resString = translate.text("This is how the Classification Gradings of the Classification will get affected by these changes:") + "\n\
+            res = translate.text("This is how the Classification Gradings of the Classification will get affected by these changes:") + "\n\
     "+ oldToNewValueString;
-            result.string(resString);
         }
     }
-}
\ No newline at end of file
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
index 80e8d7e14a4b25f9f4c2461a0d736d5e03ae45ad..d8c6a26ee9e7e6851db78a9c24172140d0d2aa8d 100644
--- a/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
+++ b/entity/ClassificationType_entity/recordcontainers/db/recordfieldmappings/maxscore.value/expression.js
@@ -6,5 +6,4 @@ var statement = newSelect("max(CLASSIFICATIONSCORE.SCORE)")
         .from("CLASSIFICATIONSCORE")
         .where("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID");
 
-logging.log("statement.toString()>>" + statement.toString())
 result.string(statement.toString());
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 011426f28c49b46e51582e167bf98d6a18abd991..0ffc7c029876ca37340aa50f5a4503ca4e0c8d1e 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -42,7 +42,6 @@
     </entityParameter>
     <entityProvider>
       <name>Classifications</name>
-      <documentation>%aditoprj%/entity/Classification_entity/entityfields/classifications/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
diff --git a/entity/Classification_entity/entityfields/classifications/documentation.adoc b/entity/Classification_entity/entityfields/classifications/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 0827f9f533b96112b07307a62f704bdde271f52a..78879bee92567449a5ca43c6ef616d91d236a62f 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -110,11 +110,11 @@ select.table().forEach(function (pRow){
     var classificationTypeGroupDisplay = classificationTypeGroupDisplayCache[classificationTypeGroupId];
 
     //a field can only contain a string so format complex data into string
-    scoresPerGroup = JSON.stringify(scoresPerGroup);
+    scoresPerGroupForPush = JSON.stringify(scoresPerGroup);
 
     resultSet.push([uid, classificationId, classificationTypeGroupId, classificationTypeGroupDisplay, classificationGroupTitle
         , classificationScoreId, classificationScoreTitle, classificationTypeId, classificationTypeId, classificationTypeObjectType
-        , objectRowIdParam, classificationTypeScoreType, classificationTypeObjectType, scoresPerGroup, currentGroupScore]);
+        , objectRowIdParam, classificationTypeScoreType, classificationTypeObjectType, scoresPerGroupForPush, currentGroupScore]);
 });
 
 result.object(resultSet);
diff --git a/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc b/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 53ca53c9dbbb6e2af03dbeca581fb0767c1c5069..41a386bd8dce1d009f4b1887e118adb79b9165cc 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -263,6 +263,7 @@
       <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <onDBDelete>%aditoprj%/entity/Contact_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
           <name>86ded52f-1b55-4d3d-b89d-23c465f20566</name>
diff --git a/entity/Contact_entity/entityfields/organisation_contactid/onValidation.js b/entity/Contact_entity/entityfields/organisation_contactid/onValidation.js
index 94865c1d50a90d9c07c3cc5edd7ad5bded069ab4..dafb89230293e4d8aa9e53674947fe00cfd21bd0 100644
--- a/entity/Contact_entity/entityfields/organisation_contactid/onValidation.js
+++ b/entity/Contact_entity/entityfields/organisation_contactid/onValidation.js
@@ -5,9 +5,10 @@ import("system.db");
 import("system.vars");
 import("Entity_lib");
 import("Sql_lib");
+import("Organisation_lib");
 
 var personId = vars.getString("$field.PERSON_ID");
-var organisationId;
+var organisationId, validationMsg;
 var orgContactId = vars.get("$local.value");
 var organisationIds = ContactUtils.getPersOrgIds(orgContactId)
     
@@ -19,8 +20,19 @@ if (organisationIds.length > 0 && organisationIds[2])
     if (vars.get("$field.CONTACTID"))
         contactId = vars.get("$field.CONTACTID");
 
-    var validationMsg = ContactUtils.validateIfAlreadyExists(personId, organisationId, contactId);
+    validationMsg = ContactUtils.validateIfAlreadyExists(personId, organisationId, contactId);
     if (validationMsg)
         result.string(validationMsg);
 }
-
+else
+{
+    var privateCount = newSelect("count(*)")
+                                .from("CONTACT")
+                                .where("CONTACT.ORGANISATION_ID", OrgUtils.getPrivateOrganisationId())
+                                .and("CONTACT.CONTACTID", vars.get("$param.OwnContactId_param"))
+                                .cell();
+    if(privateCount > 0)
+        validationMsg = translate.text("A person can only have one private Contact.");
+    if(validationMsg)
+        result.string(validationMsg)
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/initFilterProcess.js b/entity/Contact_entity/initFilterProcess.js
index c33a0cbce2a1e1a58e2c625c13dc34e40af3f62f..594376e1094dc0fb552076e1ae4da4aafcc4dacb 100644
--- a/entity/Contact_entity/initFilterProcess.js
+++ b/entity/Contact_entity/initFilterProcess.js
@@ -1,24 +1 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
-{
-    var statusInactive = $KeywordRegistry.contactStatus$inactive();
-    var filter = {
-        type: "group",
-        operator: "AND",
-        childs: [{
-            type: "row",
-            name: "STATUS",
-            operator: "NOT_EQUAL",
-            contenttype: "TEXT",
-            key: statusInactive,
-            value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
-        }]
-    };
-
-    result.string(JSON.stringify(filter));
-}
\ No newline at end of file
+//no init filter here because there are no filterable fields in this entity and no filter is enabled in the list views
\ No newline at end of file
diff --git a/entity/Contact_entity/onValidation.js b/entity/Contact_entity/onValidation.js
index ef3e299e677759fc8fe8b0237ee9fe27d6c4723f..6ba91bd92983f4cc209d5f95f3972dc45cd5a089 100644
--- a/entity/Contact_entity/onValidation.js
+++ b/entity/Contact_entity/onValidation.js
@@ -1,8 +1,9 @@
+import("Organisation_lib");
 import("system.vars");
 import("system.neon");
 
 //TODO: workaround till there exists somtehing that can be done "beforeSave"; a validation of the whole entity is done before saving so let's use this process at the moment
 if(!vars.get("$field.ORGANISATION_ID"))
 {
-    neon.setFieldValue("$field.ORGANISATION_ID", "0");
+    neon.setFieldValue("$field.ORGANISATION_ID", OrgUtils.getPrivateOrganisationId());
 }
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/onDBDelete.js b/entity/Contact_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..61afa46ba950988b60515de3cae0e732553cfe69
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,17 @@
+import("Sql_lib");
+import("Attribute_lib");
+import("Workflow_lib");
+import("system.vars");
+import("DuplicateScanner_lib");
+
+var contactId = vars.get("$field.CONTACTID");
+DuplicateScannerUtils.deleteCachedDuplicate(contactId);
+
+new AttributeRelationQuery(contactId, null, "Person")
+    .deleteAllAttributes();
+
+newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
+newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
+newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+
+WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index b3f109df9e129786beca3bfa1baedacb34f706e9..273e731918f9e43fbd9259ff07c9dc9ec8123887 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -553,6 +553,14 @@
           <filterConditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b54c170684381c41d00387e9f2371c7d327d05a
--- /dev/null
+++ b/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("CONTRACT.CONTRACTID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97692e13aa5f4ed03bcb9bccd4ac3b5b11872be4
--- /dev/null
+++ b/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("Favorites_lib");
+import("system.result");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 9b431268c59c2475cfc514bdbc784ca4c3e4435d..9a4408cb03cc9d0d4de39895c93611b24df313da 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -14,6 +14,8 @@
     </entityProvider>
     <entityProvider>
       <name>ISO2Name</name>
+      <lookupIdfield>ISO2</lookupIdfield>
+      <documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
diff --git a/entity/Countries_Entity/entityfields/iso2name/documentation.adoc b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4e2b19d84b1adaa686d02d2b63352907aaf28230
--- /dev/null
+++ b/entity/Countries_Entity/entityfields/iso2name/documentation.adoc
@@ -0,0 +1,4 @@
+Provides a list of countries, where the UID is the countires two character ISO-code
+ISO 3166-1 alpha-2; see: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+For example: `IT` for Italy, `DE` for Germany, `NO` for Norway, etc.
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 5baf9ac2bf6d4b403b1b0b708c4c9f0fed77923b..9a090c1ee2cc636fcc7b1dfe8a5651482b51f376 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -156,6 +156,11 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>Recipient_param</name>
+      <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/DSGVOInfo_entity/afterSave.js b/entity/DSGVOInfo_entity/afterSave.js
index fab6c5f77cb6da16dadf7532649461c6dee311d2..d6e70c791660298ce8b50554987d92488779137f 100644
--- a/entity/DSGVOInfo_entity/afterSave.js
+++ b/entity/DSGVOInfo_entity/afterSave.js
@@ -18,6 +18,7 @@ var contactId = entityData["param.ContactId_param"];
 var reportType = entityData["param.ReportType_param"];
 
 if (reportType)
+{
     DataPrivacyUtils.openReport(contactId, reportType, params);
-
-result.string(true);
\ No newline at end of file
+    result.string(true);
+}
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
similarity index 52%
rename from entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
rename to entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
index 338565e60f882ba76571f3ad005c6d1fa262b045..c9be9208d3f269740c4ed22b8ec8a1d05d6f7b53 100644
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js
+++ b/entity/DSGVOInfo_entity/entityfields/recipient_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.uid"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.RECIPIENT"));
\ No newline at end of file
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index b6fe8ca524db92a69e8fd9e66ffcc2a67485471c..b96cb3a3dbc480499bb71e154509700ae34bb4f9 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
@@ -9,7 +9,7 @@
       <name>#PROVIDER</name>
     </entityProvider>
     <entityParameter>
-      <name>ContactID_param</name>
+      <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="false" />
     </entityParameter>
@@ -36,6 +36,18 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityActionGroup>
+      <name>dsgvoReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchDSGVOReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7ffc71bedc55beb9053abc8da900f809680228c
--- /dev/null
+++ b/entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.logging");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("Contact_lib");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+import("Entity_lib");
+
+var reportType = vars.get("$param.ReportName_param");
+var contactId = vars.get("$param.ContactId_param");
+var recipient = JSON.parse(vars.get("$param.DSGVOInfo_param"))["recipient"];
+
+var dsgvoReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.REPORT_DATA");
+var emailFilename = translate.text(reportType == "DSGVO_Disclosure_report" ? "Disclosure Report" : "Information Report");
+var fullname = ContactUtils.getTitleByContactId(contactId);
+emailFilename = emailFilename + " " + fullname;
+
+dsgvoReport.content = reportData;
+dsgvoReport.mimeType = MimeTypes.PDF();
+dsgvoReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = dsgvoReport;
+
+EmailWritingUtils.sendReportAsMail(recipient, attachmentArray, "DSGVOReport", null, emailFilename, null, null);
diff --git a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
index 2e61138143c9e5cf8decd5cda6bad318d7ce49e5..f32c42488423b505bfc4634adc12cef5b7256038 100644
--- a/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
+++ b/entity/DSGVOReport_entity/entityfields/report_data/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.logging");
 import("DataPrivacy_lib")
 
-result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactID_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
+result.string(DataPrivacyUtils.buildReport(vars.get("$param.ContactId_param"), vars.get("$param.ReportName_param"), JSON.parse(vars.get("$param.DSGVOInfo_param"))));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4062bb8fd405fd3447584e1169ac5f9f8e15c83c
--- /dev/null
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>DistrictResponsible_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/DistrictResponsible_entity/documentation.adoc</documentation>
+  <icon>VAADIN:GLOBE</icon>
+  <title>District Responsible</title>
+  <contentTitleProcess>%aditoprj%/entity/DistrictResponsible_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconIdProcess>%aditoprj%/entity/DistrictResponsible_entity/iconIdProcess.js</iconIdProcess>
+  <image>VAADIN:GLOBE</image>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DEPARTMENT_ATTRIBUTE_ID</name>
+      <title>Department</title>
+      <consumer>Departments</consumer>
+      <state>AUTO</state>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>EMPLOYEE_CONTACT_ID</name>
+      <title>{$DISTRICT_RESPONSIBLE}</title>
+      <consumer>Employees</consumer>
+      <linkedContext>Person</linkedContext>
+      <selectionMode>SINGLE</selectionMode>
+      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_ID</name>
+      <title>{$DISTRICT}</title>
+      <consumer>Districts</consumer>
+      <linkedContext>District</linkedContext>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Departments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Attribute_entity</entityName>
+        <fieldName>SpecificAttribute</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
+          <description>parent id, this is used for filtering by the parent in the content process</description>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Employees</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Employee_entity</entityName>
+        <fieldName>Employees</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Districts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>District_entity</entityName>
+        <fieldName>ResponsibleDistricts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>DISTRICTRESPONSIBLEID</name>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>DistrictResponsibles</name>
+      <lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
+      <titlePlural>Responsibles</titlePlural>
+      <dependencies>
+        <entityDependency>
+          <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+          <entityName>District_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgUid_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>DistrictId_param</name>
+      <expose v="true" />
+      <mandatory v="false" />
+    </entityParameter>
+    <entityConsumer>
+      <name>LogHistories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>tablenames_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>departmentAttributeName</name>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc</documentation>
+      <title>Department</title>
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js</valueProcess>
+    </entityField>
+    <entityProvider>
+      <name>OrganisationResponsibles</name>
+      <targetContextField>targetContext</targetContextField>
+      <targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>2b3318a3-4925-4aa8-bf6e-bc5489549327</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>DistrictResponsibles</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>OrgUid_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityParameter>
+      <name>CollectedDistrictIds_param</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js</valueProcess>
+      <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityField>
+      <name>MAIL</name>
+      <title>Email</title>
+    </entityField>
+    <entityField>
+      <name>PHONE</name>
+      <title>Phone</title>
+    </entityField>
+    <entityField>
+      <name>targetContext</name>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+    </entityField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <fromClauseProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+      <conditionProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>d24296ec-5040-4b40-ad5b-668d3e02b4aa</name>
+          <tableName>DISTRICTRESPONSIBLE</tableName>
+          <primaryKey>DISTRICTRESPONSIBLEID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+        <linkInformation>
+          <name>86f9ab94-0d69-4a3a-9a04-615f61be2c23</name>
+          <tableName>CONTACT</tableName>
+          <primaryKey>CONTACTID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT_ATTRIBUTE_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DISTRICT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICTRESPONSIBLEID.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DISTRICTRESPONSIBLEID</recordfield>
+          <isFilterable v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.USER_EDIT</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.USER_NEW</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DATE_EDIT</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DISTRICTRESPONSIBLE.DATE_NEW</recordfield>
+          <isFilterable v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
+          <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>MAIL.value</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PHONE.value</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/DistrictResponsible_entity/contentTitleProcess.js b/entity/DistrictResponsible_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67d21cf41ffa951498384284c6ebdd2490f0a84e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/contentTitleProcess.js
@@ -0,0 +1,12 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+var contactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var res = "";
+
+if(contactId)
+    res = EmployeeUtils.getUsersDepartment(contactId, true);
+
+result.string(res)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/documentation.adoc b/entity/DistrictResponsible_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4cc601b1d84e7540f351c476c436a4594452895e
--- /dev/null
+++ b/entity/DistrictResponsible_entity/documentation.adoc
@@ -0,0 +1,17 @@
+= DistrictResponsible_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling the district responsibles.
+Particularities: None known.
+
+Relations to other entities: 
+    - District_entity
+    - Attribute_entity
+    - Document_entity
+    - Employee_entity
+    - LogHistory_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cad2d37316c24dd0897dc428e09f4953cf39bb92
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/documentation.adoc
@@ -0,0 +1,15 @@
+Non exposed parameter that collects the districtIds for the given value of `OrgUid_param`.
+
+Advantages of encapsulation as a non exposed param:
+
+* one interface to other entities (e.g. the Organisation_entity)
+* logic for collecting districtIds is done within the `DistrictResponsible_entity` scope which means
+other entities don't have to collect the IDs themselfes. For example:
+The `Organisation_entity` doesn't have to collect the IDs because the `DistrictResponsible_entity` 
+_knows_ how to collect them.
+* the value of this `CollectedDistrictIds_param` can be passed to the `cacheKeyProcess` 
+(this enables us for example to cache district responsibles per Districtlist and not per Oranisation)
+* Calculation of the affected districtIds only when needed. For example: 
+The DistrictIds are not loaded when an Organisation is opened but when the 
+consumer data for the `DistrictResponsible_entity` is loaded 
+(=when the user changes the into the district responsibles tab)
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d41b30698cdc7f111be42123d8b2eafb96d3f7c
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/collecteddistrictids_param/valueProcess.js
@@ -0,0 +1,52 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var orgUid = vars.get("$param.OrgUid_param");
+
+if(orgUid) 
+{
+    var orgDistrictIds = _getDistrictIdsByOrgUid(orgUid);
+    orgDistrictIds = JSON.stringify(orgDistrictIds);
+} else {
+    orgDistrictIds = JSON.stringify([]);
+}
+
+result.string(orgDistrictIds);
+
+function _getDistrictIdsByOrgUid(pOrgUid) {
+    
+    var districtIds = [];
+    var nonMatchedId = [];
+    var loadingRowsConfig = entities.createConfigForLoadingRows()
+                                        .entity("District_entity")
+                                        .fields(["#UID", "appliedFilter", "DISTRICT_NAME", "PARENTDISTRICT_ID"]);
+    var districtRows = entities.getRows(loadingRowsConfig);
+    
+    for (i = 0; i < districtRows.length; i++) {
+        
+        if (districtRows[i]["PARENTDISTRICT_ID"] in nonMatchedId)
+        {
+            nonMatchedId.push(districtRows[i]["#UID"]);
+            continue;
+        } else {
+            var filter = JSON.stringify(JSON.parse(districtRows[i]["appliedFilter"]).filter);
+            var rowCountConfig = entities.createConfigForLoadingRows()
+                                            .entity("Organisation_entity")
+                                            .uid(pOrgUid)
+                                            //.provider()
+                                            .filter(filter);
+        
+            var rowCount = entities.getRowCount(rowCountConfig);
+        
+            if (rowCount > 0) 
+            {
+                districtIds.push(districtRows[i]["#UID"]);   
+            } else {
+                nonMatchedId.push(districtRows[i]["#UID"]);
+            }   
+        }
+    }
+    return districtIds;
+}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..054ad94ce22cb654da8b7caf533ffefc5219d21f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..032607ee56724f30881fec7bad289679ce944e4f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3474c5398a8b48f35e4cd6f82297fecafb9e8928
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/department_attribute_id/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.tools");
+
+var employeesContactId = vars.get("$field.EMPLOYEE_CONTACT_ID");
+var departmentsAttrId = ""
+if (employeesContactId)
+{
+    departmentsAttrId = tools.getUsersByAttribute(tools.CONTACTID, [employeesContactId])[0][tools.PARAMS].department;
+}
+
+result.string(departmentsAttrId);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..5bfe0dc5113c1612653d080130a887af00c71a9b
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc
@@ -0,0 +1 @@
+Used in DistrictPreview_view and also in the contentProcess of the JDito RC from Member_entity.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js b/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..916fbbd300758fdb197ee31bb0958a12d87f6670
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fac5c4e3942f0e9442d679d78370ba7136b96d6
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+
+var departmentAttrId = vars.get("$field.DEPARTMENT_ATTRIBUTE_ID");
+var departmentDisplayName = "";
+
+if (departmentAttrId) 
+{
+    departmentDisplayName = AttributeUtil.getSimpleAttributeName(departmentAttrId, true);
+}
+
+result.string(departmentDisplayName);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..246beece1e0537e3649fa0eeda40218eaa852864
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/departments/children/parentid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("AttributeRegistry_basic");
+import("system.result");
+
+result.string($AttributeRegistry.departments());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cc037e5096fd131d431504c70793f49767f701d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/district_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$param.DistrictId_param"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4f7a48b890e5dd28b4588e5339eb117cc590f4fb
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= DistrictResponsible_entity - DistrictResponsibles
+
+Provider for the district entity, used to work with district responsibles from the district entity.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..51e13bb7a66c51fe725941ddaad7f9b7e5ce884f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DISTRICTRESPONSIBLEID"));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5a701f96e3402a647a7a6b8a1bd6e97c4a93769
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICTRESPONSIBLE");
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js b/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..edf41e1e25b2d2bdbf2228fc282340a351439bee
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.EMPLOYEE_CONTACT_ID"), false));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e27434b585fb39f99361fb42945e1c97a68d173
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [{id: vars.get("$field.DISTRICTRESPONSIBLEID"), tableNames: ["DISTRICTRESPONSIBLE"]}];
+
+res = JSON.stringify(res);//currently only strings  can be passed as param
+
+result.object(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f9d4c6b31cfaddff2e83e86f5735dde1fbee30bf
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - OrganisationResponsibles
+
+Provider for the organisation entity, used to display the corrensponding district responsibles in the organisation main view.
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ba819b0b1d3a291ac31d270ec48c009ccf047e0
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/targetcontext/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Person");
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/DistrictResponsible_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/iconIdProcess.js b/entity/DistrictResponsible_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b60b52f93c3297f9f88cf7388be7c05a8f72ce9d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/iconIdProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var res = "TEXT:" + vars.get("$field.EMPLOYEE_CONTACT_ID.displayValue");
+result.string(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..37bf4d68be0ead0d1b35f9f14e70f7b867a2a5db
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,7 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictId_param", "$param.CollectedDistrictIds_param");
+
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d61189649016e2ed0cd022e862c5ecaf1290801c
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,25 @@
+import("system.entities");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var districtId = vars.get("$param.DistrictId_param");
+var orgUid = vars.get("$param.OrgUid_param");
+var cond = newWhere();
+
+if (districtId)
+{
+    cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", districtId);
+} 
+else if(orgUid) 
+{
+    var orgDistrictIds = vars.get("$param.CollectedDistrictIds_param");
+    if (orgDistrictIds)
+    {
+        orgDistrictIds = JSON.parse(orgDistrictIds);
+        if (orgDistrictIds.length > 0)
+            cond.and("DISTRICTRESPONSIBLE.DISTRICT_ID", orgDistrictIds, SqlBuilder.IN());
+    }
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..69390b79863ad21835d50b36269f255bbdacb62d
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+
+var res = "DISTRICTRESPONSIBLE \n\
+    left join CONTACT on (CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID)";
+result.string(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bd6b5d01756719a2e951069a73268a5bb488d9f
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("DISTRICT.DISTRICT_NAME")
+                .from("DISTRICT")
+                .where("DISTRICT.DISTRICTID = DISTRICTRESPONSIBLE.DISTRICT_ID")
+                .toString());
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea80128c827323a3e4ee69e85bea46e10b0cdf37
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Contact_lib");
+
+var res = ContactUtils.getResolvingDisplaySubSql("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", false);
+result.string(res);
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ced6fa694a2e0d83946083b25efa1650fa9be24
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/mail.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlMail());
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce31b16dbba0412075b7f8f2d5376fe163ed868a
--- /dev/null
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Communication_lib");
+
+result.string(CommUtil.getStandardSubSqlPhone());
\ No newline at end of file
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e775acd3c2243cada93f42afa935b6336bb8d256
--- /dev/null
+++ b/entity/District_entity/District_entity.aod
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>District_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/District_entity/documentation.adoc</documentation>
+  <icon>VAADIN:GLOBE</icon>
+  <title>District definition</title>
+  <contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
+  <iconIdProcess>%aditoprj%/entity/District_entity/iconIdProcess.js</iconIdProcess>
+  <titlePlural></titlePlural>
+  <recordContainer>db</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>DISTRICT_NAME</name>
+      <title>Name</title>
+      <mandatory v="true" />
+    </entityField>
+    <entityField>
+      <name>DISTRICT_NUMBER</name>
+      <title>{$DISTRICT_NUMBER}</title>
+      <contentType>TEXT</contentType>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/district_number/displayValueProcess.js</displayValueProcess>
+      <onValidation>%aditoprj%/entity/District_entity/entityfields/district_number/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_INFO</name>
+      <title>Information</title>
+      <contentType>LONG_TEXT</contentType>
+    </entityField>
+    <entityField>
+      <name>DISTRICTID</name>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_STATUS</name>
+      <title>Status</title>
+      <contentType>BOOLEAN</contentType>
+      <mandatory v="true" />
+      <dropDownProcess>%aditoprj%/entity/District_entity/entityfields/district_status/dropDownProcess.js</dropDownProcess>
+      <selectionMode>SINGLE</selectionMode>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_status/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENTDISTRICT_DISTRICTID</name>
+      <title>{$DISTRICT_PARENT_DISTRICT}</title>
+      <consumer>ParentDistricts</consumer>
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>DISTRICT_FILTER</name>
+      <title>District Filter</title>
+      <contentType>FILTER_TREE</contentType>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_filter/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>customerCounting</name>
+      <title>Customer counting</title>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/customercounting/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>totalTurnover</name>
+      <title>{$DISTRICT_TOTAL_TURNOVER}</title>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/totalturnover/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ISO3</name>
+      <title>Language</title>
+      <consumer>Languages</consumer>
+      <displayValueProcess>%aditoprj%/entity/District_entity/entityfields/iso3/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityProvider>
+      <name>ResponsibleDistricts</name>
+      <lookupIdfield>DISTRICTID</lookupIdfield>
+      <documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
+      <titlePlural>Responsible Districts</titlePlural>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Districts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ExcludedDistrictIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DistrictsByContactId_param</name>
+          <mandatory v="true" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>Languages</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Language_entity</entityName>
+        <fieldName>ISO3Name</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>DistrictResponsibles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DistrictId_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>USER_NEW</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <refreshParent v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityFieldGroup>
+      <name>DISTRICT_NUMBER_fieldGroup</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js</valueProcess>
+      <title>{$DISTRICT_NO}</title>
+      <fields>
+        <element>DISTRICT_NUMBER</element>
+      </fields>
+    </entityFieldGroup>
+    <entityConsumer>
+      <name>Documents</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>AssignmentRowId_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>AssignmentTable_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>LogHistories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityField>
+      <name>parentFilter</name>
+      <title>Parent Filter</title>
+      <contentType>FILTER_TREE</contentType>
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentfilter/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DistrictsByContactId_param</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+    </entityParameter>
+    <entityField>
+      <name>appliedFilter</name>
+      <valueProcess>%aditoprj%/entity/District_entity/entityfields/appliedfilter/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+        <element>RECORD</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityConsumer>
+      <name>ParentDistricts</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>#ENTITY</entityName>
+        <fieldName>ValidParentDistricts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ExcludedDistrictIds_param</name>
+          <valueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>ValidParentDistricts</name>
+      <documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
+          <entityName>District_entity</entityName>
+          <fieldName>ParentDistricts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>DistrictsByContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityParameter>
+      <name>ExcludedDistrictIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <isPageable v="false" />
+      <conditionProcess>%aditoprj%/entity/District_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/District_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/District_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>b8398641-f97b-43e4-8f2c-beda8690ab2f</name>
+          <tableName>DISTRICT</tableName>
+          <primaryKey>DISTRICTID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <recordfield>DISTRICT.DATE_EDIT</recordfield>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>DISTRICT.DATE_NEW</recordfield>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_FILTER.value</name>
+          <recordfield>DISTRICT.DISTRICT_FILTER</recordfield>
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_INFO.value</name>
+          <recordfield>DISTRICT.DISTRICT_INFO</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_NAME.value</name>
+          <recordfield>DISTRICT.DISTRICT_NAME</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_NUMBER.value</name>
+          <recordfield>DISTRICT.DISTRICT_NUMBER</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT_STATUS.value</name>
+          <recordfield>DISTRICT.DISTRICT_STATUS</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICTID.value</name>
+          <recordfield>DISTRICT.DISTRICTID</recordfield>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ISO3.value</name>
+          <recordfield>DISTRICT.ISO3</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENTDISTRICT_DISTRICTID.value</name>
+          <recordfield>DISTRICT.PARENTDISTRICT_DISTRICTID</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <recordfield>DISTRICT.USER_EDIT</recordfield>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <recordfield>DISTRICT.USER_NEW</recordfield>
+          <isFilterable v="false" />
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>appliedFilter.value</name>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>customerCounting.value</name>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>parentFilter.value</name>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>totalTurnover.value</name>
+          <isLookupFilter v="false" />
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/District_entity/contentTitleProcess.js b/entity/District_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..638819b3523dc19485ac772e4f6e5a539b4daf0c
--- /dev/null
+++ b/entity/District_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DISTRICT_NAME"));
\ No newline at end of file
diff --git a/entity/District_entity/documentation.adoc b/entity/District_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a5a7cc1bf15dd756763350054e7a42d55cbcae59
--- /dev/null
+++ b/entity/District_entity/documentation.adoc
@@ -0,0 +1,23 @@
+= District_entity
+
+Overview:
+
+Definition: Entity, which is responsible for handling districts.
+Purpose: Creating the ability to create e.g. sales areas or logical areas.
+Particularities: 
+    - Filters are used to implement the logic, to define a area/district. (District: Germany has the filter: Country = "Germany")
+        - The filters are separated into the corresponding district filter from the current tier, which is saved into the database
+          (e.g.: Country = Germany for the District: Germany) and the appliedFilter, which contains all the filter from the overlying 
+          districts in a nested form (including the filter of the current tier) (e.g: District: Munich: Country: "Germany" -> State: "Bavaria" 
+          -> City: "Munich").
+
+Relations to other entities: 
+    - DistrictResponsible_entity
+    - Document_entity
+    - Language_entity
+    - LogHistory_entity
+    - Organisation_entity
+
+Best practices: None known.
+
+FAQs: None known.
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/appliedfilter/valueProcess.js b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..253bd0712af0b47b35aaa72b8d027fc9d053526d
--- /dev/null
+++ b/entity/District_entity/entityfields/appliedfilter/valueProcess.js
@@ -0,0 +1,37 @@
+import("system.result");
+import("system.vars");
+
+var parentFilter = vars.get("$field.parentFilter");
+var districtFilter = vars.get("$field.DISTRICT_FILTER");
+
+var appliedFilter = {
+        entity: "Organisation_entity", 
+        filter: {
+            type: "group", 
+            operator: "AND", 
+            childs: []
+}};
+
+if (parentFilter)
+{
+    appliedFilter.filter.childs.push(JSON.parse(parentFilter).filter);
+}
+if (districtFilter)
+{
+    //appliedFilter = _getApplicableFilter(appliedFilter, districtFilter);
+    appliedFilter.filter.childs.push(JSON.parse(districtFilter).filter);
+}
+
+result.string(JSON.stringify(appliedFilter));
+
+filterArray = [];
+
+function _getApplicableFilter(pFilter, pAppendFilter){
+    
+    var applicableFilter = "";
+    var childFilter = JSON.parse(pFilter).filter;
+    
+    
+    
+    return applicableFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/customercounting/valueProcess.js b/entity/District_entity/entityfields/customercounting/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ccecd79603fe711a4705cd3fe0a6081a800986cc
--- /dev/null
+++ b/entity/District_entity/entityfields/customercounting/valueProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+
+var appliedFilter = vars.get("$field.appliedFilter");
+var conf, rowCount = 0;
+
+if (appliedFilter)
+{
+    appliedFilter = JSON.parse(appliedFilter).filter;
+    appliedFilter = JSON.stringify(appliedFilter);
+    
+    conf = entities.createConfigForLoadingRows()
+                        .entity("Organisation_entity")
+                        .fields(["ORGANISATIONID"])
+                        .filter(appliedFilter);
+                                
+    rowCount = entities.getRowCount(conf);
+}
+
+
+result.string(rowCount);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_edit/valueProcess.js b/entity/District_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..054ad94ce22cb654da8b7caf533ffefc5219d21f
--- /dev/null
+++ b/entity/District_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/date_new/valueProcess.js b/entity/District_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..032607ee56724f30881fec7bad289679ce944e4f
--- /dev/null
+++ b/entity/District_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentDate = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentDate = vars.get("$sys.date");
+}
+
+result.string(currentDate);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_filter/valueProcess.js b/entity/District_entity/entityfields/district_filter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f184154fd9e40e1aef1e59d59efb97b7310f33ee
--- /dev/null
+++ b/entity/District_entity/entityfields/district_filter/valueProcess.js
@@ -0,0 +1,27 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+
+var currentFilter = vars.get("$this.value");
+var entity = "Organisation_entity";
+var emptyFilter = {
+    entity: entity, 
+    filter: {
+        type: "group", 
+        operator: "AND", 
+        childs: []
+    }
+};
+
+
+if (currentFilter)
+    currentFilter = JSON.parse(currentFilter);
+
+//if the filter field is empty or if the entity was changed, reset the filter
+if (!currentFilter || currentFilter.entity != emptyFilter.entity)
+{
+    var condJson = JSON.stringify(emptyFilter);
+    result.string(condJson);
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/displayValueProcess.js b/entity/District_entity/entityfields/district_number/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..95a9d9d10972827b4d89b9f4ad7aa68161204049
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("Sql_lib");
+
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(districtNo.padStart(4, '0'));
diff --git a/entity/District_entity/entityfields/district_number/onValidation.js b/entity/District_entity/entityfields/district_number/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..33392435cc69fabaa74c0d64eb48848b90674fc6
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/onValidation.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("system.translate");
+import("Sql_lib");
+
+
+var localValue = vars.get("$local.value");
+var value = vars.get("$field.DISTRICT_NUMBER");
+var biggestDistrictNo = newSelect("MAX(DISTRICT_NUMBER)").from("DISTRICT").cell();
+
+if (localValue)
+{
+    if (Number(localValue) <= Number(biggestDistrictNo) && Number(localValue) != Number(value))
+    {
+        result.string(translate.withArguments("The district no has to be bigger than %0", [biggestDistrictNo]));
+    }
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number/valueProcess.js b/entity/District_entity/entityfields/district_number/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e307b09a5f62a6e669170e08eb49aac6f036fee
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+
+var returnableDistrictNo = null;
+var thisValue = vars.get("this.value");
+var previousDistrictNo  = newSelect("COUNT(*)").from("DISTRICT").cell();
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) 
+{
+    if (previousDistrictNo != Number(previousDistrictNo)+1 && !thisValue) 
+    {
+        returnableDistrictNo = Number(previousDistrictNo)+1;
+    } else{
+        
+    }
+}
+
+result.string(returnableDistrictNo);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33857cd9988203551e8ec559931de007c78e462f
--- /dev/null
+++ b/entity/District_entity/entityfields/district_number_fieldgroup/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+
+var districtNo = vars.get("$field.DISTRICT_NUMBER");
+
+result.string(translate.text("District No.:") + " " + districtNo.padStart(4, '0'));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_status/dropDownProcess.js b/entity/District_entity/entityfields/district_status/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..43063fe007d6d15d886c7cdd4bc624d7f2ddecf4
--- /dev/null
+++ b/entity/District_entity/entityfields/district_status/dropDownProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.translate");
+
+var selectableOptions = new Array();
+
+selectableOptions[0] = translate.text("Active");
+selectableOptions[1] = translate.text("Inactive");
+
+result.object(selectableOptions);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/district_status/valueProcess.js b/entity/District_entity/entityfields/district_status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..06be75dc391630efc92dffbff413d7b9fa2100ab
--- /dev/null
+++ b/entity/District_entity/entityfields/district_status/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+    result.string("0");
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d3d1d4b6cb94a84199fdc7783e0194a1a7255152
--- /dev/null
+++ b/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..289f9107d46f3fabb9daf28ea42318b124ba98ea
--- /dev/null
+++ b/entity/District_entity/entityfields/districtsbycontactid_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("$$$###ignore_param###$$$");//dummy value, for special treatment in the conditionProcess
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e43ccb56de5d1eec96b494b8780ed76fee0a034
--- /dev/null
+++ b/entity/District_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DISTRICTID"));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a6858d63bdfcd7a5877551916d5725825758863
--- /dev/null
+++ b/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DISTRICT");
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/iso3/displayValueProcess.js b/entity/District_entity/entityfields/iso3/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d951329b1376a125deb9c072c0d0f8f76a5cc328
--- /dev/null
+++ b/entity/District_entity/entityfields/iso3/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("Context_lib");
+import("system.vars");
+import("system.result");
+
+result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.ISO3")));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ca4bf12840a2f9193816b3411c4f55bf41662fc
--- /dev/null
+++ b/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(JSON.stringify(JSON.parse(vars.get("$field.appliedFilter")).filter));
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..07a7c92ba405f856fdf699a7dbfa94a512025ac7
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("Context_lib");
+import("system.vars");
+import("system.result");
+
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+var parentDistrictName = ContextUtils.loadContentTitle("District_entity", parentDistrictId);
+
+result.string(parentDistrictName);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbd0a18395ba576ce8b33e4064dc211a92becd04
--- /dev/null
+++ b/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+var uid = vars.get("$field.DISTRICTID");
+var res = JSON.stringify([uid]);
+result.string(res);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentfilter/stateProcess.js b/entity/District_entity/entityfields/parentfilter/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8368fb6d4da5006d6e2ab9045d62360c81497f6
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (!vars.get("$field.parentFilter") || !vars.get("$field.PARENTDISTRICT_DISTRICTID"))
+    result.string(neon.COMPONENTSTATE_DISABLED);
+else
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/parentfilter/valueProcess.js b/entity/District_entity/entityfields/parentfilter/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1c0dfd89d6d147325bc77eb3fe1e1b452c6793e
--- /dev/null
+++ b/entity/District_entity/entityfields/parentfilter/valueProcess.js
@@ -0,0 +1,64 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+var res = "";
+var parentDistrictId = vars.get("$field.PARENTDISTRICT_DISTRICTID");
+
+if (parentDistrictId)
+{
+    var completeParentFilter = _getParentFilter(parentDistrictId, null);
+    completeParentFilter.entity = "Organisation_entity";
+    res = completeParentFilter;
+}
+else
+{
+    var entity = "Organisation_entity";
+    var emptyFilter = {
+        entity: entity, 
+        filter: {
+            type: "group", 
+            operator: "AND", 
+            childs: []
+        }
+    };
+    
+    res = emptyFilter;
+}
+    
+result.string(JSON.stringify(res));
+
+
+function _getParentFilter(pParentDistrictId, pPreviousFilter)
+{
+    var resFilter;
+    
+    if (pPreviousFilter != null)
+    {
+        resFilter = pPreviousFilter;
+    } 
+
+    if (pParentDistrictId)
+    {
+        var parentDistrictFilter, grandParentDistrict;
+        [parentDistrictFilter, grandParentDistrict] = newSelect(["DISTRICT.DISTRICT_FILTER", "DISTRICT.PARENTDISTRICT_DISTRICTID"])
+                                                            .from("DISTRICT")
+                                                            .where("DISTRICT.DISTRICTID", pParentDistrictId)
+                                                            .arrayRow();
+
+        parentDistrictFilter = JSON.parse(parentDistrictFilter);
+
+        if (pPreviousFilter)
+            parentDistrictFilter.filter.childs.push(resFilter.filter);//todo: kommentar ergänzen was wir heir eigentlcih machen
+        
+        resFilter = parentDistrictFilter;
+
+        if (grandParentDistrict.length > 0)
+        {   
+            resFilter = _getParentFilter(grandParentDistrict, resFilter);
+        }
+    }
+
+    return resFilter;
+}
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/responsibledistricts/documentation.adoc b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3ce26873409a61e01181493f161e5121ff15e78c
--- /dev/null
+++ b/entity/District_entity/entityfields/responsibledistricts/documentation.adoc
@@ -0,0 +1,3 @@
+= District_entity - ResponsibleDistricts
+
+Provider for the person entity, used to display the responsible districts in the person main view.
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/totalturnover/valueProcess.js b/entity/District_entity/entityfields/totalturnover/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40d9732b34a8c3e73b89f860524abb9f55fd77ef
--- /dev/null
+++ b/entity/District_entity/entityfields/totalturnover/valueProcess.js
@@ -0,0 +1,35 @@
+import("system.text");
+import("Sql_lib");
+import("system.SQLTYPES");
+import("Date_lib");
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.entities");
+import("system.neon");
+import("system.db");
+
+var districtTurnover;
+var appliedFilter = vars.get("$field.DISTRICT_FILTER");
+if (appliedFilter)
+{
+    appliedFilter = JSON.parse(appliedFilter).filter;
+    appliedFilter = JSON.stringify(appliedFilter);
+
+    districtTurnover = newSelect("sum(NET)")
+        .from("SALESORDER")
+        .join("CONTACT", "CONTACT.CONTACTID = SALESORDER.CONTACT_ID")
+        .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
+        .where(db.toFilterCondition(appliedFilter, "Organisation_entity"))
+        //.and("SALESORDER.SALESORDERDATE", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
+        .cell();
+}
+
+if (districtTurnover)
+    districtTurnover = text.formatDouble(districtTurnover, "#,##0.00", true);
+else
+    districtTurnover = "0";
+
+result.string(districtTurnover);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_edit/valueProcess.js b/entity/District_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a55cb327464d6def9b94735913c25ffb5e4328ef
--- /dev/null
+++ b/entity/District_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/user_new/valueProcess.js b/entity/District_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1411b9ac93e217a76a876371a2609ff9464f4997
--- /dev/null
+++ b/entity/District_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+var currentUser = null;
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    currentUser = vars.get("$sys.user");
+}
+
+result.string(currentUser);
\ No newline at end of file
diff --git a/entity/District_entity/entityfields/validparentdistricts/documentation.adoc b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6882425fd29087db57588d866d85d4d10963d838
--- /dev/null
+++ b/entity/District_entity/entityfields/validparentdistricts/documentation.adoc
@@ -0,0 +1 @@
+Provides a list of districts that can be set as parent district for one specific district entry.
\ No newline at end of file
diff --git a/entity/District_entity/iconIdProcess.js b/entity/District_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0e2f3aee79df633566818ff042f326b00f4ecdd
--- /dev/null
+++ b/entity/District_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.DISTRICT_NAME")).trim());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/cacheKeyProcess.js b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5c69b8e25a7c6b1288aa4eaad221a6621ed5860
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,5 @@
+import("CachedRecordContainer_lib");
+import("system.result");
+
+var cacheKey = CachedRecordContainerUtils.getCommonKey("$param.DistrictsByContactId_param", "$param.ExcludedDistrictIds_param");
+result.string(cacheKey);
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8329757ab9cf0a152de9c68fc67fcb16ffcb921e
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,36 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
+var cond = newWhere();
+if (onlyResponsibleParam)
+{
+    //dummy value, if the dummy value is here, we can safely ignore that param, otherwise we need to filter the district list
+    if (onlyResponsibleParam != "$$$###ignore_param###$$$")
+    {
+        var responsibleDistricts = newSelect("DISTRICTRESPONSIBLE.DISTRICT_ID")
+                                        .from("DISTRICTRESPONSIBLE")
+                                        .where("DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID", onlyResponsibleParam)
+                                        .arrayColumn();
+
+        cond.and("DISTRICT.DISTRICTID", responsibleDistricts, SqlBuilder.IN());
+    }
+}
+else
+{
+    //this will happen if the param was specified but is empty. This happen when you use the  consumer "ResponsibleDistricts" because the 
+    //parameter "DistrictsByContactId_param" is mandatory in that case. If the value is empty we must not return any data because we would see all
+    //districts otherwise
+    cond.and("1 = 2");
+}
+
+
+var excludedDistrictIds = vars.get("$param.ExcludedDistrictIds_param");
+if (excludedDistrictIds) 
+{
+    excludedDistrictIds = JSON.parse(excludedDistrictIds);
+    cond.andIfSet("DISTRICT.DISTRICTID", excludedDistrictIds, SqlBuilder.NOT_IN());
+}
+
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/District_entity/recordcontainers/db/orderClauseProcess.js b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8eecff7ca3cc3956505cd3d2e40b072c3af92f33
--- /dev/null
+++ b/entity/District_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"DISTRICT_NUMBER" : db.ASCENDING});
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index dcd594f7b7c43b34d5944e8a70c59da2b27c07db..e848d6cbed30ee763ef247d2b50de2b6a9fcd166 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -67,6 +67,7 @@
     <entityProvider>
       <name>Links</name>
       <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+      <documentation>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7a84ce185cef34897e1edccd8a13474f484256e6
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateLink_entity - Links
+
+needed instead of the #PROVIDER so the DocumentId_param and Type_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 3164b4edae344f4f2c0994729c8dc10691c78e52..3e77638a51c83f4a8c4826e1659f807b55198c97 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -47,6 +47,7 @@
     </entityConsumer>
     <entityProvider>
       <name>DocumentTemplatePlaceOfUse</name>
+      <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
@@ -59,6 +60,7 @@
         <entityParameter>
           <name>DocumentTemplatePlaceOfUse_param</name>
           <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+          <documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc</documentation>
         </entityParameter>
       </children>
     </entityProvider>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..01180d3457f67a1830bbbd0b35bfb3e6fa79fcf4
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so the DocumentTemplatePlaceOfUse_param can be used to specify the place of use
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fb626b8cd69b684823914118c7aa1513dbc40277
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplatePlaceOfUse_entity - DocumentTemplatePlaceOfUse
+
+needed instead of the #PROVIDER so DocumentTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index b70fb4f0646479d16876b8b0608644cc8d70319f..bea4c1751d8494da143d1330f839615910e4cba6 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -30,6 +30,7 @@
     <entityProvider>
       <name>ByCategory</name>
       <lookupIdfield>KEYID</lookupIdfield>
+      <documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3b14b668f8cb5c519c04fb13e0189cbcc1696ff2
--- /dev/null
+++ b/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplateTypeCategory_entity - ByCategory
+
+needed instead of the #PROVIDER so the usageFilter_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 1c1eb5c7b7cee487ce270006fa4d25f253791327..9cf1d9cca301bb4240acea90684327824bbd201d 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -193,6 +193,7 @@
       <name>Attachments</name>
       <targetContextField>TARGET_CONTEXT</targetContextField>
       <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+      <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
       <titlePlural>Attachments</titlePlural>
       <recordContainer>db</recordContainer>
       <dependencies>
@@ -232,6 +233,7 @@
     </entityParameter>
     <entityProvider>
       <name>DocumentTemplateProvider</name>
+      <documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
@@ -318,6 +320,7 @@
     </entityField>
     <entityConsumer>
       <name>DocumentTemplatePlaceOfUse</name>
+      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
@@ -419,6 +422,16 @@
           <expression>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fffc7bdb9141b4afad4836cebb0c2069dc0d3808
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - Attachments
+
+needed instead of the #PROVIDER so the DocumentTemplateType_param can be used
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b9e05bf63ab81c2202b2a0f10b8389985df01f3
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js
@@ -0,0 +1,10 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+
+if (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$textModular())
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+else 
+    result.string(neon.COMPONENTSTATE_EDITABLE);
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..6b0863e66ea80bb4e10cd56762dcbbf7bb3e93be
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc
@@ -0,0 +1,3 @@
+= DocumentTemplate_entity - DocumentTemplateProvider
+
+Provides the docTemplates to all the entities that need them using the comingFrom_param to specify which ones to display
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index 40ced6b7b961dd5616239ee3a8b8ff92f0f7932f..35836fe0a8792eac113906b90ac2e1ecd8b9e57a 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -15,4 +15,4 @@ if(vars.get("$param.ComingFrom_param"))
         .and("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID = DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID"), SqlBuilder.EXISTS());
 }
 
-result.string(cond);
\ No newline at end of file
+result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c3deb28e584154a76101902faaebb110e2c5d7d8
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97692e13aa5f4ed03bcb9bccd4ac3b5b11872be4
--- /dev/null
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("Favorites_lib");
+import("system.result");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index f37fc7d02a7905f55670a648cd231fb68d5b7454..420157a37135f2b6b3fd1105810584e32ac6935e 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -57,7 +57,8 @@
       <name>BINDATA_UPLOAD</name>
       <title>File</title>
       <contentType>FILE</contentType>
-      <mandatory v="true" />
+      <mandatory v="false" />
+      <mandatoryProcess>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/mandatoryProcess.js</mandatoryProcess>
       <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -110,6 +111,7 @@
     <entityField>
       <name>KEYWORD</name>
       <title>Keyword</title>
+      <state>INVISIBLE</state>
     </entityField>
     <entityField>
       <name>ICON</name>
@@ -227,6 +229,18 @@
           <fieldName>Documents</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>b7b14281-6e78-4005-ad5b-14dffc4091f5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e6553781-e306-4335-a929-2c2a8ad8270f</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Documents</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -326,6 +340,7 @@
     </entityProvider>
     <entityParameter>
       <name>DisallowCreate_param</name>
+      <valueProcess>%aditoprj%/entity/Document_entity/entityfields/disallowcreate_param/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
     <entityProvider>
@@ -347,7 +362,7 @@
         <entityParameter>
           <name>DisallowCreate_param</name>
           <valueProcess>%aditoprj%/entity/Document_entity/entityfields/singledocument/children/disallowcreate_param/valueProcess.js</valueProcess>
-          <expose v="false" />
+          <expose v="true" />
         </entityParameter>
       </children>
     </entityProvider>
diff --git a/entity/Document_entity/entityfields/bindata_upload/mandatoryProcess.js b/entity/Document_entity/entityfields/bindata_upload/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b10455db373f6515f4045f5c7095c39eecdc778
--- /dev/null
+++ b/entity/Document_entity/entityfields/bindata_upload/mandatoryProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string("true");
+else
+    result.string("false");
diff --git a/entity/Document_entity/entityfields/disallowcreate_param/valueProcess.js b/entity/Document_entity/entityfields/disallowcreate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/Document_entity/entityfields/disallowcreate_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/Document_entity/grantCreateProcess.js b/entity/Document_entity/grantCreateProcess.js
index e6afa18182c33b9e62b1967a1f6d857c2bcee556..d8e043b37dd0e2c70fd856da2e52f126568b59c2 100644
--- a/entity/Document_entity/grantCreateProcess.js
+++ b/entity/Document_entity/grantCreateProcess.js
@@ -1,4 +1,10 @@
 import("system.vars");
 import("system.result");
 
-result.string(!vars.get("$param.DisallowCreate_param"));
\ No newline at end of file
+var disallow = vars.getString("$param.DisallowCreate_param");
+var res = false;
+
+if(disallow == "false")
+    res = true;
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index 6481d977a0fecc1703609e78251cd1f35cafd397..1d34f32095204dab4a658272f9725848ba444e1e 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -25,9 +25,11 @@ if(vars.exists("$param.AssignmentTable_param") &&
         metadata = db.getBinaryMetadata(assignmentTable, assignmentName || "", assignmentRowId, true, alias, keyword);    
 
     // Iterate through found binary data and populate result array    
-    for( var i = 0; i < metadata.length; i++) {
+    for( var i = 0; i < metadata.length; i++) 
+    {
+        var previewAvatar = metadata[i].preview || "VAADIN:FILE";
         documents.push( [metadata[i].id, metadata[i].filename, metadata[i].size, 
-            metadata[i].edit, metadata[i].preview, metadata[i].mimetype, 
+            metadata[i].edit, previewAvatar, metadata[i].mimetype, 
             metadata[i].description, metadata[i].keyword]);
     }
 
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
index b587b5faf51202eb06723ae25ddd47114b859384..3297b0d171e13e5fdf8358941a420a4d3d65ca35 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
@@ -2,7 +2,6 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>DuplicateScannerResultFieldConfig_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
   <recordContainer>recordContainer</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc b/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 98691a749008df38df0e10ef2a4ee335dc6ef49b..fb343c9aa35db6794cf56f61fb5920617e799a91 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -4,6 +4,9 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
   <title>Duplicate Configuration</title>
+  <grantCreate v="false" />
+  <grantCreateProcess>%aditoprj%/entity/DuplicateScanner_entity/grantCreateProcess.js</grantCreateProcess>
+  <grantDelete v="false" />
   <iconId>VAADIN:COG_O</iconId>
   <titlePlural>Configurations</titlePlural>
   <recordContainer>DBRecordContainer</recordContainer>
@@ -85,6 +88,7 @@
     </entityConsumer>
     <entityActionGroup>
       <name>RunActionGroup</name>
+      <documentation>%aditoprj%/entity/DuplicateScanner_entity/entityfields/runactiongroup/documentation.adoc</documentation>
       <children>
         <entityActionField>
           <name>RebuildPersonDuplicatesCache</name>
diff --git a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js
index c2cbeb99e914c73462ec650c62f81d53b2c38ca9..e391b4c1938da96eddca596f8fb2211dd3d681ab 100644
--- a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js
@@ -4,15 +4,15 @@ import("DuplicateScanner_lib");
 
 var filterName = "OrganisationDuplicates";
 var targetEntity = "Organisation_entity";
-var recordBlockSize = DuplicateScannerUtils.GetBlockSize();
+var recordBlockSize = DuplicateScannerUtils.getBlockSize();
 
 logging.log(filterName + ": Delete duplicates -> ");
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 
 logging.log(filterName + ": Recalculate duplicates -> ");
-DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
+DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
 
 logging.log(filterName + ": Refresh unrelated duplicates -> ");
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 logging.log(filterName + ": Done rebuilding ");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
index b6784969140d271193f7627ddd01f04c20743b53..cad8736382338846edff77ef164f85488513731d 100644
--- a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
@@ -4,15 +4,15 @@ import("DuplicateScanner_lib");
 
 var filterName = "PersonDuplicates";
 var targetEntity = "Person_entity";
-var recordBlockSize = DuplicateScannerUtils.GetBlockSize();
+var recordBlockSize = DuplicateScannerUtils.getBlockSize();
 
 logging.log(filterName + ": Delete duplicates -> ");
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 
 logging.log(filterName + ": Recalculate duplicates -> ");
-DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
+DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
 
 logging.log(filterName + ": Refresh unrelated duplicates -> ");
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 logging.log(filterName + ": Done rebuilding ");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/runactiongroup/documentation.adoc b/entity/DuplicateScanner_entity/entityfields/runactiongroup/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f998dfcc78c6497f121cd16b294c8d01e6e1c1c7
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/runactiongroup/documentation.adoc
@@ -0,0 +1 @@
+Since duplicate caching is disabled there is no need  to show this action group within views at the moment.
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/testactiongroup/children/testduplicatescanner/onActionProcess.js b/entity/DuplicateScanner_entity/entityfields/testactiongroup/children/testduplicatescanner/onActionProcess.js
index 17f12757ab0cdc5c3716dcba225747fb694ccbb9..af7cd56a2472c2305bf914b22fc59c89a7ba03a8 100644
--- a/entity/DuplicateScanner_entity/entityfields/testactiongroup/children/testduplicatescanner/onActionProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/testactiongroup/children/testduplicatescanner/onActionProcess.js
@@ -162,13 +162,13 @@ import("JditoFilter_lib");
 //var tmpFieldsInFilterRay = ["CONTACTID", "FIRSTNAME", "LASTNAME", "GENDER"];
 //
 //logging.log("Löschen von PERSON Dubletten -> ");
-//DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity("Person_entity");
+//DuplicateScannerUtils.deleteClustersByTargetEntity("Person_entity");
 //
 //logging.log("Neu berechnen von PERSON Dubletten -> ");
-//DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
+//DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
 //tmpFieldsInFilterRay, resultFieldsIdFieldName);
 //
-//DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+//DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 //##############################################################################
 
@@ -182,13 +182,13 @@ import("JditoFilter_lib");
 //
 //
 //logging.log("Löschen von ORGANISATION Dubletten -> ");
-//DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity)
+//DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity)
 //
 //logging.log("Neu berechnen von ORGANISATION Dubletten -> ");
-//DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
+//DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, queryPersonContactIds,
 //tmpFieldsInFilterRay, resultFieldsIdFieldName);
 //
-//DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+//DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 
 //####################################Rebuild person duplicates##########################################
@@ -197,7 +197,7 @@ import("JditoFilter_lib");
 //var targetEntity = "Person_entity";
 //
 //let duplicateFieldsConfig = DuplicateScannerUtils.LoadIndexFieldsConfiguration(filterName, targetEntity);
-//let resultFields = DuplicateScannerUtils.LoadResultFields(filterName, targetEntity);
+//let resultFields = DuplicateScannerUtils.getResultFields(filterName, targetEntity);
 //
 //logging.log("duplicateFieldsConfig -> " + duplicateFieldsConfig);
 //logging.log("resultFields -> " + resultFields);
@@ -210,11 +210,11 @@ import("JditoFilter_lib");
 //                            + " left join ADDRESS on ADDRESS.CONTACT_ID = CONTACT.CONTACTID";
 //
 //logging.log("Löschen von PERSON Dubletten -> ");
-//DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+//DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 //
 //let formatToJsonAndCallWsCallback = function(pPossibleDuplicatesRay)
 //{
-//    let indexResultFields = DuplicateScannerUtils.TranslateEntityToIndexFields(targetEntity, resultFields)
+//    let indexResultFields = DuplicateScannerUtils.translateEntityToIndexFields(targetEntity, resultFields)
 //
 //    //Run thru every duplicate result an read out the resultfields
 //    for (let i = 0; i < pPossibleDuplicatesRay.length; i++)
@@ -233,10 +233,10 @@ import("JditoFilter_lib");
 //};
 //
 //logging.log("Neu berechnen von PERSON Dubletten -> ");
-//DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, queryPersonFieldData,
+//DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, queryPersonFieldData,
 //duplicateFieldsConfig, resultFields, formatToJsonAndCallWsCallback);
 //
-//DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+//DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 
 
@@ -255,7 +255,7 @@ import("JditoFilter_lib");
 //valuesToCheck["GENDER"] = "m                                   ";
 //
 ////The result values can be accessed as seen above in "formatToJsonAndCallWsCallback"
-//let pPossibleDuplicatesRay = DuplicateScannerUtils.ScanForDuplicates(filterName, targetEntity, valuesToCheck, null);
+//let pPossibleDuplicatesRay = DuplicateScannerUtils.scanForDuplicates(filterName, targetEntity, valuesToCheck, null);
 //
 //logging.log(" pPossibleDuplicatesRay-> " + pPossibleDuplicatesRay);
 //
@@ -329,7 +329,7 @@ import("JditoFilter_lib");
 //
 //var filterName = "PersonDuplicates";
 //var targetEntity = "Person_entity";
-//DuplicateScannerUtils.LoadEntityRecords(targetEntity, entityFieldsToLoad, 0, 50);
+//DuplicateScannerUtils.getEntityRecords(targetEntity, entityFieldsToLoad, 0, 50);
 
 //Beispiel 1: 
 //Feld mit verknüpftem Consumer
diff --git a/entity/DuplicateScanner_entity/grantCreateProcess.js b/entity/DuplicateScanner_entity/grantCreateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..333152c51c6634537f937e0687a90294620c7de5
--- /dev/null
+++ b/entity/DuplicateScanner_entity/grantCreateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+
+//While it is absolutely legal to add more configurations for other entities we do not want to enable the option for the user for security reasons.
+//This is no problem because if other entities want to implement duplicate recogniition it is required to customize the system anyway, and when 
+//this is done the developer can insert the duplicate scanner record.
+result.string(false);
\ No newline at end of file
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index a0a699a39cb8e3d8d48a33d34ef6fd01e0cbf0d4..54ee932a3235f4e127feeb5112c9c11e3e7f2e47 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -112,7 +112,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Person_entity</entityName>
-        <fieldName>Contacts</fieldName>
+        <fieldName>NonselfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -189,7 +189,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
-        <fieldName>Organisations</fieldName>
+        <fieldName>NonselfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Duplicates_entity/entityfields/duplicateclusteractiongroup/children/ignorewholecluster/onActionProcess.js b/entity/Duplicates_entity/entityfields/duplicateclusteractiongroup/children/ignorewholecluster/onActionProcess.js
index 115c4e363f0a3f4a29c3d1a66070d3f10695418b..77822dbca0461d5ffccc31af058b9a5750002a4b 100644
--- a/entity/Duplicates_entity/entityfields/duplicateclusteractiongroup/children/ignorewholecluster/onActionProcess.js
+++ b/entity/Duplicates_entity/entityfields/duplicateclusteractiongroup/children/ignorewholecluster/onActionProcess.js
@@ -6,14 +6,14 @@ import("system.notification");
 
 let clusterId = vars.get("$sys.selection");
 
-let duplicateContactIdsInClusterRay = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterId)
+let duplicateContactIdsInClusterRay = DuplicateScannerUtils.getCachedDuplicatesForClusterId(clusterId)
 
 if(duplicateContactIdsInClusterRay.length > 1)
 {
     let referenceDuplicateId = duplicateContactIdsInClusterRay[0];
     for (let i = 1; i < duplicateContactIdsInClusterRay.length; i++) 
     {
-        DuplicateScannerUtils.CreateUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
+        DuplicateScannerUtils.createUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
     }
     //notification.createConfig().notificationType(notification.t)
     //neon.refresh(["$field.SelfPersonDuplicatesConsumer"])
diff --git a/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js b/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js
index 918a8f2f261a9ef25d0bb505af621a245bb5862e..ecb8c518cd40068c5e36606b64c83765a69962f6 100644
--- a/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js
+++ b/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js
@@ -5,7 +5,7 @@ import("DuplicateScanner_lib");
 
 let clusterRecordId = vars.get("$field.UID");
 
-let contactIdsInCluster = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterRecordId);
+let contactIdsInCluster = DuplicateScannerUtils.getCachedDuplicatesForClusterId(clusterRecordId);
 
 /*
  * To achieve that if there are no duplicates, no contacts should be shown and therefore returned by the 
diff --git a/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/onlyshowcontactids_param/valueProcess.js b/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/onlyshowcontactids_param/valueProcess.js
index 918a8f2f261a9ef25d0bb505af621a245bb5862e..ecb8c518cd40068c5e36606b64c83765a69962f6 100644
--- a/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/onlyshowcontactids_param/valueProcess.js
+++ b/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/onlyshowcontactids_param/valueProcess.js
@@ -5,7 +5,7 @@ import("DuplicateScanner_lib");
 
 let clusterRecordId = vars.get("$field.UID");
 
-let contactIdsInCluster = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterRecordId);
+let contactIdsInCluster = DuplicateScannerUtils.getCachedDuplicatesForClusterId(clusterRecordId);
 
 /*
  * To achieve that if there are no duplicates, no contacts should be shown and therefore returned by the 
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 3ca3d9550cb54a9e2c7980ef006076bb04ce7d1e..3fae2a234bd2ebccb4ee178dd4c55cbdbacfb054 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -43,6 +43,10 @@
           <name>ComingFrom_param</name>
           <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>DocumentTemplateTypeClassification_param</name>
+          <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityParameter>
@@ -129,15 +133,22 @@
       <expose v="true" />
     </entityParameter>
     <entityParameter>
-      <name>OfferId_param</name>
+      <name>UpdateStatements_param</name>
       <expose v="true" />
-      <mandatory v="true" />
-      <documentation>%aditoprj%/entity/Email_entity/entityfields/offerid_param/documentation.adoc</documentation>
     </entityParameter>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>documenttemplatetypeclassification</name>
+      <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>DocumentTemplateTypeClassification_param</name>
+      <expose v="true" />
+      <description></description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/Email_entity/entityfields/comingfrom/valueProcess.js b/entity/Email_entity/entityfields/comingfrom/valueProcess.js
index e1559e60a161a0cc6323ece8b28b23741043a814..534410568e17af797c3ebace69df84e559fb35c7 100644
--- a/entity/Email_entity/entityfields/comingfrom/valueProcess.js
+++ b/entity/Email_entity/entityfields/comingfrom/valueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 
 if(vars.get("$param.ComingFrom_param"))
-result.string(vars.get("$param.ComingFrom_param"));
\ No newline at end of file
+    result.string(vars.get("$param.ComingFrom_param"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ee6655bbafe8bd5e3b1bf5f575de8d793b947cc
--- /dev/null
+++ b/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.documenttemplatetypeclassification"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js b/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e3fc1ddf974f7cee9f02154b923ed44d710f781
--- /dev/null
+++ b/entity/Email_entity/entityfields/documenttemplatetypeclassification/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.DocumentTemplateTypeClassification_param"))
+    result.string(vars.get("$param.DocumentTemplateTypeClassification_param"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/offerid_param/documentation.adoc b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
deleted file mode 100644
index cc60a8f815575f3ed65faa6cc6634e6878b173c6..0000000000000000000000000000000000000000
--- a/entity/Email_entity/entityfields/offerid_param/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-=OfferId_pram
-
-optional param needed for the offerEmails, to change the status of the offer
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/recipient/valueProcess.js b/entity/Email_entity/entityfields/recipient/valueProcess.js
index 28712f38d11117f0241a65aa12bac0cd0f7e89f9..0b715605584a88bb3436e29a08fc69651eb5efc8 100644
--- a/entity/Email_entity/entityfields/recipient/valueProcess.js
+++ b/entity/Email_entity/entityfields/recipient/valueProcess.js
@@ -10,7 +10,7 @@ if (vars.get("$this.value") == null)
     else if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
         result.string(CommUtil.getStandardMail(vars.get("$param.ContactId_param")));
 }
-else if (!vars.get("$field.RECIPIENT").includes("@"))
+else if (!vars.get("$this.value").includes("@") && vars.get("$this.value") != "")
     result.string(newSelect("ADDR")
                         .from("COMMUNICATION")
                         .where("COMMUNICATION.COMMUNICATIONID", vars.get("$this.value")).cell());
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
index 74810743f42a7d88c0dfd8989917e0603864ba98..0ee0af9d3e78ea7027cafebd667d54814c15e43c 100644
--- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
@@ -1,14 +1,15 @@
-import("KeywordRegistry_basic");
-import("Sql_lib");
-import("system.translate");
-import("ActivityTask_lib");
+import("system.db");
 import("system.neon");
-import("Employee_lib");
 import("system.vars");
+import("system.question");
+import("system.translate");
+import("Sql_lib");
 import("Email_lib");
 import("Contact_lib");
 import("Document_lib");
-import("system.question");
+import("Employee_lib");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
 
 var attachments = JSON.parse(vars.get("$param.Attachments_param"));
 var senderContactId = vars.get("$param.ContactId_param");
@@ -17,9 +18,10 @@ var emailFilename = vars.get("$param.EmailFilename");
 var notificationMsg = vars.get("$param.NotificationMsg_param");
 var notificationTitle = translate.text("Offer status changed");
 var subject = vars.get("$field.subject");
-
+var updateStatements = JSON.parse(vars.get("$param.UpdateStatements_param"));
 var additionalPlaceholders = null;
-if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param"))
+
+if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.AdditionalPlaceholders_param") != "null" && vars.get("$param.AdditionalPlaceholders_param"))
 {
     additionalPlaceholders = JSON.parse(vars.get("$param.AdditionalPlaceholders_param")).map(function (placeholder)
     {
@@ -40,11 +42,10 @@ var eml = EmailWritingUtils.openMailTemplate(
     additionalPlaceholders
 );
 
-if(vars.get("$param.ComingFrom_param") == "Offer")
+if(updateStatements)
 {
-    newWhere("OFFER.OFFERID", vars.get("$param.OfferId_param"))
-    .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
+    db.updates(updateStatements);
 }
 
 if (notificationMsg)
-    question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
\ No newline at end of file
+    question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index a25038afe35cf38b4a02c7766ef82f363cb07a0d..8bf5d69b2368ae1236e0d8eedd86745dbfa9927f 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/EmployeeRole_entity/documentation.adoc</documentation>
   <title>Role</title>
+  <grantUpdate v="false" />
   <titlePlural>Roles</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
diff --git a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
index bbf5094fbccb4af558c2c7bcecf8aab2d18f9034..e01abb5791339a870c4957c702d1b55144f5ba9e 100644
--- a/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js
@@ -1,10 +1,17 @@
+import("Employee_lib");
 import("system.neon");
 import("system.tools");
 import("system.vars");
 import("system.result");
 
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var excludeRolesArray = ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
+var excludeRolesArray = EmployeeRole.getExcludeRoles();
+
+for each (let role in tools.getAllRoles()) {
+    if (role[4] == "false") {
+        excludeRolesArray.push(role[3]);
+    }
+}
 
 if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW && userTitle)
     excludeRolesArray = excludeRolesArray.concat(tools.getRoles(userTitle));
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index 4c099db5f38308fc0002a7da6d9a9722f7735092..dd75cc33f86c2b062631ed65b17a701a7ae79d31 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("Employee_lib");
 import("Util_lib");
 import("system.result");
 import("system.vars");
@@ -6,6 +7,8 @@ import("system.tools");
 var roles = [];
 var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
 var allRoles = tools.getAllRoles();
+let exclude = EmployeeRole.getExcludeRoles();
+
 
 if (userTitle && tools.existUsers(userTitle))
 {
@@ -14,11 +17,14 @@ if (userTitle && tools.existUsers(userTitle))
     {
         if (!this[role] && role != "INTERNAL_EVERYONE")
         {
+            let context = "Role"
             var roleTitle = role;
             if (role in allRoles)
                 roleTitle = allRoles[role][0];
+            if (exclude.indexOf("role") > -1)
+                context = "";
             
-            roles.push([role, role, roleTitle, "Role"]);
+            roles.push([role, role, roleTitle, context]);
             this[role] = true;
         }  
     }, existsObj);
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index afac629c0418a4e61f3d0ac64a38c7f3a09a1bf2..60ea8401f68c771715b123bb20d125584e78a98f 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -262,6 +262,12 @@
           <fieldName>Leadimport_Empl</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>e9a775ab-e63d-493d-94dc-6b27dfb77173</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>Employees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -384,6 +390,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>DepartmentAttrIdByEmployeeContactId_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 51ae4c0b8c8a4be97d9f6e6f54a3f27dc96b780b..e010ab9f6c122d2c7ece42f3c17cad5eb4ddae91 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -32,6 +32,7 @@
     </entityField>
     <entityProvider>
       <name>ExportTemplateFields</name>
+      <documentation>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>b111615c-cde3-46b7-b229-46cc2db004fd</name>
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..745d56fde373f290372fd75042424ade60202760
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc
@@ -0,0 +1,3 @@
+= ExoirtTemplateField_entity - ExportTemplateFields
+
+needed instead of the #PROVIDER so the ExportTemplateField_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index dec30f9107ac2bbf5883b62154be4add848d3e19..0dc5e1fc3a6ba07fa7a4b83bf0525011d9a81f57 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -55,6 +55,7 @@
     </entityParameter>
     <entityProvider>
       <name>ExportTemplatePlaceOfUser</name>
+      <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9713220ef692ca2f93ca9047460db28270795e3c
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplatePlaceOfUse_entity - ExportTemplatePlaceOfUser
+
+needed instead of the #PROVIDER so the ExportTemplatePlaceOfUse_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
index a650684a24f84809d4c90a99d7d0f48eeda908f9..32d6b097f8e521ebb2aaa33aca37964ac69c7f5c 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js
@@ -1,8 +1,8 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
-var selection = vars.getString("$field.selection");
+var selection = vars.get("$field.selection");
 
 if(selection)
     result.string(JSON.parse(selection).length);
diff --git a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
index 3d860b7c277b9a22885f01c55d0f714161e7698b..4d89e193e37d0436af60a01739968727fe2bfcd3 100644
--- a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
+++ b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
@@ -1,19 +1,18 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
-var selection = JSON.parse(vars.getString("$param.selectedData_param"));
+var contactIds = JSON.parse(vars.getString("$param.selectedData_param"));
 var comingfrom = vars.getString("$param.comingFrom_param");
-var contactIds;
 
 
-if(!Array.isArray(selection)) //if selection is an array, data has been selected
+if(!Array.isArray(contactIds)) //if selection is an array, data has been selected
 {
-    var condition = selection.condition;
+    var condition = contactIds.condition;
     if(comingfrom == "Organisation")
-        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
+        contactIds = FilterViewActionUtils.organisationIdsFilter(condition);
     else if (comingfrom == "Person")
-        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
+        contactIds = FilterViewActionUtils.contactIdsFilter(condition);
 }
 result.string(JSON.stringify(contactIds));
 
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index ff7e047785f8ce6c383ebd4ec8502f4ab194a194..a38388bbd5de723db021a3cb15d5d40cb1322e35 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -3,6 +3,7 @@
   <name>ExportTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
+  <icon>NEON:EXPORT</icon>
   <title>Export Template</title>
   <grantCreate v="true" />
   <grantUpdate v="true" />
@@ -108,6 +109,7 @@
     </entityConsumer>
     <entityProvider>
       <name>ExportTemplateIDs</name>
+      <documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -227,6 +229,16 @@
           <recordfield>EXPORTTEMPLATE.FIELDDELIMITER</recordfield>
         </dbRecordFieldMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2d3b77143cac4fd108022449985661a5ec655fe5
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc
@@ -0,0 +1,3 @@
+= ExportTemplate_entity - ExportTemplateIDs
+
+needed instead of the #PROVIDER so the comingFrom_param and ExportTemplateID_param can be used
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..27c569099821e96f51c9ab7e3e5c7a6db87d6e09
--- /dev/null
+++ b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("EXPORTTEMPLATE.EXPORTTEMPLATEID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97692e13aa5f4ed03bcb9bccd4ac3b5b11872be4
--- /dev/null
+++ b/entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("Favorites_lib");
+import("system.result");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 1ad0dce01d4ff015c4d431b334acbae56f804871..bb5ba3f508b3c517b43af5aa949aee70a4a19e76 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -102,7 +102,7 @@
       <filterExtensions>
         <filterExtension>
           <name>groupGroupNameExtension</name>
-          <title>Gruppenname</title>
+          <title>Groupname</title>
           <contentType>TEXT</contentType>
           <filterValuesProcess>%aditoprj%/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js</filterValuesProcess>
           <filtertype>BASIC</filtertype>
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
index 34c4eb2d23b39d90808d43aa548a082ab8990979..f8a6e1919db15f11b8913cd741da51ba6a20c580 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/filterextensions/groupgroupnameextension/filterValuesProcess.js
@@ -2,9 +2,6 @@ import("system.favorite");
 import("system.tools");
 import("system.result");
 import("Sql_lib");
-import("system.logging");
-
-logging.log("groupNameExtensionValuesProcess");
 
 var allTypes = [];
 
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index c3c160e699bd3f56c6d688d3a65b0b9c4e678dcf..cb5bb3fb6434c7a789b8d105cc18d40891bfd3f5 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -55,6 +55,7 @@
     </entityConsumer>
     <entityProvider>
       <name>LeadImportIds</name>
+      <documentation>%aditoprj%/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc</documentation>
       <titlePlural>Import Fields</titlePlural>
       <dependencies>
         <entityDependency>
diff --git a/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c3e81f687ccd1016a902170d69baddf5b0917d61
--- /dev/null
+++ b/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc
@@ -0,0 +1 @@
+Provides configured ImportFields for one specific lead import.
\ No newline at end of file
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index e4f1112d7f054bbbabda17db37f3cd4c7efdcc8f..81be338ad3887462424137b8445aaeef00347076 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -90,7 +90,6 @@
           <name>FilterAlreadyUsedByEntryId_param</name>
           <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
           <expose v="false" />
-          <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc</documentation>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 2d7eb1b4f14ab3e046d8ec7cbe51e4b26917b75c..ad9c6c66275b74b098addef8c4d4ed2ca621cb5c 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -583,6 +583,12 @@
           <fieldName>KeywordImportFields</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>2823f5a0-2b1d-41f4-abf1-3e7b332fa176</name>
+          <entityName>VisitRecommendation_entity</entityName>
+          <fieldName>KeywordVisitRecommendationSource</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 7387d818146c65d8ccc2640acde7c01c8fc9bf12..2afefb3f30bcad00355211100c7b648e58118ddf 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -31,6 +31,7 @@
     <entityProvider>
       <name>ISO3Name</name>
       <lookupIdfield>ISO3</lookupIdfield>
+      <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -87,6 +88,12 @@
           <fieldName>Languages</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>9ee48241-5d40-46e9-83ec-a1dc55fdb7d5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Languages</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -97,6 +104,8 @@
     </entityProvider>
     <entityProvider>
       <name>ISO3NameFiltered</name>
+      <lookupIdfield>ISO3</lookupIdfield>
+      <documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
@@ -127,6 +136,8 @@
       <alias>Data_alias</alias>
       <isPageable v="false" />
       <conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <cacheType>GLOBAL</cacheType>
+      <cacheKeyProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
       <linkInformation>
         <linkInformation>
           <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
diff --git a/entity/Language_entity/entityfields/iso3name/documentation.adoc b/entity/Language_entity/entityfields/iso3name/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ee01db23ea4a5c6e95611ab17a81ebf465438ee0
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3name/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+No filter apply.
\ No newline at end of file
diff --git a/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..da968d688544a606d6130b49b57137c497a37de5
--- /dev/null
+++ b/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc
@@ -0,0 +1,6 @@
+Provides a list of languages, where the UID is the three character ISO-code
+ISO 639-2; see: https://de.wikipedia.org/wiki/ISO_639#ISO_639-2
+
+For example: `deu` for _German_
+
+A filter for excluding languages by paramvalues is applied.
\ No newline at end of file
diff --git a/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..050f117ec1c89c3fbb29fe28161d61092b6a04b2
--- /dev/null
+++ b/entity/Language_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+//no locale in the key because the locale does not modify the result of the recordcontainer
+var res = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD(), "$param.ExcludedIds_param");
+result.string(res);
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index e3ab27e0a12c8b09990f1739ec1e11464248d700..da2f76e57b3a9489eba26332a54159fa4b4df186 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -22,14 +22,14 @@ _deleteData("COMMUNICATION", leadimportId, dateADayBefore);
 _deleteData("AB_ATTRIBUTERELATION", leadimportId, dateADayBefore);
 
 newWhere("LEADLOG.LEADIMPORT_ID", leadimportId)
-.and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEADLOG")
-.deleteData();
+    .and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEADLOG")
+    .deleteData();
 
 newWhere("LEAD.LEADIMPORT_ID", leadimportId)
-.and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEAD")
-.deleteData();
+    .and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEAD")
+    .deleteData();
 // Ändern des Status auf Created
 newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", ["Status"], null, [$KeywordRegistry.importStatus$created()]);
 
@@ -46,12 +46,15 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
 {
     let uTableName = pTableName.charAt(0);
     newWhere(pTableName + "." + pTableName + "ID", 
-        newSelect(uTableName + "." + pTableName + "ID")
-        .from(pTableName, uTableName)
-        .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
-        .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
-        .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
-        .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(), "# >= ?"), SqlBuilder.IN())
+        newSelect("TAB." + pTableName + "ID")
+        .from(
+            newSelect(uTableName + "." + pTableName + "ID")
+            .from(pTableName, uTableName)
+            .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
+            .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
+            .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
+            .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(),SqlBuilder.GREATER_OR_EQUAL())
+        , "TAB"), SqlBuilder.IN())
     .from(pTableName)
     .deleteData();
 }
\ No newline at end of file
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 7026c8106b6023ef68952b4209b26221fe7a4f54..6499fc00e002942363effcb7f67696ae5849e409 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -38,6 +38,7 @@
     </entityField>
     <entityProvider>
       <name>LogHistoryProvider</name>
+      <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
@@ -111,12 +112,25 @@
           <fieldName>LogHistories</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>fd46379e-f1be-4a9e-9914-4f3f81d96ad5</name>
+          <entityName>District_entity</entityName>
+          <fieldName>LogHistories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>e97b5f2d-d2e0-4539-96e9-e3f96107ffaa</name>
+          <entityName>DistrictResponsible_entity</entityName>
+          <fieldName>LogHistories</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityParameter>
       <name>tablenames_param</name>
       <expose v="true" />
       <mandatory v="true" />
+      <documentation>%aditoprj%/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
diff --git a/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2712d5d5c6d4ad5349fc4f6539190503d2efa92d
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc
@@ -0,0 +1,3 @@
+Generic provider for log history entries. 
+
+A filter for given _tablenames_ is applied, see the documentation of the parameters for an example.
\ No newline at end of file
diff --git a/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d0168dcdaf0b296ec9082b3d0cfbf39dfeaf5cc3
--- /dev/null
+++ b/entity/LogHistory_entity/entityfields/tablenames_param/documentation.adoc
@@ -0,0 +1,10 @@
+Tablenames have to be given as stringified object-arrays, see the following example:
+
+[source,javascript]
+----
+var res = [];
+res.push({id: vars.get("$field.CONTACTID"), tableNames: ["CONTACT", "COMMUNICATION", "ADDRESS", "AB_ATTRIBUTERELATION"]});
+res.push({id: vars.get("$field.ORGANISATIONID"), tableNames: ["ORGANISATION"]});
+//stringify because currently only strings  can be passed as parameter
+res = JSON.stringify(res);//this is an example for the parameter-value
+----
\ No newline at end of file
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 4e8d292267ea3d25bcba25ba03bfa77dbb7a140b..23a14e5ebe902ca5f5fcda22532dae26cc4b2c17 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -4,6 +4,8 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
   <title>${SALESPROJECT_MEMBER}</title>
+  <grantUpdateProcess>%aditoprj%/entity/Member_entity/grantUpdateProcess.js</grantUpdateProcess>
+  <grantDeleteProcess>%aditoprj%/entity/Member_entity/grantDeleteProcess.js</grantDeleteProcess>
   <iconId>VAADIN:FILE_SOUND</iconId>
   <titlePlural>${SALESPROJECT_MEMBER}</titlePlural>
   <recordContainer>db</recordContainer>
@@ -33,13 +35,14 @@
       <name>MEMBERROLE</name>
       <title>Role</title>
       <consumer>KeywordMemberRoles</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/memberrole/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>ORGANISATION_NAME</name>
       <title>Company</title>
-      <state>READONLY</state>
+      <groupable v="true" />
     </entityField>
     <entityField>
       <name>ORG_ORGID</name>
@@ -174,12 +177,6 @@
       <targetIdField>CONTACT_ID</targetIdField>
       <recordContainer>db</recordContainer>
       <dependencies>
-        <entityDependency>
-          <name>df6a9a25-f787-41f6-877b-c8e3cbbdc6be</name>
-          <entityName>Salesproject_entity</entityName>
-          <fieldName>Members</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
         <entityDependency>
           <name>efeb191c-dd03-46e1-b176-c4e0c2f75fc5</name>
           <entityName>Campaign_entity</entityName>
@@ -203,6 +200,26 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>WithDistrictResponsibles</name>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>6f90b6c6-118c-485e-9a41-365bdc325f9b</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>Members</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <documentation>%aditoprj%/entity/Member_entity/entityfields/uid/documentation.adoc</documentation>
+    </entityField>
+    <entityField>
+      <name>recordType</name>
+      <documentation>%aditoprj%/entity/Member_entity/entityfields/recordtype/documentation.adoc</documentation>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -323,7 +340,91 @@
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>recordType.value</name>
+          <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/recordtype.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isFilterable v="true" />
+      <contentProcess>%aditoprj%/entity/Member_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <onInsert>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+      <onDelete>%aditoprj%/entity/Member_entity/recordcontainers/jdito/onDelete.js</onDelete>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECTMEMBERID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>IMAGE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MEMBERROLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MEMBERROLE.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ORG_ORGID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_FIRSTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_FULL_NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_LASTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_PERSID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>POSITION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGETCONTEXT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>recordType.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+    </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Member_entity/documentation.adoc b/entity/Member_entity/documentation.adoc
index 575b84d32903889b91d1a3009ebb855326e46e28..3ad972dcc80a6711bad79f6c3c8c55590273aa13 100644
--- a/entity/Member_entity/documentation.adoc
+++ b/entity/Member_entity/documentation.adoc
@@ -1,3 +1,14 @@
 = Member_entity
 
-Manages the project team in the sales project and in the campaign
\ No newline at end of file
+Manages the project team in the sales project and in the campaign
+
+This entity has two recordContainers:
+
+* db
+* jdito
+
+While for the must purposes the `db`-recordContainer is perfectly fine to use there is one case necessary for the `jdito`-recordContainer:
+
+Salesproject memebers are loaded via the ``-provider and therefor use the `jdito`-recodContainer. This recordContainer first collects the data from
+the `db`-rc and then loads additional memebers of the salesprojects district. The additional members are not modifyable, while those from the
+`db`-rc are.
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/recordtype/documentation.adoc b/entity/Member_entity/entityfields/recordtype/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3120dc65c224da3a1bf92f80b3c2edce0dd21b27
--- /dev/null
+++ b/entity/Member_entity/entityfields/recordtype/documentation.adoc
@@ -0,0 +1 @@
+Field to differ between records from the OBJECTMEMBER-table and additional added district-members (only in the jdito-RecordContainer)
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/uid/documentation.adoc b/entity/Member_entity/entityfields/uid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4db4f5e24216d619048062e493f79e2bb919aa77
--- /dev/null
+++ b/entity/Member_entity/entityfields/uid/documentation.adoc
@@ -0,0 +1 @@
+Is only used by the jdito record container.
\ No newline at end of file
diff --git a/entity/Member_entity/grantDeleteProcess.js b/entity/Member_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a494c8292d24cb354b59766736f40833338c4526
--- /dev/null
+++ b/entity/Member_entity/grantDeleteProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var res = vars.get("$field.recordType") != "DistrictResponsible";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Member_entity/grantUpdateProcess.js b/entity/Member_entity/grantUpdateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a494c8292d24cb354b59766736f40833338c4526
--- /dev/null
+++ b/entity/Member_entity/grantUpdateProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var res = vars.get("$field.recordType") != "DistrictResponsible";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/recordtype.value/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/recordtype.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ecce98df0cb136a32d4a2bae26f18281788f00f7
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/db/recordfieldmappings/recordtype.value/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+//this value only differs in the jdito recordContainer
+result.string("'ObjectMember'");
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/jdito/contentProcess.js b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e4d4225eebe44cebd4e0d39c0acb38313d53162f
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,118 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("system.entities");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+var idValues = vars.get("$local.idvalues");
+var filter = vars.get("$local.filter");
+var memberLoadingConfig = entities.createConfigForLoadingRows()
+                                    .entity("Member_entity")
+                                    .provider("Links")
+                                    .addParameter("ObjectRowId_param", vars.get("$param.ObjectRowId_param"))
+                                    .addParameter("ObjectType_param", vars.get("$param.ObjectType_param"))
+                                    .fields(["#UID", "CONTACT_ID", "CONTACT_ID.displayValue", "CONTACTROLE", "DEPARTMENT", "ICON", "IMAGE", 
+                                                "MEMBERROLE", "MEMBERROLE.displayValue", "OBJECT_ROWID", "OBJECT_TYPE",
+                                                "OBJECTMEMBERID", "ORG_ORGID", "ORGANISATION_NAME", "PERSON_FIRSTNAME", "PERSON_FULL_NAME", 
+                                                "PERSON_LASTNAME", "PERSON_PERSID", "PERSON_SALUTATION", "PERSON_TITLE", "POSITION", "TARGETCONTEXT",
+                                                "recordType"]);
+
+if (idValues)
+{
+    memberLoadingConfig.uids(idValues);
+}
+
+if (filter && filter.filter != null)
+{
+    memberLoadingConfig.filter(JSON.stringify(filter.filter));
+}
+
+var memberRows = entities.getRows(memberLoadingConfig);
+
+if (vars.get("$param.ObjectType_param") == "Salesproject" && vars.get("$param.ObjectRowId_param") != null)
+{
+    var orgContactId = newSelect("SALESPROJECT.CONTACT_ID")
+                        .from("SALESPROJECT")
+                        .where("SALESPROJECT.SALESPROJECTID", "$param.ObjectRowId_param")
+                        .cell();
+    
+    var districtLoadingConfig = entities.createConfigForLoadingRows()
+                                            .entity("DistrictResponsible_entity")
+                                            .provider("OrganisationResponsibles")
+                                            .addParameter("OrgUid_param", orgContactId)
+                                            .fields(["#UID","DISTRICTRESPONSIBLEID", "DISTRICT_ID", "EMPLOYEE_CONTACT_ID", 
+                                                        "EMPLOYEE_CONTACT_ID.displayValue", "USER_EDIT", "USER_NEW", 
+                                                        "departmentAttributeName", "DATE_EDIT", "DATE_NEW"]);
+    
+    var districtRows = entities.getRows(districtLoadingConfig);
+    
+    
+    districtRows = districtRows.map(function(row)
+    {
+        return [row["#UID"], row["DISTRICTRESPONSIBLEID"], row["DISTRICT_ID"], row["EMPLOYEE_CONTACT_ID"], row["EMPLOYEE_CONTACT_ID.displayValue"], 
+            row["USER_EDIT"], row["USER_NEW"], row["departmentAttributeName"], row["DATE_EDIT"], row["DATE_NEW"]];
+    });
+}
+
+
+memberRows = memberRows.map(function(row)
+{
+    return [row["#UID"], row["OBJECTMEMBERID"], row["CONTACT_ID"], row["CONTACT_ID.displayValue"], row["CONTACTROLE"], row["DEPARTMENT"], row["ICON"],
+                row["IMAGE"], row["MEMBERROLE"], row["MEMBERROLE.displayValue"], row["OBJECT_ROWID"], 
+                row["OBJECT_TYPE"], row["ORG_ORGID"], row["ORGANISATION_NAME"], row["PERSON_FIRSTNAME"], 
+                row["PERSON_FULL_NAME"], row["PERSON_LASTNAME"], row["PERSON_PERSID"], row["PERSON_SALUTATION"], row["PERSON_TITLE"], 
+                row["POSITION"], row["TARGETCONTEXT"], row["recordType"]];
+});
+
+var responsibleUids = [];
+
+districtRows.forEach(function(row){
+    responsibleUids.push(row[3]);
+});
+
+var loadingConfPers = entities.createConfigForLoadingRows()
+                                    .entity("Person_entity")
+                                    .uids(responsibleUids)
+                                    .fields(["ORGANISATION_ID", "ORGANISATION_NAME", "CONTACTROLE", "POSITION", 
+                                                "FIRSTNAME", "LASTNAME", "SALUTATION", "TITLE"]);
+
+var persRows = entities.getRows(loadingConfPers);
+
+persRows = persRows.map(function(row){
+    return [row["SALUTATION"], row["TITLE"], row["FIRSTNAME"], row["LASTNAME"],
+                row["ORGANISATION_NAME"], row["ORGANISATION_ID"], row["CONTACTROLE"],
+                row["POSITION"], row["PERSONID"]];
+});
+
+
+districtRows.forEach(function(row, counter){
+    
+    memberRows.push(
+        [row[0],
+        null,
+        row[3],
+        row[4],
+        persRows[counter][6],
+        row[7],
+        "VAADIN:GLOBE",
+        "TEXT:" + row[4].substring(row[4].indexOf(" ", 0)+1, row[4].length),
+        "MEMBERROLEDISTRICTRESPONSIBLE",
+        translate.text("District Responsible"),
+        vars.get("$param.ObjectRowId_param"),
+        vars.get("$param.ObjectType_param"),
+        persRows[counter][5],
+        persRows[counter][4],
+        persRows[counter][2],
+        row[4],
+        persRows[counter][3], 
+        persRows[counter][8], 
+        persRows[counter][0], 
+        persRows[counter][1], 
+        persRows[counter][7],
+        null, 
+        "DistrictResponsible"
+    ]);
+});
+
+result.object(memberRows);
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/jdito/onDelete.js b/entity/Member_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..91caa64d3c7e2ff55a33918b3f3d8b8ba5c2f233
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,16 @@
+import("system.vars");
+import("system.entities");
+
+//While there is no need to implement the insert or update process the delete process needs to be specified because the 
+//contexts viewmodeProvider for the editView only affect insert and update (delete has no view associated)
+//let's do the db-record container the job to remove the record (additional district records can never be removed):
+var rowData = vars.get("$local.rowdata");
+var memberId = rowData["OBJECTMEMBERID.value"];
+if (memberId)
+{
+    var config = entities.createConfigForDeletingRows().entity("Member_entity").uid(memberId);
+    entities.deleteRow(config);
+}
+else
+    throw new Error("Member_entity: Could not delete member entity because the given OBJECTMEMBERID was empty.");
+    
diff --git a/entity/Member_entity/recordcontainers/jdito/onInsert.js b/entity/Member_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..d86d21c9884d5e4290757d4cc27319b289e266c8
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1 @@
+//No insert code, because it is done in via the contexts viewmodeProvider for the editView
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/jdito/onUpdate.js b/entity/Member_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e04d32962f5dec90c10865d49c4c7310a84961d
--- /dev/null
+++ b/entity/Member_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1 @@
+//No update code, because it is done in via the contexts viewmodeProvider for the editView
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 8bc4b0587027cb71947f5ade5bcede18bdb01ebb..576d1171a8410d0c8fc1a15614a746438582b1c0 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -18,12 +18,13 @@
     </entityField>
     <entityField>
       <name>ICON</name>
+      <colorProcess>%aditoprj%/entity/ModuleTree_entity/entityfields/icon/colorProcess.js</colorProcess>
       <contentType>IMAGE</contentType>
     </entityField>
     <entityProvider>
       <name>TreeProviders</name>
       <targetContextField>TYPE</targetContextField>
-      <targetIdField>UID</targetIdField>
+      <targetIdField>ROW_ID</targetIdField>
       <recordContainer>jdito</recordContainer>
       <dependencies>
         <entityDependency>
@@ -58,9 +59,11 @@
     </entityProvider>
     <entityField>
       <name>PARENT_ID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc</documentation>
     </entityField>
     <entityField>
       <name>UID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/uid/documentation.adoc</documentation>
     </entityField>
     <entityField>
       <name>PARENT_CONTEXT</name>
@@ -84,6 +87,16 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>ICON_COLOR</name>
+    </entityField>
+    <entityField>
+      <name>ROW_ID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT_ROW_ID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc</documentation>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -94,12 +107,18 @@
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROW_ID.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>TYPE.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>PARENT_ID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_ROW_ID.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>PARENT_CONTEXT.value</name>
         </jDitoRecordFieldMapping>
@@ -112,6 +131,9 @@
         <jDitoRecordFieldMapping>
           <name>ICON.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON_COLOR.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
diff --git a/entity/ModuleTree_entity/entityfields/icon/colorProcess.js b/entity/ModuleTree_entity/entityfields/icon/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f6e7055fbfa6fc80b04ed3f139c310ddcd4700b
--- /dev/null
+++ b/entity/ModuleTree_entity/entityfields/icon/colorProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+
+var color = vars.get("$field.ICON_COLOR");
+//only return a value if there is acutally one because otherwise (if giving null for exmaple) the records would inherit the color of the previous record
+if (color)
+    result.string(color);
diff --git a/entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc b/entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a71ee12093ca8ab51a5fe5ff85a12e2cc48aa21f
--- /dev/null
+++ b/entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc
@@ -0,0 +1,4 @@
+This field containts the parents UID (if existant) or `null` (if it's a root element).
+The field is needed to build a tree/treeTable.
+
+Do not confuse this with the `PARENT_ROW_ID`-field.
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc b/entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..65c99c2b8995983c1bf3ea9a02a14d926d83fc8b
--- /dev/null
+++ b/entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc
@@ -0,0 +1,5 @@
+This field contains the actual rowId of the record, which is dependent on the `TYPE`-field.
+So for example if the TYPE is `Activity` this field contains the Activities UID (`ACTIVITYID`). 
+If the TYPE is `Task` this field containst the Tasks UID (`TASKID`) and so on.
+
+Do not confuse this with the `PARENT_ID`-field.
diff --git a/entity/ModuleTree_entity/entityfields/uid/documentation.adoc b/entity/ModuleTree_entity/entityfields/uid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..bf7ae49972e723255e2121cb953ba545122331c4
--- /dev/null
+++ b/entity/ModuleTree_entity/entityfields/uid/documentation.adoc
@@ -0,0 +1,26 @@
+The UID is composed of some other data:
+
+* `ROW_ID` of the actual record
+* `OBJECT_TYPE` of the actual record (=the contextid)
+
+The ID is encoded as json string of an object with the following properties:
+
+* `id` which is the `ROW_ID`
+* `type` which is the `OBJECT_TYPE`
+
+See these examples of uids: 
+
+* `{"id":"634ad7a8-9c68-4ea4-8385-f5bb37224482","type":"SupportTicket"}`
+* `{"id":"b8067a42-d059-4d86-88b0-485a194faa36","type":"Activity"}`
+* `{"id":"ccdea060-a151-44b2-b7ff-74fdcd0ce333","type":"Task"}`
+* `{"id":"453ff4dd-ffa1-4bb0-a5dc-45b9d333a853","type":"Task"}`
+
+The *reason* for this encoding is to grant better performance when data is requested from the kernel 
+while giving the `$local.idvalues`-Variable.
+
+When we know the objectType and the rowId we can directly load data with the given rowId from 
+the objectTypes entity.
+If we only had the rowId it would be necessary to try all possible entities (objectTypes) for a match 
+in the worst cases.
+
+The information of `ROW_ID` and `OBJECT_TYPE` cannot change during runtime, so this cannot lead to errors.
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index c0609d7b57323e4348558b0bf3d729356f51103b..fcc31459bcbd31d7e0b947031d394d2a725ea489 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,31 +1,66 @@
+import("system.logging");
+import("system.neon");
+import("system.entities");
+import("Keyword_lib");
 import("KeywordRegistry_basic");
 import("system.vars");
 import("Sql_lib")
 import("system.result");
 import("system.db");
 
-var fixedContextName = vars.get("$param.ContextName_param");
-var fixedID = vars.get("$param.ID_param");
+var resArray = [];
 
-let resArray = [];
+var idValues;
+if (vars.exists("$local.idvalues") )
+    idValues = vars.get("$local.idvalues");
 
-// Query root element
-var root = queryRootElement(fixedContextName, fixedID, true);
+if (idValues)
+{
+    /* Currently there is no known use case for the ModuleTree_entity where the idValues is actually more than one.
+     * Every uid contains:
+     * a) the row_id of the record
+     * b) the type (contextid) of the record
+     * 
+     * The process loads at the moment for every idValue in idValues the record.
+     * From a perfromance perspective it would be probably better to:
+     * - collect the row_id values of every type
+     * - request for that type all the data at once
+     * - augment all the data and prepare it for returning to this jditoRC
+     * 
+     **/
+    if (idValues.length > 15)
+        logging.log("[ModuleTree_entity]Performance warning: The ModuleTree_entity has received an request for " + idValues.length + " ids, "
+            + "but it is not optimized for such requests. See the ModuleTree_entity.contentProcess and this message.", logging.WARNING);
+    idValues.forEach(function (uid){
+        uid = JSON.parse(uid);
+        var singleElement = queryRootElement(uid.type, uid.id, true);
+        if (singleElement)
+            resArray.push(singleElement);
+    });
+}
+else
+{
+    var fixedContextName = vars.get("$param.ContextName_param");
+    var fixedID = vars.get("$param.ID_param");
 
-if (root !== null) {
-    // Push root element
-    resArray.push(root);
+    // Query root element
+    var root = queryRootElement(fixedContextName, fixedID, true);
 
-    // Query children of root
-    var children = queryChildrenElements(fixedContextName, fixedID);
-    
-    if (children !== null) {
-     
-       // Push each children
-       resArray = resArray.concat(children);
-       result.object(resArray);
+    if (root !== null) {
+        // Push root element
+        resArray.push(root);
+
+        // Query children of root
+        var children = queryChildrenElements(fixedContextName, fixedID);
+
+        if (children !== null) {
+
+           // Push each children
+           resArray = resArray.concat(children);
+        }
     }
 }
+result.object(resArray);
 
 /**
  * Queries the children of the given parent element.
@@ -34,27 +69,40 @@ if (root !== null) {
  * @param pContextName Context name of the parent element.
  * @param pID ID of the parent element.
  */
-function queryChildrenElements (pContextName, pID) {
-    
-    var taskResult = newSelect("TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TASK")
-                        .where("TASK.PARENT_ID", pID)
-                        .and("TASK.PARENT_CONTEXT", pContextName)
-                        .and("TASK.KIND", $KeywordRegistry.taskType$task())
-                        .table();
-    
-    var ticketResult = newSelect("TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TICKET")
-                        .leftJoin("TASK", "TASK_ID = TASKID")
-                        .where("TASK.PARENT_ID", pID)
-                        .and("TASK.PARENT_CONTEXT", pContextName)
-                        .table();
+function queryChildrenElements (pContextName, pID) 
+{
+    //Tasks:
+    var taskConf = _getConfigForLoadingTaskRows()
+        .provider("TaskChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var taskRows = entities.getRows(taskConf);
+    //remap the data to the format like the augmentdata function needs it
+    var taskResult = taskRows.map(function (rowValues){
+        return _mapTaskRow(rowValues);
+    });
+
+    //Tickets:
+    var supportTicketConf = _getConfigForLoadingSupportTicketRows()
+        .provider("SupportTicketChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var supportTicketRows = entities.getRows(supportTicketConf);
+    //remap the data to the format like the augmentdata function needs it
+    var ticketResult = supportTicketRows.map(function (rowValues){
+        return _mapSupportTicketRow(rowValues);
+    });
     
-    var activityResult = newSelect("ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO")
-                        .from("ACTIVITY")
-                        .where("ACTIVITY.PARENT_ID", pID)
-                        .and("ACTIVITY.PARENT_CONTEXT", pContextName)
-                        .table();
+    //Activities:
+    var activityConf = _getConfigForLoadingActivityRows()
+        .provider("ActivityChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var activityRows = entities.getRows(activityConf);
+    //remap the data to the format like the augmentdata function needs it
+    var activityResult = activityRows.map(function (rowValues){
+        return _mapActivityRow(rowValues);
+    });
     
     var res = []
   
@@ -64,7 +112,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(taskResult[i]);
         
         // Query children
-        let children = queryChildrenElements("Task", taskResult[i][0]);
+        let children = queryChildrenElements("Task", taskResult[i][1]);
         res = res.concat(children);
     }
     
@@ -74,7 +122,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(activityResult[i]);
         
         // Query children
-        let children = queryChildrenElements("Activity", activityResult[i][0]);
+        let children = queryChildrenElements("Activity", activityResult[i][1]);
         res = res.concat(children);
     }
     
@@ -84,7 +132,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(ticketResult[i]);
         
         // Query children
-        let children = queryChildrenElements("SupportTicket", ticketResult[i][0]);
+        let children = queryChildrenElements("SupportTicket", ticketResult[i][1]);
         res = res.concat(children);
     }
       
@@ -98,13 +146,15 @@ function queryChildrenElements (pContextName, pID) {
  * @param pID ID of the root element.
  * @param pGetFirst start from the first element
  */
-function queryRootElement (pContextName, pID, pGetFirst) {
-    var resultArray;
-    if (pContextName === "Task") {
-        resultArray = newSelect("TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TASK")
-                        .where("TASK.TASKID", pID)
-                        .arrayRow();
+function queryRootElement (pContextName, pID, pGetFirst) 
+{
+    var resultArray, rowValues, conf;
+    
+    if (pContextName === "Task") 
+    {
+        conf = _getConfigForLoadingTaskRows().uid(pID);
+        rowValues = entities.getRow(conf);
+        resultArray = _mapTaskRow(rowValues);
                         
         if (resultArray.length === 0) {
             return null;
@@ -118,11 +168,10 @@ function queryRootElement (pContextName, pID, pGetFirst) {
         }
         return augmentData(resultArray, "Task");
     } else if (pContextName === "Activity") {
-        resultArray = newSelect("ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO")
-                        .from("ACTIVITY")
-                        .where("ACTIVITY.ACTIVITYID", pID)
-                        .arrayRow();
-            
+        conf = _getConfigForLoadingActivityRows().uid(pID);
+        rowValues = entities.getRow(conf);
+        resultArray = _mapActivityRow(rowValues);
+        
         if (resultArray.length === 0) {
             return null;
         }
@@ -136,11 +185,10 @@ function queryRootElement (pContextName, pID, pGetFirst) {
         return augmentData(resultArray, "Activity");
     }
     else if (pContextName === "SupportTicket") {
-        resultArray = newSelect("TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TICKET")
-                        .leftJoin("TASK", "TASK_ID = TASKID")
-                        .where("TICKET.TICKETID", pID)
-                        .arrayRow();
+
+        conf = _getConfigForLoadingSupportTicketRows().uid(pID);
+        rowValues = entities.getRow(conf);
+        resultArray = _mapSupportTicketRow(rowValues);
                         
         if (resultArray.length === 0) {
             return null;
@@ -162,10 +210,9 @@ function queryRootElement (pContextName, pID, pGetFirst) {
  * Augments the given row to match the required result signature.
  * 
  * @param pDataRow Requires the following format:
- *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION
+ *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION, ICON, ICON_COLOR
  * @param pType The type of the row which needs adjustment.
- * @return Returns the following format:
- *         UID, KIND, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
+ * @return Returns the data in the form how the record container requests it
  * 
  */
 function augmentData (pDataRow, pType) {
@@ -178,19 +225,118 @@ function augmentData (pDataRow, pType) {
     if (pType !== "Task" && pType !== "Activity" && pType !="SupportTicket")
         return null;
     
+    var rowId, parentId, parentContext, title, description, icon, iconColor;
+    [rowId, parentId, parentContext, title, description, icon, iconColor] = pDataRow;
+
     // PARENT_ID check
-    if (pDataRow[2] === "")
-        pDataRow[2] = null;
+    if (parentId === "")
+        parentId = null;
     
     // PARENT_CONTEXT check
-    if (pDataRow[3] === "")
-        pDataRow[3] = null;
-    
-    // Insert type
-    pDataRow.splice(1, 0, pType);
-    
-    // Insert icon
-    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "VAADIN:HOURGLASS_END": pType==="SupportTicket" ? "VAADIN:chat": null);
-    
-    return pDataRow;
+    if (parentId === "")
+        parentId = null;
+
+    if (!iconColor)
+        iconColor = "";
+
+    var uid = JSON.stringify({id: rowId, type: pType});
+    var parentUid = null;
+    if (parentId && parentContext)
+        parentUid = JSON.stringify({id: parentId, type: parentContext});
+    //we have no access to the datamodels iconId here, so therefor the icon values are hardcoded //TODO: optimize and load automatically
+    var resIcon = icon || (pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "VAADIN:HOURGLASS_END" : pType ==="SupportTicket" ? "VAADIN:chat" : null);
+    var res = [uid, rowId, pType, parentUid, parentId, parentContext, title, description, resIcon, iconColor];
+    return res;
+}
+
+/*
+ * private helper function for creating the base config for loading TASKS 
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingTaskRows()
+{
+    var res = entities.createConfigForLoadingRows()
+        .entity("Task_entity")
+        .fields(["TASKID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "DESCRIPTION", "PRIORITY_ICON", "ICON_COLOR"]);
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingTaskRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapTaskRow(pRowValues)
+{
+    return [
+         pRowValues["TASKID"]
+        ,pRowValues["PARENT_ID"]
+        ,pRowValues["PARENT_CONTEXT"]
+        ,pRowValues["SUBJECT"]
+        ,pRowValues["DESCRIPTION"]
+        ,pRowValues["PRIORITY_ICON"]
+        ,pRowValues["ICON_COLOR"]
+    ];
+}
+
+/*
+ * private helper function for creating the base config for loading SUPPORT TICKETS 
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingSupportTicketRows()
+{
+    var res = entities.createConfigForLoadingRows()
+        .entity("SupportTicket_entity")
+        .fields(["TICKETID", "TASK_PARENT_ID", "TASK_PARENT_CONTEXT", "TASK_SUBJECT", "TASK_DESCRIPTION", "TASK_PRIORITY_ICON", "TASK_ICON_COLOR"])
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingSupportTicketRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapSupportTicketRow(pRowValues)
+{
+    return [
+         pRowValues["TICKETID"]
+        ,pRowValues["TASK_PARENT_ID"]
+        ,pRowValues["TASK_PARENT_CONTEXT"]
+        ,pRowValues["TASK_SUBJECT"]
+        ,pRowValues["TASK_DESCRIPTION"]
+        ,pRowValues["TASK_PRIORITY_ICON"]
+        ,pRowValues["TASK_ICON_COLOR"]
+    ];
+}
+
+
+/*
+ * private helper function for creating the base config for loading ACTIVITES
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingActivityRows()
+{
+    //activity has currently no icon color, therefor nothing to specify here
+    var res = entities.createConfigForLoadingRows()
+        .entity("Activity_entity")
+        .fields(["ACTIVITYID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "INFO", "#IMAGE"]);
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingActivityRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapActivityRow(pRowValues)
+{
+    return [
+         pRowValues["ACTIVITYID"]
+        ,pRowValues["PARENT_ID"]
+        ,pRowValues["PARENT_CONTEXT"]
+        ,pRowValues["SUBJECT"]
+        ,pRowValues["INFO"]
+        ,pRowValues["#IMAGE"]
+        ,null //activity has currently no icon color, therefor give a placeholder value
+    ];
 }
\ No newline at end of file
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 6a17ff596ef4d47e3c5c791cd8b8c722ef41ded6..8dead6bc118e4d353c6c708976a037b3ace5c45e 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Notification_entity/documentation.adoc</documentation>
   <title>Notifications</title>
+  <initFilterProcess>%aditoprj%/entity/Notification_entity/initFilterProcess.js</initFilterProcess>
   <iconId>VAADIN:BELL</iconId>
   <titlePlural>Notifications</titlePlural>
   <recordContainer>db</recordContainer>
@@ -105,7 +106,7 @@
           <title>set Read</title>
           <description></description>
           <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
-          <isSelectionAction v="false" />
+          <isSelectionAction v="true" />
           <iconId>VAADIN:OPEN_BOOK</iconId>
           <tooltip></tooltip>
           <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
@@ -161,6 +162,14 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>CREATEDAY</name>
+      <title>Date</title>
+      <contentType>DATE</contentType>
+      <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -174,12 +183,19 @@
       <onDBDelete>%aditoprj%/entity/Notification_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
+          <name>3061f3b4-a5d1-4436-9c4d-28415363a056</name>
           <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
           <primaryKey>CONTENTID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
+        <linkInformation>
+          <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
+          <tableName>ASYS_NOTIFICATIONS</tableName>
+          <primaryKey>ID</primaryKey>
+          <isUIDTable v="true" />
+          <readonly v="false" />
+        </linkInformation>
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -262,6 +278,10 @@
           <name>DELETEDATE.value</name>
           <recordfield>ASYS_NOTIFICATIONCONTENTS.DELETEDATE</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CREATEDAY.value</name>
+          <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATEDATE</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
index a11db05fbf8b23cf18b4826418d8318a040260ba..054975d09dbfcddbf586419699b6e70eea635327 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js
@@ -5,8 +5,5 @@ import("system.neon");
 
 var user = tools.getCurrentUser();
 var selectedNotifications = vars.get("$sys.selection");
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
-
+notification.updateUserNotificationsState(user["name"], selectedNotifications, notification.STATE_ARCHIVE);
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
index 3010398e4cb612bcd1a8300a878eecb52fad86db..2695978b29e0c8bcaa1c4da4494bb196767698f0 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js
@@ -5,8 +5,5 @@ import("system.neon");
 
 var user = tools.getCurrentUser();
 var selectedNotifications = vars.get("$sys.selection");
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
-
+notification.updateUserNotificationsState(user["name"], selectedNotifications, notification.STATE_UNSEEN);
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index f28870eaa227a906700250efe1924529d0e49417..33bd6bf461d67dbb64ecf15a1677cea2651ddb8d 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -7,19 +7,5 @@ import("KeywordRegistry_basic");
 
 var user = tools.getCurrentUser();
 var selectedNotifications = vars.get("$sys.selection");
-
-if (selectedNotifications.length == 0)
-{
-    let userid = tools.getCurrentUser()["name"];
-    
-    selectedNotifications = newSelect("ASYS_NOTIFICATIONS.ID")
-    .from("ASYS_NOTIFICATIONS")
-    .where("ASYS_NOTIFICATIONS.STATE", [notification.STATE_SEEN.toString(), notification.STATE_UNSEEN.toString()], SqlBuilder.IN())
-    .and("ASYS_NOTIFICATIONS.USERID", userid, SqlBuilder.EQUAL())
-    .arrayColumn();
-}
-
-for(var i = 0; i < selectedNotifications.length; i++)
-    notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-
+notification.updateUserNotificationsState(user["name"], selectedNotifications, notification.STATE_CONFIRMED);
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
index f4800969f4e5967a497f2d0ce1b0244ccd81da63..7b41babad8257e8b81cfe60d7d5166e2d222c172 100644
--- a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -4,9 +4,10 @@ import("system.notification");
 
 var types = []
 
-for (let property in notification.getAllTypes()) 
+var props = notification.getAllTypes();
+for (i = 0; i < props.length; i++) 
 {
-  types.push(property);
+  types.push([props[i]["typecode"], props[i]["title"]]);
 }
 
 result.object(types);
\ No newline at end of file
diff --git a/entity/Notification_entity/initFilterProcess.js b/entity/Notification_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fbd4e058555c1ebb84133cccec7e2b28b30f7fdf
--- /dev/null
+++ b/entity/Notification_entity/initFilterProcess.js
@@ -0,0 +1,34 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+{
+    var statusNew = $KeywordRegistry.notificationState$unseen();
+    var statusUnread = $KeywordRegistry.notificationState$seen();
+        
+    var filter = {
+        type: "group",
+        operator: "OR",
+        childs: [{
+            type: "row",
+            name: "STATE",
+            operator: "EQUAL",
+            contenttype: "TEXT",
+            key: statusNew,
+            value: KeywordUtils.getViewValue($KeywordRegistry.notificationState(), statusNew)
+        },
+        {
+            type: "row",
+            name: "STATE",
+            operator: "EQUAL",
+            contenttype: "TEXT",
+            key: statusUnread,
+            value: KeywordUtils.getViewValue($KeywordRegistry.notificationState(), statusUnread)
+        }]
+    };
+    result.string(JSON.stringify(filter));
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/documentation.adoc b/entity/ObjectRelationType_entity/documentation.adoc
index 9c296c2d48c343163da4a3427b5c27656d4938a9..268b6a73875e0a1b60f9287471a5f693f84a2f5c 100644
--- a/entity/ObjectRelationType_entity/documentation.adoc
+++ b/entity/ObjectRelationType_entity/documentation.adoc
@@ -1,3 +1,14 @@
 = ObjectRelationType_entity
 
-Administrative obsolescence of the object_entity
\ No newline at end of file
+This entity is for administrating the different types of ObjectRelations that can be used with the ObjectTree_entity.
+
+== Database Structure
+
+One complete ObjectRelationType can consist of either one or two rows in the table 'AB_OBJECTRELATIONTYPE', depending on whether the ObjectRelationType is double-sided or not. When there are two rows they share the same 'RELATION_TYPE' and the order of them is determined by the 'SIDE'.
+The flag 'HIERARCHY' determines if the relation between to objects will be hierarchical.
+
+== Entity Structure
+
+In the entity, one row represents a "full" ObjectRelationType, so the database entries that make it up are already joined together. 
+
+NOTE: A "second side" of the ObjectRelationType is not mandatory, if it is not set, only one row in the database is needed. Such a relation type makes sense when a relation is the same regardless from which side you view it (e. g. acquaintance).
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 4ea71164c3cd8f2f93b39be55a3555cbf9b8090a..c36c8c3e14413054882e265771ac9af38f3fb7fc 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -144,7 +144,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
         else // no ObjectType chosen
         {
             // load all ObjectRelationTypes
-            var relationTypes = _getPossibleRelationTypes(pObjectType);
+            var relationTypes = ObjectRelationUtils.getPossibleRelationTypes([pObjectType], true);
             
             relationTypes.forEach(function (relationType, i)
             {
@@ -238,8 +238,7 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
     
     onConditionForRelationTypeJoin = newWhere("AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum)
         .and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
-        .and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
-        .andIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId || null); // set id to null, as only null works with .andIfSet
+        .and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2);
     
     // wird benoetigt zum Bearbeiten 
     if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
@@ -259,23 +258,19 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
     var data = newSelect("OBJECT" + (pObjectRelationId ? myNum : otherNum) + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID")
         .from("AB_OBJECTRELATION")
         .join("AB_OBJECTRELATIONTYPE", onConditionForRelationTypeJoin)
+        .whereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId || null) // set id to null, as only null works with .andIfSet
         .table();
                         
     // try again with other side for "same"
-    if (data.length == 0 && pDirection == "same" && !pNoRecursion || pObjectRelationId && data.length > 0 && !data[0][0])
-         return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true, pObjectRelationId)
+    if (data.length == 0 && pDirection == "same" && !pNoRecursion || pObjectRelationId && data.length > 0 && !data[0][0]
+        || data.length == 0 && pDirection == "reverse" && !pNoRecursion && pObjectRelationId)
+         return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true, pObjectRelationId);
     
     // TODO: BINDATA?
     //for ( var i = 0; i < data.length; i++)  data[i][2] = image[data[i][2]] == undefined ? "" : image[data[i][2]];
     return data;
 }
 
-function _getPossibleRelationTypes(pObjectType)
-{
-    // TODO: load from entity when possible
-    return ObjectRelationUtils.getPossibleRelationTypes([pObjectType], true);
-}
-
 /**
  * insert a new Entry
  * 
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
index 415b1925a91025dbbd8eb3d9f004afe16b5081ca..6541f935b87fc18c6d06480e84f365f647b42c24 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
@@ -3,5 +3,4 @@ import("Sql_lib");
 
 var objectRelationId = vars.get("$local.rowdata")["OBJECTRELATIONID.value"];
 
-newWhereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId).deleteData();
-
+newWhereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId).deleteData();
\ No newline at end of file
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 7fe6b0ab3b64924d4aa6a0a3aa184c1dfcec34f7..1a571fad307eb9e7e768bdfa12c553247e3ec376 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -275,6 +275,14 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>SupportTickets</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicket_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d511b462fa0d952ee6f0c9bbb06754fe0c6e7dd3..0491466e0b6a47b54b5d0c67d48d8d4b7a891d31 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -114,6 +114,7 @@
     </entityField>
     <entityConsumer>
       <name>Offeritems</name>
+      <refreshParent v="true" />
       <description></description>
       <dependency>
         <name>dependency</name>
@@ -134,6 +135,7 @@
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
@@ -1291,13 +1293,17 @@
         </aggregateFieldDbMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
-          <recordfield>OFFER.OFFER_ID</recordfield>
+          <recordfield>OFFER.OFFERID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
         <aggregateFieldDbMapping>
           <name>PROBABILITY_aggregate.value</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>OFFER_ID.value</name>
+          <recordfield>OFFER.OFFER_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
@@ -1307,6 +1313,14 @@
           <filterConditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Offer_entity/entityfields/footer/valueProcess.js b/entity/Offer_entity/entityfields/footer/valueProcess.js
index d87d0711fe4fbf1df6d49ee67cf6b9a0a9522e56..13afc8d9abeb17768d0d029acc7cec772f8dd088 100644
--- a/entity/Offer_entity/entityfields/footer/valueProcess.js
+++ b/entity/Offer_entity/entityfields/footer/valueProcess.js
@@ -7,9 +7,3 @@ import("system.util");
 
 if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param")) 
     result.string(vars.get("$param.OfferFooter_param"));
-
-else if(vars.get("$this.value"))
-    result.string(vars.get("$this.value"));
-
-else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string("Vielen Dank!");  //TODO: translate
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index d627690978c16d2a589f96f2893b6e888c45f165..5aefd8c34d03ccce6c432cc6053a436d1b21dadc 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -7,9 +7,3 @@ import("system.util");
 
 if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param")) 
     result.string(vars.get("$param.OfferHeader_param"));
-
-else if(vars.get("$this.value"))
-    result.string(vars.get("$this.value"));
-
-else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string("Gerne bieten wir Ihnen wie folgt an:");  //TODO: translate
diff --git a/entity/Offer_entity/entityfields/neworder/onActionProcess.js b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
index 696d171c7ef1d69bd9301c5e3c7d8ce214156a3f..dbaec31a9aeba19cb139de45ab7bb2a7c975d943 100644
--- a/entity/Offer_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
@@ -7,9 +7,8 @@ var pRowId = vars.getString("$field.OBJECT_ROWID");
 var pContext=vars.getString("$field.OBJECT_TYPE")
 var currency = vars.getString("$field.CURRENCY");
 var language = vars.getString("$field.ISOLANGUAGE");
-var header = vars.getString("$field.HEADER");
 var address = vars.getString("$field.ADDRESS");
 var offerId = vars.getString("$field.OFFERID");
 
-OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address, header);
+OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address);
     
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d5bcac51027b862291e5abd61c0c05773a8df
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index 108e16a1568111f622d71415968423884be95d78..0f003f4454eb7dc65386ea75080398e1070aef56 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -1,31 +1,32 @@
+import("system.db");
+import("system.vars");
 import("system.question");
 import("system.translate");
-import("system.vars");
 import("KeywordRegistry_basic");
-import("system.translate");
+import("Placeholder_lib");
 import("Offer_lib");
 import("Email_lib");
 import("Sql_lib");
 import("MimeType_lib");
-import("Placeholder_lib");
 
-var offerReport = {};
+var offerReport = {}
 var attachmentArray = [];
-var notificationMsg = translate.text("The status of the offer was changed to \"Sent\".");
+var updateStatements = [["OFFER", ["STATUS"], db.getColumnTypes("OFFER", ["STATUS"]), [$KeywordRegistry.offerStatus$sent()], newWhere("OFFER.OFFERID", vars.get("$field.OFFERID")).build()]];
+var notificationMsg = translate.text("The status of the offer was changed to \"sent\".");
 var contactId = vars.get("$field.CONTACT_ID");
 var arrayReport = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
 var emailFilename = translate.text("Offerrequest");
+var offerId = vars.get("$field.OFFERID")
+var additionalPlaceholders = [
+    new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
+];
 
 if (vars.get("$field.CONTACT_ID") == null || "") contactId = vars.get("$field.CONTACT_ORG_ID");
 
 offerReport.content = arrayReport[1];
-offerReport.contentType = MimeTypes.PDF();
+offerReport.mimeType = MimeTypes.PDF();
 offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTITLE") + ".pdf";
 
 attachmentArray[0] = offerReport;
 
-var additionalPlaceholders = [
-    new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
-];
-var offerId = vars.get("$field.OFFERID")
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, offerId);
\ No newline at end of file
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements);
diff --git a/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4157abe2c850e42fb49e06207d907884670e46e2
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("OFFER.OFFERID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..371a5b567d5a947056b3aa0982100e741e66eb45
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
+
diff --git a/entity/Offer_entity/recordcontainers/index/query.js b/entity/Offer_entity/recordcontainers/index/query.js
index 32864cdd4aa7c56b613c6d4d984718c1d2e897b5..7d975c8bb3ea9f1aca3528603f54089ca89cbfbb 100644
--- a/entity/Offer_entity/recordcontainers/index/query.js
+++ b/entity/Offer_entity/recordcontainers/index/query.js
@@ -18,8 +18,7 @@ var querySelect = newSelect([
     ])
     .from("OFFER")
     .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
-    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
-    .orderBy("OFFER.OFFERCODE");
+    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
 
 if (vars.exists("$local.idvalue")) 
     querySelect.whereIfSet("OFFER.OFFERID", "$local.idvalue", SqlBuilder.IN());
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index dc0d84d447ab306bf1809d0d480039edd5bd850b..a900e6473e8d7ded55a0ca946aa0798296bf657e 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -278,13 +278,13 @@
           <name>DISCOUNT.value</name>
           <recordfield>OFFERITEM.DISCOUNT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.value</name>
           <recordfield>OFFERITEM.GROUPCODEID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ITEMNAME.value</name>
@@ -296,7 +296,7 @@
           <name>ITEMPOSITION.value</name>
           <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ITEMSORT.value</name>
@@ -314,43 +314,43 @@
           <name>OPTIONAL.value</name>
           <recordfield>OFFERITEM.OPTIONAL</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRICE.value</name>
           <recordfield>OFFERITEM.PRICE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PRODUCT_ID.value</name>
           <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>QUANTITY.value</name>
           <recordfield>OFFERITEM.QUANTITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>UNIT.value</name>
           <recordfield>OFFERITEM.UNIT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VAT.value</name>
           <recordfield>OFFERITEM.VAT</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>OFFERITEM.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="true" />
+          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>GROUPCODEID.displayValue</name>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index d38b802de3c56bc5b0d3abd5109edcdee7afc025..06389d921d507bf630d1baddcbbcd03d570f6faa 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -91,13 +91,11 @@
       <name>HEADER</name>
       <title>Header text</title>
       <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/header/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>FOOTER</name>
       <title>Footer text</title>
       <contentType>LONG_TEXT</contentType>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/footer/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>Orderitems</name>
@@ -121,6 +119,7 @@
         </entityParameter>
         <entityParameter>
           <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js</valueProcess>
           <expose v="true" />
           <mandatory v="true" />
         </entityParameter>
@@ -167,7 +166,6 @@
       <name>ContactId_param</name>
       <expose v="true" />
       <mandatory v="true" />
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/contactid_param/documentation.adoc</documentation>
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
@@ -220,7 +218,6 @@
       <children>
         <entityParameter>
           <name>AssignmentName_param</name>
-          <documentation>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
         </entityParameter>
         <entityParameter>
           <name>AssignmentRowId_param</name>
@@ -718,11 +715,15 @@
       <name>ChosenTexHeader</name>
       <title>Choose Header</title>
       <consumer>DocumentTemplateTexHeader</consumer>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/chosentexheader/stateProcess.js</stateProcess>
+      <onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosentexheader/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>ChosenTexFooter</name>
       <title>Choose Footer</title>
       <consumer>DocumentTemplateTexFooter</consumer>
+      <stateProcess>%aditoprj%/entity/Order_entity/entityfields/chosentexfooter/stateProcess.js</stateProcess>
+      <onValueChange>%aditoprj%/entity/Order_entity/entityfields/chosentexfooter/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>ChosenPaymentAddress</name>
@@ -752,6 +753,49 @@
         <element>PROCESS_SETVALUE</element>
       </onValueChangeTypes>
     </entityField>
+    <entityField>
+      <name>REMINDER_REPORT_DATA</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORDER_REPORT_DATA</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
+    </entityField>
+    <entityConsumer>
+      <name>Organisations</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Organisation_entity</entityName>
+        <fieldName>Organisations</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Persons</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Person_entity</entityName>
+        <fieldName>Contacts</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityParameter>
+      <name>Copy_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
+    </entityParameter>
+    <entityField>
+      <name>ORDER_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>COUNT</name>
+      <title>Count</title>
+      <contentType>NUMBER</contentType>
+    </entityField>
+    <entityAggregateField>
+      <name>COUNT_aggregate</name>
+      <parentField>COUNT</parentField>
+      <title>Count</title>
+    </entityAggregateField>
     <entityActionField>
       <name>newOrder</name>
       <documentation>%aditoprj%/entity/Order_entity/entityfields/neworder/documentation.adoc</documentation>
@@ -846,53 +890,32 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityField>
-      <name>REMINDER_REPORT_DATA</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ORDER_REPORT_DATA</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_report_data/valueProcess.js</valueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Organisations</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Organisation_entity</entityName>
-        <fieldName>Organisations</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>Persons</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>Contacts</fieldName>
-      </dependency>
-    </entityConsumer>
-    <entityParameter>
-      <name>Copy_param</name>
-      <expose v="true" />
-      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
-    </entityParameter>
-    <entityField>
-      <name>ORDER_OBJECTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/order_objecttype/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>COUNT</name>
-      <title>Count</title>
-      <contentType>NUMBER</contentType>
-    </entityField>
-    <entityAggregateField>
-      <name>COUNT_aggregate</name>
-      <parentField>COUNT</parentField>
-      <title>Count</title>
-    </entityAggregateField>
-    <entityProvider>
-      <name>#PROVIDER_AGGREGATES</name>
-      <useAggregates v="true" />
-    </entityProvider>
+    <entityActionGroup>
+      <name>orderReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchOrderReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <stateProcess>%aditoprj%/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
+    <entityActionGroup>
+      <name>reminderReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchReminderReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <stateProcess>%aditoprj%/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -975,17 +998,18 @@
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>SALESORDER.CONTACT_ID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
           <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-          <isFilterable v="true" />
+          <isFilterable v="false" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
           <recordfield>CONTACT.PERSON_ID</recordfield>
-          <isFilterable v="true" />
+          <isFilterable v="false" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
@@ -1116,6 +1140,16 @@
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
       <name>index</name>
diff --git a/entity/Order_entity/entityfields/chosentexfooter/onValueChange.js b/entity/Order_entity/entityfields/chosentexfooter/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..051e2f35450b4e3dc34cf394ae788ff3e5e41511
--- /dev/null
+++ b/entity/Order_entity/entityfields/chosentexfooter/onValueChange.js
@@ -0,0 +1,9 @@
+import("DocumentTemplate_lib");
+import("system.vars");
+
+if (vars.get("$field.ChosenTexFooter"))
+{
+    let docTemp = DocumentTemplateUtils.getTemplate(vars.get("$field.ChosenTexFooter"))
+    
+    vars.set("$field.FOOTER", docTemp.getReplacedContent({}));
+}
diff --git a/entity/Campaign_entity/entityfields/tasks/stateProcess.js b/entity/Order_entity/entityfields/chosentexfooter/stateProcess.js
similarity index 53%
rename from entity/Campaign_entity/entityfields/tasks/stateProcess.js
rename to entity/Order_entity/entityfields/chosentexfooter/stateProcess.js
index e60e2b220695330a386489fe74c57214c290a483..1c74ad4debb5289ef37cc9e3251d9ad42797ae25 100644
--- a/entity/Campaign_entity/entityfields/tasks/stateProcess.js
+++ b/entity/Order_entity/entityfields/chosentexfooter/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-
-if (TaskUtils.hasTasks(vars.get("$field.CAMPAIGNID"), ContextUtils.getCurrentContextId()))
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+let state = vars.get("$sys.recordstate");
+
+if(state == neon.OPERATINGSTATE_NEW || state == neon.OPERATINGSTATE_EDIT)
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+else
     result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/chosentexheader/onValueChange.js b/entity/Order_entity/entityfields/chosentexheader/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..52d5a5b0e0286f65f8bab096e7c46e3b5ea2184a
--- /dev/null
+++ b/entity/Order_entity/entityfields/chosentexheader/onValueChange.js
@@ -0,0 +1,9 @@
+import("DocumentTemplate_lib");
+import("system.vars");
+
+if (vars.get("$field.ChosenTexHeader"))
+{
+    let docTemp = DocumentTemplateUtils.getTemplate(vars.get("$field.ChosenTexHeader"))
+    
+    vars.set("$field.HEADER", docTemp.getReplacedContent({}));
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/chosentexheader/stateProcess.js b/entity/Order_entity/entityfields/chosentexheader/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c74ad4debb5289ef37cc9e3251d9ad42797ae25
--- /dev/null
+++ b/entity/Order_entity/entityfields/chosentexheader/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+let state = vars.get("$sys.recordstate");
+
+if(state == neon.OPERATINGSTATE_NEW || state == neon.OPERATINGSTATE_EDIT)
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contactid_param/documentation.adoc b/entity/Order_entity/entityfields/contactid_param/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js
deleted file mode 100644
index 2351de155efc20f214326b6f0462709076c21edc..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/footer/valueProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("system.db");
-import("system.util");
-
-if (vars.get("$this.value") == null)
-{
-    if(vars.get("$this.value"))
-        result.string(vars.get("$this.value"));
-
-    else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-        result.string("Danke sehr:"); //TODO: translate
-
-    if (vars.get("$field.ChosenTexFooter") != "")
-    {
-        var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
-        .from("ASYS_BINARIES")
-        .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
-        .cell(true);
-                            
-        if (binaryId)
-            result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
-    }
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js
deleted file mode 100644
index 6b045a0397ae09744e85eb23b00ce6369114ce55..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/header/valueProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("system.db");
-import("system.util");
-
-if (vars.get("$this.value") == null)
-{
-    if(vars.get("$this.value"))
-        result.string(vars.get("$this.value"));
-
-    else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-        result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translation
-
-    if (vars.get("$field.ChosenTexHeader") != "")
-    {
-        var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
-        .from("ASYS_BINARIES")
-        .whereIfSet("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
-        .cell(true);
-                            
-        if (binaryId)
-            result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
-    }
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc b/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js b/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a1be2eeb8793a5807ad41bdded2b20b3d3b519e
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderitems/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"))
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..44cf00055adb79b0f8a573e12ded26e954c36f73
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
@@ -0,0 +1,30 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var updateStatements = [["SALESORDER", ["ORDERSTATUS"], db.getColumnTypes("SALESORDER", ["ORDERSTATUS"]), ["1"], newWhere("SALESORDER.SALESORDERID", vars.get("$field.SALESORDERID")).build()]];
+var notificationMsg = translate.text("The status of the order was changed to \"sent\".");
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = vars.get("$field.ORDER_REPORT_DATA");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = emailFilename.substring(0, emailFilename.indexOf(" ", 0));
+emailFilename = emailFilename + " " + orderNo;
+
+if (contactId == null || "") 
+    contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", notificationMsg, emailFilename, null, updateStatements);
diff --git a/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3411dae9c83f152623887db6ecc7ef26d12ae281
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orderStatus = vars.get("$field.ORDERSTATUS");
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (orderStatus == 1 || isOfferCancelled == 1) 
+    result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7538162cacd9d49220e1ded198b3293f6dc46564
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
@@ -0,0 +1,28 @@
+import("system.question");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orderReport = {};
+var attachmentArray = [];
+var contactId = vars.get("$field.CONTACT_ID");
+var orgContactId = vars.get("$field.CONTACT_ORG_ID");
+var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID"));
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
+emailFilename = translate.text("Reminder") + " " + orderNo;
+
+if (contactId == null || "") 
+    contactId = orgContactId;
+
+orderReport.content = reportData;
+orderReport.mimeType = MimeTypes.PDF();
+orderReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orderReport;
+
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", null, emailFilename, null, null);
diff --git a/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..211643d5aad46d3202a811668c8b5ad6bd7a0771
--- /dev/null
+++ b/entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var isOfferCancelled = vars.get("$field.CANCELLATION");
+
+if (isOfferCancelled == 1) 
+    result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/Order_entity/entityfields/testaction/onActionProcess.js b/entity/Order_entity/entityfields/testaction/onActionProcess.js
deleted file mode 100644
index 232cd1d9827ef64604fac11bbb1e06fa85b2da27..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/testaction/onActionProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.question");
-
-var r = vars.get("$field.#CONTENTTITLE");
-question.showMessage(r);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..647507498cf404c675a2a3225f36369d7012659d
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("SALESORDER.SALESORDERID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..371a5b567d5a947056b3aa0982100e741e66eb45
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
+
diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js
index e8aa2e80361037d578289ebf58e7c20672d08731..75ed9d1999b1e1b53073b2c6f99a368fb69cb874 100644
--- a/entity/Order_entity/recordcontainers/index/query.js
+++ b/entity/Order_entity/recordcontainers/index/query.js
@@ -17,8 +17,7 @@ var querySelect = newSelect([
     ])
     .from("SALESORDER")
     .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
-    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
-    .orderBy("SALESORDERCODE");
+    .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
                     
 if (vars.exists("$local.idvalue")) 
     querySelect.whereIfSet("SALESORDER.SALESORDERID", "$local.idvalue", SqlBuilder.IN());
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1c97f114691c109ed9fbaa97f151ceb5bc9a9ba3..b57569f1d2a480a25ab25d612b399dc1e3b98ca0 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -112,6 +112,7 @@
     </entityFieldGroup>
     <entityProvider>
       <name>Organisations</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisations/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -144,6 +145,12 @@
           <fieldName>OrganisationConsumer</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
+          <entityName>District_entity</entityName>
+          <fieldName>Organisations</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
@@ -166,6 +173,14 @@
           <name>AttributeId_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -615,6 +630,14 @@
           <name>ExcludedContactIds_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -629,6 +652,7 @@
     </entityParameter>
     <entityProvider>
       <name>WithAttribute</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/withattribute/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
@@ -665,6 +689,14 @@
           <name>ExcludedContactIds_param</name>
           <expose v="true" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityParameter>
@@ -879,7 +911,7 @@
     <entityActionGroup>
       <name>filterViewActionGroup</name>
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/documentation.adoc</documentation>
-      <title>Campaign</title>
+      <title>Serial Actions</title>
       <iconId>NEON:GROUP_APPOINTMENT</iconId>
       <children>
         <entityActionField>
@@ -955,8 +987,39 @@
       <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
     <entityProvider>
-      <name>SelfDuplicatesProvider</name>
+      <name>SelfDuplicates</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc</documentation>
       <titlePlural>Duplicates</titlePlural>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityParameter>
       <name>OnlyShowContactIds_param</name>
@@ -1022,7 +1085,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Organisation_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
+        <fieldName>SelfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -1102,13 +1165,13 @@
     </entityActionField>
     <entityActionField>
       <name>openLocation</name>
-      <title>Location</title>
+      <title>Open Location</title>
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openlocation/onActionProcess.js</onActionProcess>
       <iconId>NEON:TACKED</iconId>
     </entityActionField>
     <entityConsumer>
       <name>Classifications</name>
-      <refreshParent v="false" />
+      <refreshParent v="true" />
       <dependency>
         <name>dependency</name>
         <entityName>Classification_entity</entityName>
@@ -1143,7 +1206,7 @@
       <title>Count</title>
     </entityAggregateField>
     <entityField>
-      <name>CLASSIFICATIONSTORAGE_ID</name>
+      <name>CLASSIFICATIONVALUE</name>
       <title>Classification</title>
       <groupable v="true" />
     </entityField>
@@ -1230,7 +1293,110 @@
       <name>indexP</name>
       <documentation>%aditoprj%/entity/Organisation_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
+      <children>
+        <entityParameter>
+          <name>AttributeId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludeOrganisationsByPersonId</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterPreSet_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>WithPrivate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrganisationType_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>OrganisationResponsibles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrgUid_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>FilterPreSet_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityProvider>
+      <name>NonselfDuplicates</name>
+      <documentation>%aditoprj%/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>2e410b9e-5ebc-48ea-9562-da386202d7e8</name>
+          <entityName>Duplicates_entity</entityName>
+          <fieldName>DuplicateOrganisationsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AttributeKeyId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ExcludedContactIds_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityActionGroup>
+      <name>orgReportDispatch</name>
+      <children>
+        <entityActionField>
+          <name>dispatchOrgReport</name>
+          <title>Dispatch as mail</title>
+          <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js</onActionProcess>
+          <isObjectAction v="false" />
+          <iconId>VAADIN:AT</iconId>
+          <iconIdProcess>%aditoprj%/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js</iconIdProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1451,7 +1617,7 @@
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
-          <name>CLASSIFICATIONSTORAGE_ID.value</name>
+          <name>CLASSIFICATIONVALUE.value</name>
           <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
@@ -1491,6 +1657,14 @@
           <groupQueryProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorites_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
@@ -1577,7 +1751,7 @@
           <additionalFieldNameAliases>
             <element>email</element>
           </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <isMultiValued v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
@@ -1585,7 +1759,7 @@
           <additionalFieldNameAliases>
             <element>phone</element>
           </additionalFieldNameAliases>
-          <isMultiValued v="true" />
+          <isMultiValued v="false" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>ADDRESS_ID.displayValue</name>
diff --git a/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js b/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
deleted file mode 100644
index f7db7e7050addd11b9d00962df938b3586435a4b..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/classificationstorage_id/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//import("Sql_lib");
-//import("system.result");
-//import("system.vars");
-//
-//var classification = newSelect("CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE")
-//                                .from("CLASSIFICATIONSTORAGE")
-//                                .where("CLASSIFICATIONSTORAGE.OBJECT_ROWID", vars.get("$field.ORGANISATIONID"))
-//                                .cell();
-//                                
-//result.string(classification);
diff --git a/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js b/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a1c0fcc1293fa4bf37109294829055704eeaea
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
index 3debf6e5a411498dcc79de79dd99d096789e1b40..c9289cbd0ef896d7dbcf5eae668bac8a87e861da 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
@@ -4,7 +4,7 @@ import("DuplicateScanner_lib");
 
 let sourceContactId = vars.get("$param.DuplicateCurrentContactId_param");
 let selectedContactId = vars.get("$sys.selection");
-let clusterId = DuplicateScannerUtils.GetClusterId(sourceContactId);
-DuplicateScannerUtils.CreateUnrelatedDuplicateRelation(sourceContactId, selectedContactId, clusterId);
+let clusterId = DuplicateScannerUtils.getClusterId(sourceContactId);
+DuplicateScannerUtils.createUnrelatedDuplicateRelation(sourceContactId, selectedContactId, clusterId);
 
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
index 7b3385b5bb2a6c157f448751e2670f696a349dec..99d7f55925b3fed54dc2d5e20604793b6e9fd862 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
@@ -5,16 +5,16 @@ import("DuplicateScanner_lib");
 import("system.notification");
 
 let contactId = vars.get("$field.CONTACTID");
-let clusterId = DuplicateScannerUtils.GetClusterId(contactId);
+let clusterId = DuplicateScannerUtils.getClusterId(contactId);
 
-let duplicateContactIdsInClusterRay = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterId)
+let duplicateContactIdsInClusterRay = DuplicateScannerUtils.getCachedDuplicatesForClusterId(clusterId)
 
 if(duplicateContactIdsInClusterRay.length > 1)
 {
     let referenceDuplicateId = duplicateContactIdsInClusterRay[0];
     for (let i = 1; i < duplicateContactIdsInClusterRay.length; i++) 
     {
-        DuplicateScannerUtils.CreateUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
+        DuplicateScannerUtils.createUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
     }
 }
 
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
index 5b61fa56b4a367c5d2c80f2d90aa249fa2033b11..29dab7b72c8898044cfabd79426552733f9f7dc4 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
@@ -4,17 +4,17 @@ import("system.neon");
 import("DuplicateScanner_lib");
 
 let sourceContactId = vars.get("$param.DuplicateCurrentContactId_param");
-let targetContactId = vars.get("$sys.selection");
+let targetContactId = vars.get("$sys.selection")[0];
 
 //todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user.
-let mergeSuccess = DuplicateScannerUtils.MergeOrganisation(sourceContactId, targetContactId);
+let mergeSuccess = DuplicateScannerUtils.mergeOrganisation(sourceContactId, targetContactId);
 
 if(mergeSuccess)
 {
     let currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";
-    DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
+    DuplicateScannerUtils.createMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
     
     neon.openContext("Organisation", "OrganisationMain_view", [targetContactId], neon.OPERATINGSTATE_VIEW, null)
 }
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
index 0e9b9c71d1fd0afe45f331d3122d07d7de7c4187..1f3a9e3ddfca04ca5911fd70b734115ff1f60291 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
@@ -5,16 +5,16 @@ import("system.neon");
 import("DuplicateScanner_lib");
 
 let targetContactId = vars.get("$param.DuplicateCurrentContactId_param");
-let sourceContactId = vars.get("$sys.selection");
+let sourceContactId = vars.get("$sys.selection")[0];
 
 //todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user.
-let mergeSuccess = DuplicateScannerUtils.MergeOrganisation(sourceContactId, targetContactId);
+let mergeSuccess = DuplicateScannerUtils.mergeOrganisation(sourceContactId, targetContactId);
 
 if(mergeSuccess)
 {
     let currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";
-    DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
+    DuplicateScannerUtils.createMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
     neon.refreshAll();
 }
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index 9a2a483e4cc5785a6bf242a7494ee30c3ab9b554..328ef725e8d1c646a39e15a2dfaa78a626b2a424 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,14 +1,4 @@
 import("Bulkmail_lib");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)     //if data selected -> use selected data
-{
-    BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
-}
-else                            //else -> use Filtercondition
-{
-    let sysFilter = vars.get("$sys.filter");
-    BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
+BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 81097eaaf9c8078380bb8851862b38e18fb1abf1..7790d58dc46f1ad3c1e72cb0d6071c4de68c1b87 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
-var contactCount = vars.get("$sys.datarowcount");
+var orgCount = vars.get("$sys.datarowcount");
 
-result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(orgCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index 98d07ed94330546f78f2e51c304d9e0faf664903..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index dc03abb3d725bdf059ac78f6079a3c3214debd2e..b63a795571569ecce46daef549b6f98b9629b896 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,14 +1,4 @@
 import("Bulkmail_lib");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)     //if data selected -> use selected data
-{
-    SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
-}
-else                            //else -> use Filtercondition
-{
-    let sysFilter = vars.get("$sys.filter");
-    SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
\ No newline at end of file
+SerialLetterUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index 81097eaaf9c8078380bb8851862b38e18fb1abf1..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
index 669533224153cb9af9dad27f4f82ef833db79d13..7fc578ee7942eeb948f08d3dd86f5950d3fa1c41 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -1,7 +1,7 @@
 import("system.result");
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-result.string(FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
index 3909fcec58d0904fdc3644ef78dbb9131439e3e2..a46efc111ddcfd413f0dcfff1c46e9fc6562b64e 100644
--- a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
@@ -1,4 +1,5 @@
 import("system.vars");
 import("Email_lib");
+import("KeywordRegistry_basic");
 
-EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"));
\ No newline at end of file
+EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..dc35980c12405163da2417e0472197dd9e3c7285
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation duplicate-records without the `Organisation_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
index df10e3d43cfd649a3a95833381cf4e01c998eaa4..3195ea511537f5489d464785e31280bae8a33044 100644
--- a/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js
@@ -2,16 +2,8 @@ import("system.entities");
 import("system.vars");
 import("system.neon");
 
-var rowConfig = entities.createConfigForLoadingRows()
-    .fields(["STANDARD_LAT", "STANDARD_LON"])
-    .entity("Organisation_entity")
-//    .entity(vars.get("$sys.currententityname"))
-    .uid(vars.get("$sys.uid"));
-var row = entities.getRow(rowConfig);
-
-//todo: use read entity and comment why (data is not loaded)
-var lat = row["STANDARD_LAT"];
-var lon = row["STANDARD_LON"];
+var lat = vars.get("$field.STANDARD_LAT");
+var lon = vars.get("$field.STANDARD_LON");
 
 var params = {
     OriginUid_param: vars.get("$sys.uid"),
diff --git a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
index a2899dea4da93e2bb956bb7a10c91fadb365f9a9..39ffb62cfad100c0445559302c9536ca5d805f5b 100644
--- a/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
+++ b/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js
@@ -3,25 +3,16 @@ import("system.neon");
 import("system.vars");
 import("system.entities");
 
-//todo: only visible if location tracking is enabled
+var recordState = vars.get("$sys.operatingstate");
+var res = neon.COMPONENTSTATE_DISABLED;
+if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT)
+{
+    var lat = vars.get("$field.STANDARD_LAT");
+    var lon = vars.get("$field.STANDARD_LON");
 
+    if (lat && lon)
+        res = neon.COMPONENTSTATE_AUTO;
+}
 
-//todo: use read entity and comment why (data is not loaded)
-
-var rowConfig = entities.createConfigForLoadingRows()
-    .fields(["STANDARD_LAT", "STANDARD_LON"])
-    .entity(vars.get("$sys.currententityname"))
-    .uid(vars.get("$sys.uid"));
-var row = entities.getRow(rowConfig);
-
-var lat = row["STANDARD_LAT"];
-var lon = row["STANDARD_LON"];
-
-var res;
-if (lat && lon)
-    res = neon.COMPONENTSTATE_AUTO;
-else
-    res = neon.COMPONENTSTATE_DISABLED;
-    
 result.string(res);
     
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisations/documentation.adoc b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..69b5814ae97b11439a61bf8cff2886154f0db896
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/organisations/documentation.adoc
@@ -0,0 +1 @@
+Provides several organisation contacts for basic use cases.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0d420de9957b538e4cf051771601c318fac5702
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/iconIdProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+import("KeywordRegistry_basic");
+
+var orgStatus = vars.get("$field.STATUS");
+
+if (orgStatus == $KeywordRegistry.contactStatus$inactive())
+    result.string(COMPONENTSTATE_DISABLED);
diff --git a/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca54b8d0ce3503663165304eea9856fae5ff423c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
@@ -0,0 +1,24 @@
+import("system.logging");
+import("Organisation_lib");
+import("system.translate");
+import("system.vars");
+import("system.db");
+import("MimeType_lib");
+import("Email_lib");
+import("Order_lib");
+import("Sql_lib");
+
+var orgReport = {};
+var attachmentArray = [];
+var reportData = vars.get("$field.ORGANISATION_REPORT_DATA");
+var orgContactId = vars.get("$field.CONTACTID");
+var emailFilename = vars.get("$field.#CONTENTTITLE");
+emailFilename = translate.text("Customer Base Sheet") + " " + emailFilename;
+
+orgReport.content = reportData;
+orgReport.mimeType = MimeTypes.PDF();
+orgReport.filename = emailFilename + ".pdf";
+
+attachmentArray[0] = orgReport;
+
+EmailWritingUtils.sendReportAsMail(orgContactId, attachmentArray, "Organisation", null, emailFilename, null, null);
diff --git a/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..396162acb9e2db72c8c1090f4fdda9eb84a95738
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides organisation duplicate-records within the `Organisation_entity` scope itself.
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js b/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
index 30b7732937f200956ed88f41b8a4665f37953aad..849632882bbabd4e65dfb25c7dc984366bde5116 100644
--- a/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
 import("system.result");
 import("DuplicateScanner_lib");
 
-let unrelatedIds = DuplicateScannerUtils.GetUnrelatedRelationsForDuplicate(vars.get("$field.CONTACTID"));
+let unrelatedIds = DuplicateScannerUtils.getUnrelatedRelationsForDuplicate(vars.get("$field.CONTACTID"));
 result.string(JSON.stringify(unrelatedIds));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js b/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
index 27d043515ab626d29f0d3453c64ed6c053c8b2a9..77f449d52a0995e5bb7e8ba94746a1659bf36001 100644
--- a/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
@@ -36,7 +36,7 @@ else
     //don't search if only the id field has a value
     var fieldsToCheck = Object.keys(valuesToCheck);
     if (!(fieldsToCheck.length === 0 || (fieldsToCheck.length === 1 && entityFieldsToLoad.entityIdField in valuesToCheck)))
-        scanResults = DuplicateScannerUtils.ScanForDuplicates(scannerName, targetEntity, valuesToCheck, null) || [];
+        scanResults = DuplicateScannerUtils.scanForDuplicates(scannerName, targetEntity, valuesToCheck, null) || [];
     
     var duplicateIds = scanResults.map(function (scanResult)
     {
diff --git a/entity/Organisation_entity/entityfields/withattribute/documentation.adoc b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4b77444176abf29b2f460c1798d04e459b079dee
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/withattribute/documentation.adoc
@@ -0,0 +1,3 @@
+Provides organisation contacts where one attribute has a specific, given value.
+
+Use case: "give me all organizations where loyalty has the value high".
\ No newline at end of file
diff --git a/entity/Organisation_entity/initFilterProcess.js b/entity/Organisation_entity/initFilterProcess.js
index dccabf9d95be287466b9da7ca74205609bb11900..936a623f599055fc4fb5fa81c850fc7d323bff22 100644
--- a/entity/Organisation_entity/initFilterProcess.js
+++ b/entity/Organisation_entity/initFilterProcess.js
@@ -4,10 +4,16 @@ import("Keyword_lib");
 import("KeywordRegistry_basic");
 import("system.result");
 
-if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
+var filter = vars.get("$param.FilterPreSet_param");
+
+var res;
+if (filter)
+    res = filter;
+else if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER) 
 {
     var statusInactive = $KeywordRegistry.contactStatus$inactive();
-    var filter = {
+    
+    filter = {
         type: "group",
         operator: "AND",
         childs: [{
@@ -19,6 +25,8 @@ if (vars.get("$sys.presentationmode") === neon.CONTEXT_PRESENTATIONMODE_FILTER)
             value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
         }]
     };
+    res = JSON.stringify(filter);
+}
 
-    result.string(JSON.stringify(filter));
-}
\ No newline at end of file
+if (res)
+    result.string(res);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 2891a3cdf09d46edb998f7ce2f36861779d283c3..7ef4fdefa4f6e4dcb25f9b97086b5a1e943e0dda 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -51,7 +51,7 @@ if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSup
         .where("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
         .and("AB_ATTRIBUTERELATION.OBJECT_ROWID = CONTACT.CONTACTID")
         .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", $AttributeRegistry.responsibleADsupervisor())
-        .and("AB_ATTRIBUTERELATION." + $AttributeTypes.OBJECTSELECTION.databaseField, EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId())),
+        .and("AB_ATTRIBUTERELATION." + AttributeTypes.OBJECTSELECTION.databaseField, EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId())),
         SqlBuilder.EXISTS()
     );
 }
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
index 343227e54a7b289f7954ede7bbe7f405a2890e40..768e6ca7501cdd94caba44242bd5d9f1b3c76859 100644
--- a/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -2,22 +2,29 @@ import("system.translate");
 import("Sql_lib");
 import("system.result");
 import("system.vars");
-import("system.logging");
-logging.log("classificationgroup_filter.groupQueryProcess");
+
 var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
 var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see also AttributeFilter_lib
 var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
 var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
 var order = vars.get("$local.order");               // The order of the result
-var classificationId = vars.get("$local.name");
-classificationId = classificationId.slice(classificationId.lastIndexOf(".") + 1, classificationId.length);
+var name = vars.get("$local.name");
 
 var stmt = newSelect(isCount ? groupedColumns : columns)
-                    .from("ORGANISATION")
-                    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
-                    .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
-                    .where(condition)
-                    .groupBy(groupedColumns)
-                    .toString();
-                    
+    .from("ORGANISATION")
+    .join("CONTACT", "ORGANISATIONID = ORGANISATION_ID  and PERSON_ID is null")
+    .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID and OBJECT_TYPE = 'Organisation'")
+
+if (condition)
+{
+    condition = condition.trim();
+    if (condition)
+        stmt.where(condition);
+}
+    
+if (order)
+    stmt.orderBy(order);
+
+stmt.groupBy(groupedColumns);
+stmt = stmt.toString();
 result.string(stmt);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d42520a347c8e8d594fb1af389acb8af1a2e824c
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js
@@ -0,0 +1,19 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+{        
+    var orga_id = new SqlBuilder().select("CONTACT.ORGANISATION_ID")
+        .from("CONTACT")
+        .where(newWhere("CONTACT.CONTACTID", rowIds[i]))
+        .arrayColumn();
+
+    if(orga_id.length > 0)
+        favoFilterCond.or("ORGANISATION.ORGANISATIONID", orga_id[0], SqlBuilder.EQUAL());
+}
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js b/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..371a5b567d5a947056b3aa0982100e741e66eb45
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
+
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index 4286e03eb2abd75c156c4b4c45eda9f16f8e084e..730c29c8f1984d5ebc75d045a5ee75779f13a204 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -7,7 +7,7 @@ import("Attribute_lib");
 
 // TODO: enable when duplicate-module is finalized
 let contactId = vars.get("$field.CONTACTID");
-DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
+DuplicateScannerUtils.deleteCachedDuplicate(contactId);
 
 new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
diff --git a/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
index a8964d11609060d4990dc463b161fc0f799451e3..2e99541610153a900943ae006d5c646bba213374 100644
--- a/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/index/patternExtensionProcess.js
@@ -2,7 +2,6 @@ import("Entity_lib");
 import("system.result");
 import("system.vars");
 import("system.indexsearch");
-import("system.logging");
 
 var patternConfig = indexsearch.createPatternConfig();
 
@@ -23,5 +22,4 @@ ParameterUtils.handleNotEmptyEntityParam("$param.OnlyShowContactIds_param", func
 });
 
 var pattern = indexsearch.buildPattern(patternConfig);
-logging.log("Pattern:" + pattern);
 result.string(pattern);
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index e860656afa302d7770bf1415039757fa9d833d48..2d434dc250ffc55f3a17d7dfc6994f29dc86f083 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -1,3 +1,4 @@
+import("Organisation_lib");
 import("KeywordRegistry_basic");
 import("system.translate");
 import("system.result");
@@ -15,17 +16,18 @@ You may want to check out if your change affects other modules. However adding m
  */
 
 var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var commMediumMailIds = CommUtil.getMediumIdsByCategory("EMAIL");
 var sqlHelper = new SqlMaskingUtils();
 var querySelect = newSelect([
         "CONTACT.CONTACTID",
         sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
         sqlHelper.concat([
-            sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
-                ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+            sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO", "'-'"
+                ,"standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"]),
             sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
             sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
         ], " | "),
-        sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
+        sqlHelper.concat([sqlHelper.cast("standardAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("standardAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
         //additional indexed fields
         "ORGANISATION.NAME",
         sqlHelper.trim("ORGANISATION.ORGANISATIONID"),//trim to enable filter patterns like: >> -organisationid_value:0<<
@@ -35,22 +37,30 @@ var querySelect = newSelect([
         "ADDRESS.COUNTRY",
         "ADDRESS.ZIP",
         "ADDRESS.CITY",
-        "COMMUNICATION.ADDR",
-        "PHONE.ADDR",
-        sqlHelper.concat([sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
-            ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+        "standardEmail.ADDR",
+        "standardPhone.ADDR",
+        sqlHelper.concat([sqlHelper.concat(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO"])
+            ,sqlHelper.concat(["standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"])
         ], " - ")
     ])
     .from("ORGANISATION")
     .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
-    .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+    .leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
     .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
     .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-    .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
-        .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
-    .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL());
+    //standardMail is not multi valued and can only old one value (the standard email address)
+    .leftJoin("COMMUNICATION", newWhere("standardEmail.CONTACT_ID = CONTACT.CONTACTID")
+            .and(["COMMUNICATION", "MEDIUM_ID", "standardEmail"], commMediumMailIds, SqlBuilder.IN())
+            .and(["COMMUNICATION", "ISSTANDARD", "standardEmail"], "1")
+        , "standardEmail")
+    //standardPhone is not multi valued and can only old one value (the standard phone number)
+    .leftJoin("COMMUNICATION", newWhere("standardPhone.CONTACT_ID = CONTACT.CONTACTID")
+            .and(["COMMUNICATION", "MEDIUM_ID", "standardPhone"], commMediumPhoneIds, SqlBuilder.IN())
+            .and(["COMMUNICATION", "ISSTANDARD", "standardPhone"], "1")
+        , "standardPhone")
+    .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
+    .and("ORGANISATION.ORGANISATIONID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL());
 
 if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
     querySelect.and("CONTACT.CONTACTID", "$local.idvalue");
-
 result.string(querySelect.toString());
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/onValueChange.js
index 714a30b4159e8dfcf13452e77ea8d64ee5e7435c..701342d4f8a50313dcd27555d35c8349bd1cfb95 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/onValueChange.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/onValueChange.js
@@ -4,10 +4,14 @@ import("system.vars");
 let userRowIdVal = vars.getString("$field.PERMISSIONDEALER_USER_ROWID.val");
 let departmentRowIdVal = vars.getString("$field.PERMISSIONDEALER_DEPARTMENT_ROWID.val");
 
-if (userRowIdVal != departmentRowIdVal){
-    vars.set("$field.PERMISSIONDEALER_USER_ROWID", departmentRowIdVal);
+if (departmentRowIdVal) 
+{
+    if (userRowIdVal != departmentRowIdVal){
+        vars.set("$field.PERMISSIONDEALER_USER_ROWID", departmentRowIdVal);
+    }
+
+    vars.set("$field.permissionDealer_rowId", departmentRowIdVal);
 }
 
-vars.set("$field.permissionDealer_rowId", departmentRowIdVal);
 
     
\ No newline at end of file
diff --git a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js
index e00a1752425fa7354cadf350b946b97b54921117..f1f8090d6981f300ef7b60f47585bef5c0d951c2 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/onValueChange.js
@@ -4,7 +4,9 @@ import("system.vars");
 let user_rowId_val = vars.getString("$field.PERMISSIONDEALER_USER_ROWID.val");
 let department_rowId_val = vars.getString("$field.PERMISSIONDEALER_DEPARTMENT_ROWID.val");
 
-if (user_rowId_val != department_rowId_val){
-    // Caution indireckt call of PERMISSIONDEALER_DEPARTMENT_ROWID.onValueChange
-    vars.set("$field.PERMISSIONDEALER_DEPARTMENT_ROWID", user_rowId_val);
-}
\ No newline at end of file
+if (user_rowId_val){
+    if (user_rowId_val != department_rowId_val){
+        // Caution indireckt call of PERMISSIONDEALER_DEPARTMENT_ROWID.onValueChange
+        vars.set("$field.PERMISSIONDEALER_DEPARTMENT_ROWID", user_rowId_val);
+    }
+}
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
index a10a281ce5afe63ce87eef4c182927d89f050e80..73a8618c766336d24bce043225c5c381280f1979 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js
@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
 import("system.neon");
 import("system.vars");
 
-if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$this.value") && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
     vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$department());
diff --git a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
index 03e9dfdfd7c8d982cc7dbb1234319342be9e439b..436506066a4135f2e52cb7d9bba4ab0b1bb0cb9e 100644
--- a/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
+++ b/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js
@@ -2,7 +2,7 @@ import("KeywordRegistry_basic");
 import("system.neon");
 import("system.vars");
 
-if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$this.value") && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
     vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$user());
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6215388cf055883064b22679c2ab20dbb367015f..58638d3e713eb98aea31d9c1cc4f8d4fab871083 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -116,6 +116,7 @@
     </entityField>
     <entityProvider>
       <name>OrganisationRelated</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/organisationrelated/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -138,6 +139,10 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -322,6 +327,10 @@
           <name>AssignmentTable_param</name>
           <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>DisallowCreate_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityParameter>
@@ -345,6 +354,7 @@
     </entityFieldGroup>
     <entityProvider>
       <name>Contact</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
@@ -372,6 +382,14 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -687,6 +705,7 @@
     </entityParameter>
     <entityProvider>
       <name>Contacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/contacts/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
@@ -722,6 +741,10 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityConsumer>
@@ -901,7 +924,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Person_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
+        <fieldName>SelfDuplicates</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -949,6 +972,7 @@
     </entityField>
     <entityProvider>
       <name>QuickEntryContacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc</documentation>
       <titlePlural>Additional Contacts</titlePlural>
       <dependencies>
         <entityDependency>
@@ -971,6 +995,14 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityActionField>
@@ -1013,7 +1045,7 @@
     <entityActionGroup>
       <name>filterViewActionGroup</name>
       <documentation>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/documentation.adoc</documentation>
-      <title>Campaign</title>
+      <title>Serial Actions</title>
       <iconId>NEON:GROUP_APPOINTMENT</iconId>
       <children>
         <entityActionField>
@@ -1146,25 +1178,10 @@
       <name>OnlyShowContactIds_param</name>
       <expose v="true" />
     </entityParameter>
-    <entityConsumer>
-      <name>SelfDuplicates</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>SelfDuplicatesProvider</fieldName>
-      </dependency>
-    </entityConsumer>
     <entityProvider>
-      <name>SelfDuplicatesProvider</name>
+      <name>SelfDuplicates</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/selfduplicates/documentation.adoc</documentation>
       <titlePlural>Duplicates</titlePlural>
-      <dependencies>
-        <entityDependency>
-          <name>f6d16008-1764-4920-8ea5-c95c6a67f508</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>SelfDuplicates</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
       <children>
         <entityParameter>
           <name>OnlyShowContactIds_param</name>
@@ -1174,6 +1191,18 @@
           <name>OnlyActive_param</name>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -1213,6 +1242,7 @@
     </entityActionField>
     <entityProvider>
       <name>IdFilteredActiveContacts</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
@@ -1270,6 +1300,12 @@
       <name>indexP</name>
       <documentation>%aditoprj%/entity/Person_entity/entityfields/indexp/documentation.adoc</documentation>
       <recordContainer>index</recordContainer>
+      <children>
+        <entityParameter>
+          <name>DuplicateActionsControl_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
     </entityProvider>
     <entityField>
       <name>PERSON_OBJECTTYPE</name>
@@ -1279,6 +1315,72 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>Districts</name>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/districts/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>District_entity</entityName>
+        <fieldName>ResponsibleDistricts</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DistrictsByContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityProvider>
+      <name>NonselfDuplicates</name>
+      <documentation>%aditoprj%/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc</documentation>
+      <dependencies>
+        <entityDependency>
+          <name>3a4352e2-9686-4c52-9d01-dbfad8c68ea7</name>
+          <entityName>Duplicates_entity</entityName>
+          <fieldName>DuplicatePersonsConsumer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>DuplicateCurrentContactId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyShowContactIds_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>OrgId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyOwnSupervised_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityConsumer>
+      <name>DistrictResponsibles</name>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js</stateProcess>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DistrictResponsible_entity</entityName>
+        <fieldName>OrganisationResponsibles</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>OrgUid_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1569,6 +1671,10 @@
           <recordfield>PERSON.PERSONID</recordfield>
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
+        <dbRecordFieldMapping>
+          <name>STATUS.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
@@ -1578,6 +1684,14 @@
           <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorites_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Person_entity/entityfields/contact/documentation.adoc b/entity/Person_entity/entityfields/contact/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e289ce718031c5d07bee51e625d4e1d1102b5a99
--- /dev/null
+++ b/entity/Person_entity/entityfields/contact/documentation.adoc
@@ -0,0 +1 @@
+Provides excactly one or none person contact.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/contacts/documentation.adoc b/entity/Person_entity/entityfields/contacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ee825691906f33196684266c31015c9e11d7bee3
--- /dev/null
+++ b/entity/Person_entity/entityfields/contacts/documentation.adoc
@@ -0,0 +1 @@
+Provides several person contacts.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js b/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9bae30ceb90f4556e7b3044e3d02abb3d8691eb2
--- /dev/null
+++ b/entity/Person_entity/entityfields/districtresponsibles/children/orguid_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+
+
+if (vars.exists("$field.ORGANISATION_CONTACTID") && vars.get("$field.ORGANISATION_CONTACTID"))
+{
+    result.string(vars.get("$field.ORGANISATION_CONTACTID"));
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js b/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b51996c159548e16d62f4eec7568e089f142022
--- /dev/null
+++ b/entity/Person_entity/entityfields/districtresponsibles/stateProcess.js
@@ -0,0 +1,9 @@
+import("Employee_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$field.ORGANISATION_CONTACTID") && !EmployeeUtils.isUser(vars.get("$field.CONTACTID")))
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e32550b2a4545aad0e9ae8c08bcc5ee36bbda80a
--- /dev/null
+++ b/entity/Person_entity/entityfields/districts/children/districtsbycontactid_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+var contactId = vars.get("$field.CONTACTID");
+if (EmployeeUtils.isUser(contactId)) 
+{
+    result.string(contactId);
+} 
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/districts/stateProcess.js b/entity/Person_entity/entityfields/districts/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..813a3a0226dc760600114ed45a044971c4d4245d
--- /dev/null
+++ b/entity/Person_entity/entityfields/districts/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+
+if (EmployeeUtils.isUser(vars.get("$field.CONTACTID")))
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js b/entity/Person_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/Person_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
index 3debf6e5a411498dcc79de79dd99d096789e1b40..c9289cbd0ef896d7dbcf5eae668bac8a87e861da 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/ignoreduplicate/onActionProcess.js
@@ -4,7 +4,7 @@ import("DuplicateScanner_lib");
 
 let sourceContactId = vars.get("$param.DuplicateCurrentContactId_param");
 let selectedContactId = vars.get("$sys.selection");
-let clusterId = DuplicateScannerUtils.GetClusterId(sourceContactId);
-DuplicateScannerUtils.CreateUnrelatedDuplicateRelation(sourceContactId, selectedContactId, clusterId);
+let clusterId = DuplicateScannerUtils.getClusterId(sourceContactId);
+DuplicateScannerUtils.createUnrelatedDuplicateRelation(sourceContactId, selectedContactId, clusterId);
 
 neon.refreshAll();
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
index 7369a35ba7478903544f94a445a71f02b10af400..f74997cb1d72c3baa56b1dd12a42ba77eb782769 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/ignorewholecluster/onActionProcess.js
@@ -6,16 +6,16 @@ import("system.notification");
 
 let contactId = vars.get("$field.CONTACTID");
 logging.log("contactId -> " + contactId);
-let clusterId = DuplicateScannerUtils.GetClusterId(contactId);
+let clusterId = DuplicateScannerUtils.getClusterId(contactId);
 logging.log("clusterId -> " + clusterId);
-let duplicateContactIdsInClusterRay = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterId)
+let duplicateContactIdsInClusterRay = DuplicateScannerUtils.getCachedDuplicatesForClusterId(clusterId)
 logging.log("duplicateContactIdsInClusterRay -> " + duplicateContactIdsInClusterRay);
 if(duplicateContactIdsInClusterRay.length > 1)
 {
     let referenceDuplicateId = duplicateContactIdsInClusterRay[0];
     for (let i = 1; i < duplicateContactIdsInClusterRay.length; i++) 
     {
-        DuplicateScannerUtils.CreateUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
+        DuplicateScannerUtils.createUnrelatedDuplicateRelation(referenceDuplicateId, duplicateContactIdsInClusterRay[i], clusterId);
     }
     neon.refreshAll();
     
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
index 648ecdcc39a88b74966045e32a9fbb3d7fdb707c..d5f864db525910dd0635ee2ab84279e3346599b6 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.tools");
 import("Employee_lib");
 import("system.vars");
 import("system.neon");
@@ -7,14 +8,20 @@ var sourceContactId = vars.get("$param.DuplicateCurrentContactId_param");
 var targetContactId = vars.get("$sys.selection")[0];
 
 //todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user.
-var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetContactId);
+var mergeSuccess = DuplicateScannerUtils.mergePerson(sourceContactId, targetContactId);
 
 if(mergeSuccess)
 {
+    var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+    
+    if (user) {
+    user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+    tools.updateUser(user);
+    }
     var currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";
-    DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
+    DuplicateScannerUtils.createMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
 
     neon.openContext("Person", "PersonMain_view", [targetContactId], neon.OPERATINGSTATE_VIEW, null)
 }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
index 651c632fb2984ebc04e2c764444545bf75f02562..2930a65370d53abee83d106cae30b08daf67146d 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.tools");
 import("system.db");
 import("Employee_lib");
 import("KeywordRegistry_basic");
@@ -11,14 +12,20 @@ var sourceContactIdArray = vars.get("$sys.selection");
 var sourceContactId = sourceContactIdArray[0];
 
 //todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user.
-var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetContactId);
+var mergeSuccess = DuplicateScannerUtils.mergePerson(sourceContactId, targetContactId);
 
 if(mergeSuccess)
 {
+    var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+    
+    if (user) {
+    user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+    tools.updateUser(user);
+    }
     var currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";
-    DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
+    DuplicateScannerUtils.createMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
 // openContext due to the fact, that openContext will lead to an error 'due'cause it's trying to load the already opened preview 
 // of the duplicateContact which just got deleted = nullpointException
     neon.openContext("Person", null, [targetContactId], neon.OPERATINGSTATE_VIEW, null, null);
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index ead03187df10951374645e8b1c8a7515b27f1a76..328ef725e8d1c646a39e15a2dfaa78a626b2a424 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,14 +1,4 @@
 import("Bulkmail_lib");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)     //if data selected -> use selected data
-{
-    BulkMailUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
-}
-else                            //else -> use Filtercondition
-{
-    let sysFilter = vars.get("$sys.filter");
-    BulkMailUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
\ No newline at end of file
+BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
index 98d07ed94330546f78f2e51c304d9e0faf664903..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
index 98d07ed94330546f78f2e51c304d9e0faf664903..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index dc03abb3d725bdf059ac78f6079a3c3214debd2e..b63a795571569ecce46daef549b6f98b9629b896 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,14 +1,4 @@
 import("Bulkmail_lib");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)     //if data selected -> use selected data
-{
-    SerialLetterUtils.addParticipantsByRowIds(JSON.stringify(sysSelection));
-}
-else                            //else -> use Filtercondition
-{
-    let sysFilter = vars.get("$sys.filter");
-    SerialLetterUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
-}
\ No newline at end of file
+SerialLetterUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
index 98d07ed94330546f78f2e51c304d9e0faf664903..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
index 98d07ed94330546f78f2e51c304d9e0faf664903..a1d1a7a758fb60e39ce6e294ef1c74fc4ff3b344 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/stateProcess.js
@@ -1,7 +1,7 @@
-import("FilterviewMenuAction_lib");
+import("FilterViewAction_lib");
 import("system.vars");
 import("system.result");
 
 var contactCount = vars.get("$sys.datarowcount");
 
-FilterviewMenuActionUtils.getComponentStateByRowCount(contactCount);
\ No newline at end of file
+result.string(FilterViewActionUtils.getComponentStateByRowCount(contactCount));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d9bacf98343c207f38487a774be4c8361470bd3f
--- /dev/null
+++ b/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides person contacts that are active (default) and excludes contacts with given IDs. 
+
+This is useful for lists where person contacts can be chosen only once.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newemail/onActionProcess.js b/entity/Person_entity/entityfields/newemail/onActionProcess.js
index f4fedc1dc3c525360d5572683060ea4ca1c372f6..a4b80166ed668dd700c51c1429cae7aa647edff5 100644
--- a/entity/Person_entity/entityfields/newemail/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newemail/onActionProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("Email_lib");
+import("KeywordRegistry_basic");
 
-EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"));
 
+EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d7964dadc0c8a8c7d5ea6856c3b82d07ccbcc361
--- /dev/null
+++ b/entity/Person_entity/entityfields/nonselfduplicates/documentation.adoc
@@ -0,0 +1,3 @@
+Provides contact duplicate-records without the `Person_entity` scope, for example for the `Duplicates_entity`.
+
+The provider is named `NonselfDuplicates` to differentiate this provider and the `SelfDuplicates`-provider.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisationrelated/documentation.adoc b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d3ad0acc86fc948d76e1983846d1e3cbdfc93899
--- /dev/null
+++ b/entity/Person_entity/entityfields/organisationrelated/documentation.adoc
@@ -0,0 +1 @@
+Provides person contacts for one specific (given) organisation.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e512d6ef8e14a2e1fbeec41e4ff9b53bf3051f61
--- /dev/null
+++ b/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc
@@ -0,0 +1,3 @@
+Provides the `Person_entity` for the Quickinsert-use-case:
+
+The `Quickinsert_entity` is only used to create new records, not to update, delete or show them.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/selfduplicates/documentation.adoc b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4f02d8b1a256bb4d0a791bab46cf0cda23790c84
--- /dev/null
+++ b/entity/Person_entity/entityfields/selfduplicates/documentation.adoc
@@ -0,0 +1 @@
+Provides contact duplicate-records within the `Person_entity` scope itself.
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js b/entity/Person_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
index 30b7732937f200956ed88f41b8a4665f37953aad..849632882bbabd4e65dfb25c7dc984366bde5116 100644
--- a/entity/Person_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/selfduplicatesuncached/children/excludedcontactids_param/valueProcess.js
@@ -3,5 +3,5 @@ import("system.vars");
 import("system.result");
 import("DuplicateScanner_lib");
 
-let unrelatedIds = DuplicateScannerUtils.GetUnrelatedRelationsForDuplicate(vars.get("$field.CONTACTID"));
+let unrelatedIds = DuplicateScannerUtils.getUnrelatedRelationsForDuplicate(vars.get("$field.CONTACTID"));
 result.string(JSON.stringify(unrelatedIds));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js b/entity/Person_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
index ce8253a306e0c1bc08dbca4b7e344a68518bf2a0..8fa370156eae601ebddb1f7b6f024650a156de52 100644
--- a/entity/Person_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/selfduplicatesuncached/children/onlyshowcontactids_param/valueProcess.js
@@ -41,7 +41,7 @@ else
     //don't search if only the id field has a value
     var fieldsToCheck = Object.keys(valuesToCheck);
     if (!(fieldsToCheck.length === 0 || (fieldsToCheck.length === 1 && entityFieldsToLoad.entityIdField in valuesToCheck)))
-        scanResults = DuplicateScannerUtils.ScanForDuplicates(scannerName, targetEntity, valuesToCheck, null) || [];
+        scanResults = DuplicateScannerUtils.scanForDuplicates(scannerName, targetEntity, valuesToCheck, null) || [];
     
     var duplicateIds = scanResults.map(function (duplicate)
     {
diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 88573c89e81ef582b5950cb216a6449152212166..876b00bdb6a168033f3c0e5bfc587b8fff02a973 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -28,6 +28,8 @@ if(personCount == 1)
         .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
         .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
         .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
+        .andNoEntityRows("CampaignParticipant_entity", "CampaignParticipantsProvider", {ContactId_param : contactId})
+        .andNoEntityRows("Order_entity", "OrderProvider", {ContactId_param : contactId})
         .validate();
 }
 else if (personCount == 0) //special case in QuickEntry where it should be possible to remove a new Person that is not saved in the db yet
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index 105cede4033ebdd5e3892b002dc5e2545ea28f7f..04f984cbc56a2705edaf17cc7f00819a4d4526e9 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -36,7 +36,7 @@ if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSup
         .where("AB_ATTRIBUTERELATION.OBJECT_TYPE", ContextUtils.getCurrentContextId())
         .and("AB_ATTRIBUTERELATION.OBJECT_ROWID = CONTACT.CONTACTID")
         .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", $AttributeRegistry.responsibleADsupervisor())
-        .and("AB_ATTRIBUTERELATION." + $AttributeTypes.OBJECTSELECTION.databaseField, EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId())),
+        .and("AB_ATTRIBUTERELATION." + AttributeTypes.OBJECTSELECTION.databaseField, EmployeeUtils.sliceUserId(EmployeeUtils.getCurrentUserId())),
         SqlBuilder.EXISTS()
     );
 }
diff --git a/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..26e0adde33d17eab1378a9d8aa4cfee3eea401bb
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterConditionProcess.js
@@ -0,0 +1,19 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+{        
+    var person_id = new SqlBuilder().select("CONTACT.PERSON_ID")
+        .from("CONTACT")
+        .where(newWhere("CONTACT.CONTACTID", rowIds[i]))
+        .arrayColumn();
+
+    if(person_id.length > 0)
+        favoFilterCond.or("PERSON.PERSONID", person_id[0], SqlBuilder.EQUAL());
+}
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js b/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ebab765b8e2b53cd11f746c306600f7e6f46327
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/filterextensions/favorites_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index c6f452b97cadd9aa9ab20a4f13e1c2ec9319546b..56d4461823493222635f99ab42de361ec497f838 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -4,9 +4,9 @@ import("Attribute_lib");
 import("Workflow_lib");
 import("system.vars");
 import("DuplicateScanner_lib");
-// TODO: enable when duplicate-module is finalized
-let contactId = vars.get("$field.CONTACTID");
-DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
+
+var contactId = vars.get("$field.CONTACTID");
+DuplicateScannerUtils.deleteCachedDuplicate(contactId);
 
 new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
@@ -14,5 +14,9 @@ new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
 newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
 newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
 newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+newWhere("AB_APPOINTMENTLINK.OBJECT_TYPE", "Person")
+.and("AB_APPOINTMENTLINK.OBJECT_ROWID", contactId).deleteData();
+newWhere("AB_ATTRIBUTERELATION.OBJECT_TYPE", "Person")
+.and("AB_ATTRIBUTERELATION.OBJECT_ROWID", contactId).deleteData();
 
 WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index b0ba83b53273ba878317b0ee3c0982d6623eff36..3385c553d10f5332ad4c946ea239bf7bcdf4b6bc 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -36,13 +36,13 @@ WorkflowSignalSender.inserted();
 //    }
 //}
 //
-//let scanResults = DuplicateScannerUtils.ScanForDuplicates("PersonDuplicates", targetEntity,
+//let scanResults = DuplicateScannerUtils.scanForDuplicates("PersonDuplicates", targetEntity,
 //valuesToCheck, null);
 //
 ////If we found duplicates, cache them
 //if(scanResults != null && scanResults.length > 0)
 //{
-//    let insertCount = DuplicateScannerUtils.CacheNewScanResults(contactId, scanResults, targetEntity);
+//    let insertCount = DuplicateScannerUtils.cacheNewScanResults(contactId, scanResults, targetEntity);
 //    logging.log("insertCount -> " + insertCount);
 //
 //    let userId = EmployeeUtils.getCurrentUserId();
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
index 58155b84d17f2216b8d6d66dec19287ff34fa5e7..6664ea968adefe86bae18de0bcb3b56516b0973d 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js
@@ -6,4 +6,5 @@ var from = "CONTACT PersonContact\n\
     join ORGANISATION on (ORGANISATION.ORGANISATIONID = PersonContact.ORGANISATION_ID)\n\
     join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)";
 
-result.string("PERSONID in (select PersonContact.PERSON_ID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
+//using the ContactId instead of the PersonId to make it possible to also filter the functions by e.g organisationName
+result.string("CONTACTID in (select PersonContact.CONTACTID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js
index 2e2393946ee4b38ef5af06790a43c50434afa967..afd8002684d8ed3077a2340908d3c19a23364e03 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/persaddresses/filterConditionProcess.js
@@ -1,4 +1,7 @@
 import("system.vars");
 import("system.result");
 
-result.string("CONTACTID in (select CONTACT_ID from ADDRESS where "  + vars.get("$local.condition") + " )");
\ No newline at end of file
+//because the standard address can also be from the organisation, the condition is used directly here so that it applies to the joined standard
+//address and for all other addresses of the contact a subselect is necessary
+result.string("((" + vars.get("$local.condition") + ")\
+    or exists (select ADDRESS.ADDRESSID from ADDRESS where ADDRESS.CONTACT_ID = CONTACT.CONTACTID and ("  + vars.get("$local.condition") + ")))");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b63b2d57742bc29e8f35acd8bae539ec0a560c9c
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contactStatus(), "CONTACT.STATUS");
+result.string(sql);
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index efd61cfbef8e6e6e7da311c7d575e415f52f9f77..57faf589990bf78e08b17cdc4ad1b49b4f03c1af 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -49,9 +49,9 @@ var querySelect = newSelect([
     .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
         .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
     .where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
-                    .orderBy("CONTACT.CONTACTID");
+
 
 if (vars.exists("$local.idvalue"))
-    querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue");
+    querySelect.andIfSet("CONTACT.CONTACTID", "$local.idvalue");
 
 result.string(querySelect);
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 09e2fcde10da3e7bff836acfcb834abe1f740b0f..824ac6d55edafc5cacd1bee2233dc435a517f290 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -17,6 +17,7 @@
     </entityField>
     <entityField>
       <name>OPTIONAL</name>
+      <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/documentation.adoc</documentation>
       <title>Optional</title>
       <contentType>BOOLEAN</contentType>
       <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 01c9b42d47200f35bc2900eee2e91a39e3ffd178..5fbf1ca2f5300aa1a2e8e8bfd7f16fa65e71a2cd 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -614,6 +614,15 @@
           <filterConditionProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <groupedRecordField></groupedRecordField>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Product_entity/grantDeleteProcess.js b/entity/Product_entity/grantDeleteProcess.js
index 71a0e8a5f23073d79a47ff0ea6cd8f4e3e703f04..8ea2acc50f0649c181812f0d35af698f722f7f3d 100644
--- a/entity/Product_entity/grantDeleteProcess.js
+++ b/entity/Product_entity/grantDeleteProcess.js
@@ -7,7 +7,7 @@ var rowId = vars.get("$field.PRODUCTID");
 var currentContext = ContextUtils.getCurrentContextId();
 
 var canDelete = new HasLinkedObjectTester()
-    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
+    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
     .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : rowId}) //Tasks
     .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "PRODUCT", AssignmentRowId_param : rowId}) //Documents
     .validate();
diff --git a/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2db1e9e36cfa068a562f0c1c253c874eb648f33a
--- /dev/null
+++ b/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("PRODUCT.PRODUCTID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..371a5b567d5a947056b3aa0982100e741e66eb45
--- /dev/null
+++ b/entity/Product_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
+
diff --git a/entity/Product_entity/recordcontainers/index/query.js b/entity/Product_entity/recordcontainers/index/query.js
index ad3ce1ae86df57d36ab7bcde323b417ddc646241..e06093cbebec627842468acb868e1e5c0dd57403 100644
--- a/entity/Product_entity/recordcontainers/index/query.js
+++ b/entity/Product_entity/recordcontainers/index/query.js
@@ -11,8 +11,7 @@ var sqlQuery = newSelect([
         KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID"), //#DESCRIPTION
         "PRODUCTCODE"
     ])
-    .from("PRODUCT")
-    .orderBy("PRODUCTCODE");
+    .from("PRODUCT");
 
 if (vars.exists("$local.idvalue")) 
     sqlQuery.whereIfSet("PRODUCT.PRODUCTID", "$local.idvalue", SqlBuilder.IN());
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 88bf091386f6c700f3730d959eb07137ce3fdc38..61bf5454ab35395bca8b5fb61db8ee6d5996cfba 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -9,7 +9,7 @@
     <element>Product_entity</element>
   </siblings>
   <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
-  <useFavorites v="false" />
+  <useFavorites v="true" />
   <titlePlural>Prices</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -234,6 +234,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>PRODUCTPRICE_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -329,6 +333,16 @@
           <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/fromquantity.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>FavoriteFilter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4296d2e68be85ce5dca121343c5c37cd7d5a5874
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/productprice_objecttype/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Productprice");
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterConditionProcess.js b/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c657ebe1ac71578a6aa535aa58f3c953ae76ceeb
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("PRODUCTPRICE.PRODUCTPRICEID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterValuesProcess.js b/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ebab765b8e2b53cd11f746c306600f7e6f46327
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/filterextensions/favoritefilter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/contactids_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/contactids_param/valueProcess.js
index 206a4b979fde0a202db52865656708e74b5f2d3f..68ef6879ab48622e909ec092bb0314156746f96e 100644
--- a/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/contactids_param/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/contactids_param/valueProcess.js
@@ -77,7 +77,7 @@ function _getDuplicates (pScannerName, pEntity, pEntityFieldValues)
     if (fieldsToCheck.length === 0 || (fieldsToCheck.length === 1 && fieldsToLoad.entityIdField in valuesToCheck))
         return [];
     
-    var scanResults = DuplicateScannerUtils.ScanForDuplicates(pScannerName, pEntity, valuesToCheck, null) || [];
+    var scanResults = DuplicateScannerUtils.scanForDuplicates(pScannerName, pEntity, valuesToCheck, null) || [];
     var duplicateIds = scanResults.map(function (duplicate)
     {
         return duplicate[indexsearch.FIELD_ID];
diff --git a/entity/Role_entity/recordcontainers/jdito/contentProcess.js b/entity/Role_entity/recordcontainers/jdito/contentProcess.js
index 25ef04f7b115f5000691f3747eb8d9d4d0b269d0..4020fb58c7fd134823176eb9a0caf39b7ba8215b 100644
--- a/entity/Role_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Role_entity/recordcontainers/jdito/contentProcess.js
@@ -27,7 +27,7 @@ for each (let role in allRoles) {
     var roleName = role[3];
     if (!excludeRoles[roleName]) {
         let numberOfUsersInSelectedRole = tools.getUsersWithRole(roleName).length;
-        res.push([roleName, roleName, role[0], role[1], role[2], numberOfUsersInSelectedRole + " " + translate.text("User", locale), role[4] ? "1" : "0"]);
+        res.push([roleName, roleName, role[0], role[1], role[2], numberOfUsersInSelectedRole + " " + translate.text("User", locale), role[4] == "true" ? "1" : "0"]);
     }
 }
 
diff --git a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e7474ae27a84b2eb23c98236397328ac396df494
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>SalesprojectConversionRate_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/SalesprojectConversionRate_entity/documentation.adoc</documentation>
+  <title>Conversion Rate</title>
+  <initFilterProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/initFilterProcess.js</initFilterProcess>
+  <iconId>VAADIN:PIE_CHART</iconId>
+  <recordContainer>jdito</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityField>
+      <name>UID</name>
+      <title>AB_KEYWORD_ENTRYID</title>
+    </entityField>
+    <entityField>
+      <name>AB_KEYWORD_ENTRYID_TITLE</name>
+      <title>Phase</title>
+      <displayValueProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/ab_keyword_entryid_title/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityActionField>
+      <name>openSalesprojects</name>
+      <onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/opensalesprojects/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>sentOffers</name>
+      <onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/sentoffers/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>openForecast</name>
+      <onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/openforecast/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>openTurnover</name>
+      <onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/openturnover/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityField>
+      <name>AB_KEYWORD_ENTRYID_KEYID</name>
+      <title>Phase</title>
+      <groupable v="true" />
+    </entityField>
+    <entityAggregateField>
+      <name>conversionRate_aggregate</name>
+      <parentField>conversionRate</parentField>
+    </entityAggregateField>
+    <entityField>
+      <name>conversionRate</name>
+      <title>Conversion Rate</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0.00 %</outputFormat>
+    </entityField>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <isPageable v="true" />
+      <isFilterable v="true" />
+      <isGroupable v="true" />
+      <contentProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <rowCountProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/rowCountProcess.js</rowCountProcess>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRYID_KEYID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_KEYWORD_ENTRYID_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>Year</name>
+          <title>Year</title>
+          <contentType>NUMBER</contentType>
+          <isGroupable v="true" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>Month</name>
+          <title>Month</title>
+          <contentType>NUMBER</contentType>
+          <isGroupable v="true" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+        <filterExtension>
+          <name>DATE_START</name>
+          <title>Date</title>
+          <contentType>DATE</contentType>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/SalesprojectConversionRate_entity/documentation.adoc b/entity/SalesprojectConversionRate_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..152aa4b4158e84d19226e8eaabf8c04c3aaba0e0
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Salesproject Analyses ==
+
+This entity provides analyses to display different things of all salesproject.
\ No newline at end of file
diff --git a/entity/SalesprojectConversionRate_entity/entityfields/ab_keyword_entryid_title/displayValueProcess.js b/entity/SalesprojectConversionRate_entity/entityfields/ab_keyword_entryid_title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc763b0c6156aa6fa4a2e293886ff75fc6cd7e20
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/entityfields/ab_keyword_entryid_title/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+// It's important to translate twice, because there are Phase with an extra translation.
+result.string(KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.AB_KEYWORD_ENTRYID_TITLE")));
\ No newline at end of file
diff --git a/entity/SalesprojectConversionRate_entity/entityfields/openforecast/onActionProcess.js b/entity/SalesprojectConversionRate_entity/entityfields/openforecast/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4f17e146fc1bc27447f0f53818616a254bcf6d1
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/entityfields/openforecast/onActionProcess.js
@@ -0,0 +1,7 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+
+neon.openContext("Turnover", null, null, neon.OPERATINGSTATE_SEARCH, {
+    "ShowForecast_param": "true",
+    "ShowTurnover_param": "false"
+});
diff --git a/entity/SalesprojectConversionRate_entity/entityfields/opensalesprojects/onActionProcess.js b/entity/SalesprojectConversionRate_entity/entityfields/opensalesprojects/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4db85d3486709981abe865d0121c3d29a09c296
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/entityfields/opensalesprojects/onActionProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+
+neon.openContext("Salesproject", null, null, neon.OPERATINGSTATE_SEARCH, {
+    "Status_param": $KeywordRegistry.salesprojectState$open()
+});
diff --git a/entity/SalesprojectConversionRate_entity/entityfields/openturnover/onActionProcess.js b/entity/SalesprojectConversionRate_entity/entityfields/openturnover/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b278ec2dce925c93c0fcccbd8689f8ad68f7c781
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/entityfields/openturnover/onActionProcess.js
@@ -0,0 +1,7 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+
+neon.openContext("Turnover", null, null, neon.OPERATINGSTATE_SEARCH, {
+    "ShowForecast_param": "false",
+    "ShowTurnover_param": "true"
+});
diff --git a/entity/SalesprojectConversionRate_entity/entityfields/sentoffers/onActionProcess.js b/entity/SalesprojectConversionRate_entity/entityfields/sentoffers/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..90c452b6404bb557adec63073846a542c8e66e8f
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/entityfields/sentoffers/onActionProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.neon");
+
+neon.openContext("Offer", null, null, neon.OPERATINGSTATE_SEARCH, {
+    "OfferStatus_param": $KeywordRegistry.offerStatus$sent()
+});
diff --git a/entity/SalesprojectConversionRate_entity/initFilterProcess.js b/entity/SalesprojectConversionRate_entity/initFilterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b3c81f9c83ffb2bbf6592f4bd62993e251136e94
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/initFilterProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+
+let filter = {
+    "type":"group",
+    "operator":"AND",
+    "childs":[{
+        "type":"row",
+        "name":"#EXTENSION.DATE_START.DATE_START#DATE",
+        "operator":"TIMEFRAME_EQUAL",
+        "value":"Dieses Jahr",
+        "key":"REL=ADJUSTED;UNIT=YEAR",
+        "contenttype":"DATE"
+    }]
+};
+
+result.string(JSON.stringify(filter));
\ No newline at end of file
diff --git a/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..95781d32513a9442d468d93568947555bfcdef3d
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,130 @@
+import("JditoFilter_lib");
+import("Salesproject_lib");
+import("system.datetime");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+import("system.neon");
+
+let sqlHelper = new SqlMaskingUtils();
+let filter = vars.get("$local.filters");
+let dateStartYear = sqlHelper.yearFromDate("SALESPROJECT_MILESTONE.DATE_START");
+let dateStartMonth = sqlHelper.monthFromDate("SALESPROJECT_MILESTONE.DATE_START");
+let isFirstPhase = true;
+let data = [];
+
+    
+let  gruppingFields =  {
+    "AB_KEYWORD_ENTRYID_KEYID": ["AB_KEYWORD_ENTRY.KEYID", "AB_KEYWORD_ENTRY.TITLE", "AB_KEYWORD_ENTRY.SORTING"], 
+    "#EXTENSION.Year.Year#NUMBER" : [dateStartYear, dateStartYear, dateStartYear], 
+    "#EXTENSION.Month.Month#NUMBER" : [dateStartMonth, dateStartMonth, dateStartMonth]
+};
+
+let sql = new SqlBuilder()
+.from("AB_KEYWORD_ENTRY")
+.where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.salesprojectPhase())
+.and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.salesprojectPhase$nego(), SqlBuilder.NOT_EQUAL());
+
+if (filter != null)
+{
+    if (JSON.stringify(filter).indexOf("AB_KEYWORD_ENTRYID_KEYID") > -1)
+    {
+        let phasenFilter = filter.childs.filter(function (child) {
+            return (child.childs.filter(function (child) {
+                return child.name == "AB_KEYWORD_ENTRYID_KEYID";
+            })).length > 0
+        })[0];
+        phasenFilter.operator = "OR";
+        let pre = newSelect("PRE.KEYID").from("AB_KEYWORD_ENTRY").join("AB_KEYWORD_ENTRY", "AB_KEYWORD_ENTRY.SORTING -1 = PRE.SORTING", "PRE").where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.salesprojectPhase()).and("PRE.CONTAINER = '" + $KeywordRegistry.salesprojectPhase() + "'").and("AB_KEYWORD_ENTRY.KEYID", phasenFilter.childs[0].value).cell()
+        if (pre != "") {
+            let temp = JSON.parse(JSON.stringify(phasenFilter.childs[0]));
+            temp.value = temp.key  = pre;
+            phasenFilter.childs.push(temp);
+            isFirstPhase = false;
+        }
+    }
+    
+    let filterCondition = JditoFilterUtils.getSqlCondition(filter, "AB_KEYWORD_ENTRY", null, SalesprojectConversionRate.filterMapping(null));
+    sql.andIfSet(filterCondition);
+}
+
+
+
+if (vars.exists("$local.grouped"))
+{
+    let groupedfield = vars.get("$local.grouped");
+    sql.join("SALESPROJECT_MILESTONE", newWhere("SALESPROJECT_MILESTONE.MILESTONEVALUE = AB_KEYWORD_ENTRY.KEYID"))
+        // COUNT, ID, TITLE
+        .select(["COUNT(*)", gruppingFields[groupedfield][0], gruppingFields[groupedfield][1]])
+        .groupBy(["AB_KEYWORD_ENTRY.KEYID", "AB_KEYWORD_ENTRY.SORTING", gruppingFields[groupedfield][0], gruppingFields[groupedfield][1], gruppingFields[groupedfield][2]])
+        .orderBy([gruppingFields[groupedfield][2], "AB_KEYWORD_ENTRY.SORTING"]);
+        
+    if (filter != null)
+    {
+        filterCondition = JditoFilterUtils.getSqlCondition(filter, "SALESPROJECT_MILESTONE", null, SalesprojectConversionRate.filterMapping("SALESPROJECT_MILESTONE.DATE_START", false, "SALESPROJECT_MILESTONE"));
+        sql.andIfSet(filterCondition);
+    }
+    
+    let sqlData = sql.table();
+    let row = {
+        "id": "", 
+        "title": "",
+        "sumRate": 0.0, 
+        "sumCount": 0,
+        "count" : 0,
+        "getTitle": function (pGroupedField) {
+            if (pGroupedField == "#EXTENSION.Month.Month#NUMBER" )
+            {
+                // When convert the Number of the Month to the Month name it doesn't matter which Year is used, so here is the Year 2020 hard-coded.
+                let monthDate = new Date(2020, parseInt(this.title)-1);
+                return translate.text(datetime.toDate(monthDate.getTime(), "MMMM", "UTC"));
+            }
+            return translate.text(translate.text(this.title));
+        }
+    };
+    let pre = -1;
+    
+    for (let i = 0; i <= sqlData.length; i++){
+        if (i == sqlData.length || sqlData[i][1] != row.id) 
+        {
+            if (row.id != "")
+                data.push([row.sumCount + "", row.id, row.getTitle(groupedfield), row.sumRate / row.count]);
+            
+            if (i == sqlData.length)
+                break;
+            
+            row.id = sqlData[i][1];
+            row.title = sqlData[i][2];
+            row.sumRate = 0;
+            row.sumCount = 0;
+            row.count =  0;
+            
+            if (groupedfield != "AB_KEYWORD_ENTRYID_KEYID") {
+                pre = -1;
+            }
+        }
+        
+        if (pre != -1)
+            row.sumRate += (parseFloat(sqlData[i][0]) / pre);
+        
+        if (isFirstPhase || pre != -1)
+        {
+            row.count++;
+            row.sumCount += parseInt(sqlData[i][0]);
+        }
+            
+        
+        pre = parseFloat(sqlData[i][0]);
+        
+        
+    }
+    result.object(data);
+} 
+else 
+{
+    sql.select(["AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", "AB_KEYWORD_ENTRY.KEYID", "AB_KEYWORD_ENTRY.TITLE"])
+        .orderBy("AB_KEYWORD_ENTRY.SORTING");
+    result.object(sql.table());
+}
\ No newline at end of file
diff --git a/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/rowCountProcess.js b/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/rowCountProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8615399a3833200e8f55e5e176fd493458a417ab
--- /dev/null
+++ b/entity/SalesprojectConversionRate_entity/recordcontainers/jdito/rowCountProcess.js
@@ -0,0 +1,32 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+import("JditoFilter_lib");
+import("Salesproject_lib");
+
+var groupMapping = SalesprojectConversionRate.groupMapping(true);
+var phases = new SqlBuilder().select(["COUNT(*)"]).from("AB_KEYWORD_ENTRY")
+.join("SALESPROJECT_MILESTONE", "AB_KEYWORD_ENTRY.KEYID = SALESPROJECT_MILESTONE.MILESTONEVALUE")
+.where("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.salesprojectPhase())
+.and("AB_KEYWORD_ENTRY.KEYID", $KeywordRegistry.salesprojectPhase$nego(), SqlBuilder.NOT_EQUAL());
+
+var filter = vars.get("$local.filters");
+
+if (filter != null)
+{
+    var filterCondition = JditoFilterUtils.getSqlCondition(vars.get("$local.filters"), "AB_KEYWORD_ENTRY", null, SalesprojectConversionRate.filterMapping("SALESPROJECT_MILESTONE.DATE_START", true));
+    phases.andIfSet(filterCondition);
+}
+
+if (vars.exists("$local.grouped"))
+{
+    var groupedfield = vars.get("$local.grouped")
+    phases.groupBy([groupMapping[groupedfield]]);
+} 
+else 
+{
+    phases.groupBy(["AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", "AB_KEYWORD_ENTRY.KEYID", "AB_KEYWORD_ENTRY.TITLE", "AB_KEYWORD_ENTRY.SORTING"]);
+}
+
+result.string(phases.arrayColumn().length);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 5d642967ffc0719e3033741bc638c9e129dfa8ae..f33a33912223de0d1e2047b7f1de11979c36c939 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -53,7 +53,7 @@
       <name>PHASE</name>
       <title>Phase</title>
       <consumer>SalesprojectPhaseStepper</consumer>
-      <groupable v="true" />
+      <groupable v="false" />
       <mandatory v="true" />
       <state>EDITABLE</state>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/valueProcess.js</valueProcess>
@@ -257,7 +257,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Member_entity</entityName>
-        <fieldName>Links</fieldName>
+        <fieldName>WithDistrictResponsibles</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -666,26 +666,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>ClassificationGroups</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ClassificationType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
       <name>PHASEINFO</name>
       <title>phase information</title>
@@ -767,8 +747,9 @@
       <useAggregates v="true" />
     </entityProvider>
     <entityField>
-      <name>CLASSIFICATIONSTORAGE_ID</name>
+      <name>CLASSIFICATIONVALUE</name>
       <title>Classification</title>
+      <groupable v="true" />
     </entityField>
   </entityFields>
   <recordContainers>
@@ -783,19 +764,26 @@
       <onDBDelete>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <linkInformation>
         <linkInformation>
-          <name>c8b6f1e0-630c-45d1-bdfb-d1eb3f6d6bef</name>
+          <name>75cc0cd9-09fc-46a8-b25d-369c4e9c0fd7</name>
           <tableName>SALESPROJECT</tableName>
           <primaryKey>SALESPROJECTID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
         <linkInformation>
-          <name>5f687ee0-15eb-4e19-aa5a-461c446e7d91</name>
+          <name>a7b7adf3-c2fd-4688-9970-0000841712d7</name>
           <tableName>ORGANISATION</tableName>
           <primaryKey>ORGANISATIONID</primaryKey>
           <isUIDTable v="false" />
           <readonly v="true" />
         </linkInformation>
+        <linkInformation>
+          <name>b14de4fd-28a8-4503-9c29-0c4dd8b31607</name>
+          <tableName>AB_KEYWORD_ENTRY</tableName>
+          <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+          <isUIDTable v="false" />
+          <readonly v="true" />
+        </linkInformation>
         <linkInformation>
           <name>1c73b0de-0e70-421e-a8aa-660dbd177f81</name>
           <tableName>CLASSIFICATIONSTORAGE</tableName>
@@ -809,25 +797,25 @@
           <name>ENDDATE.value</name>
           <recordfield>SALESPROJECT.ENDDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>SALESPROJECT.INFO</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PHASE.value</name>
           <recordfield>SALESPROJECT.PHASE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROBABILITY.value</name>
           <recordfield>SALESPROJECT.PROBABILITY</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PROJECTCODE.value</name>
@@ -849,19 +837,19 @@
           <name>STARTDATE.value</name>
           <recordfield>SALESPROJECT.STARTDATE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>VOLUME.value</name>
           <recordfield>SALESPROJECT.VOLUME</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.displayValue</name>
@@ -879,13 +867,13 @@
           <name>REASONS.value</name>
           <recordfield>SALESPROJECT.REASONS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <consumerMapping>
           <name>Organisations</name>
           <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js</filterConditionProcess>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
           <filtertype>BASIC</filtertype>
         </consumerMapping>
         <consumerMapping>
@@ -902,7 +890,7 @@
           <name>STATUS.value</name>
           <recordfield>SALESPROJECT.STATUS</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <aggregateFieldDbMapping>
           <name>COUNT_aggregate.value</name>
@@ -910,10 +898,9 @@
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
         <dbRecordFieldMapping>
-          <name>CLASSIFICATIONSTORAGE_ID.value</name>
+          <name>CLASSIFICATIONVALUE.value</name>
           <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
           <isFilterable v="true" />
-          <isLookupFilter v="false" />
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
@@ -924,6 +911,15 @@
           <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtensionSet>
+          <name>ClassificationGroup_filter</name>
+          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
+          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+          <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js</groupQueryProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtensionSet>
         <filterExtensionSet>
           <name>ClassificationType_filter</name>
           <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/filterFieldsProcess.js</filterFieldsProcess>
@@ -933,14 +929,24 @@
           <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationtype_filter/groupQueryProcess.js</groupQueryProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
-        <filterExtensionSet>
-          <name>ClassificationGroup_filter</name>
-          <filterFieldsProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js</filterFieldsProcess>
-          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js</filterValuesProcess>
-          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js</filterConditionProcess>
+        <filterExtension>
+          <name>Phase_filterExtention</name>
+          <title>Phase</title>
+          <contentType>TEXT</contentType>
+          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/filterConditionProcess.js</filterConditionProcess>
+          <groupedRecordField>Phase</groupedRecordField>
+          <titleRecordField>SALESPROJECT.PHASE</titleRecordField>
           <isGroupable v="true" />
+          <groupQueryProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/groupQueryProcess.js</groupQueryProcess>
+        </filterExtension>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
-        </filterExtensionSet>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
     <indexRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
deleted file mode 100644
index 6dd2e4417403f7f224f0889aa787a11b2e516dc9..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/classificationtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-
-result.string($KeywordRegistry.classificationType$salesproject());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 5996e99db232db8df50f155732110608e5abff4e..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/classificationgroups/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
index 4d7f34b4b38482879c13a7b2677b58adb17cd897..ef0d44ef34942a6219d4ae0f3c5cb66f34847555 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterConditionProcess.js
@@ -1,7 +1,6 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
-var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql(vars.get("$sys.currentcontextname"));
+var sqlCond = ClassificationGroupFilterUtils.makeFilterConditionSql();
 
 result.string(sqlCond);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
index b066dbd2bd3d29c633bbb50a3ebe7bf680572ca9..f4082997e0ffed652aa150ae87c52a258d0b481c 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterFieldsProcess.js
@@ -1,8 +1,7 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
 //this filterExtensionSet is for the Classifications (ClassificationGroups, e.g. 1. Target Group, Customer Value...)
-var fields = ClassificationTypeFilterUtils.getFilterFieldsGroup(vars.get("$sys.currentcontextname"));
+var fields = ClassificationGroupFilterUtils.makeFilterFields();
 
 result.string(fields);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
index 0b91eddce8f2e9807f5ff51f8c9316056a36a350..447f4c037255ee7dcbeb6eb0a39007733806d71c 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/filterValuesProcess.js
@@ -1,6 +1,5 @@
-import("system.vars");
 import("system.result");
 import("ClassificationFilter_lib");
 
-var values = ClassificationGroupFilterUtils.makeFilterValues(vars.get("$sys.currentcontextname"));
+var values = ClassificationGroupFilterUtils.makeFilterValues();
 result.object(values);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f7be0b8bd8fa6f889a7402ac9457d1ba15cbe67
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/classificationgroup_filter/groupQueryProcess.js
@@ -0,0 +1,5 @@
+import("ClassificationFilter_lib");
+import("system.result");
+
+var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf9199d48642536122035a91a371f8193e23271c
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("SALESPROJECT.SALESPROJECTID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ebab765b8e2b53cd11f746c306600f7e6f46327
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/filterConditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f410cb6d05146ae82e7bbf5016ddcb5d32cae509
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/filterConditionProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+result.string(newWhereIfSet( "SALESPROJECT.PHASE", vars.get("$local.rawvalue")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/groupQueryProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/groupQueryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..341994efdf214b16a3c8dc9ba3e222c61f1323f8
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/phase_filterextention/groupQueryProcess.js
@@ -0,0 +1,31 @@
+import("system.logging");
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+        
+var order = vars.get("$local.order");
+var sqlHelper = new SqlMaskingUtils();
+var groupedList = "SALESPROJECT.PHASE"
+var condition = vars.get("$local.condition");
+var stmt = new SqlBuilder().from("SALESPROJECT").join("AB_KEYWORD_ENTRY", newWhere("AB_KEYWORD_ENTRY.KEYID = SALESPROJECT.PHASE").and("AB_KEYWORD_ENTRY.CONTAINER", $KeywordRegistry.salesprojectPhase())).groupBy(groupedList + ", AB_KEYWORD_ENTRY.SORTING, AB_KEYWORD_ENTRY.KEYID");
+
+if (condition != "  ")
+    stmt.where(condition);
+
+if (vars.get("$local.count")) // TRUE if the count of the records is needed
+{
+    stmt.select(["1 COUNT", groupedList]) //from ACTIVITY where " + condition + " group by "+groupedList+") X";
+    stmt = newSelect("STMT.COUNT")
+    .from(stmt, "STMT")
+    
+} 
+else 
+{
+    stmt.select([groupedList , KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(),"AB_KEYWORD_ENTRY.KEYID"), "count(*)", "count(*)"])
+    if (order != null)
+        stmt.orderBy("AB_KEYWORD_ENTRY.SORTING, " +order);
+}
+
+result.string(stmt.toString());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
index f7c4fec24f882837821e3546df7a8c5c0f5d1951..435ef5659c496dabc83c5ec578c05a94d5b4ed6a 100644
--- a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,5 +1,6 @@
 import("system.vars");
 import("system.result");
+import("KeywordRegistry_basic");
 
 //CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
 result.string("SALESPROJECT \n\
diff --git a/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js
index 71ac17c11183c3560820cbe2df01dccddd1e3b4d..319594ed7e2cd8b1860d7426852261155c9cf13b 100644
--- a/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.db");
-
-result.object({
-    "SALESPROJECT.PROJECTTITLE": db.ASCENDING
+import("system.result");
+import("system.db");
+
+result.object({
+    "SALESPROJECT.PROJECTTITLE": db.ASCENDING
 });
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/index/query.js b/entity/Salesproject_entity/recordcontainers/index/query.js
index b39c8d68ffd1e7e13b652a1bac2008d5a0ed8fec..000f54e04cea1de1398266fc8b5bba9f267a5026 100644
--- a/entity/Salesproject_entity/recordcontainers/index/query.js
+++ b/entity/Salesproject_entity/recordcontainers/index/query.js
@@ -21,8 +21,7 @@ var sqlQuery = newSelect([
         "PHASE",
         KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE") //PHASE.displayValue
     ])
-    .from("SALESPROJECT")
-    .orderBy("PROJECTCODE");
+    .from("SALESPROJECT");
 
 if (vars.exists("$local.idvalue"))
     sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", "$local.idvalue", SqlBuilder.IN());
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index 0de13f5543f8b6b4ba16bb8795868608aac3e1c8..a72c0501c5a9c495afa42ec2453e1b715c50867c 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -50,7 +50,7 @@
       <stateProcess>%aditoprj%/entity/SerialLetterAddRecipients_entity/entityfields/addparticipants/stateProcess.js</stateProcess>
     </entityActionField>
     <entityParameter>
-      <name>comingFrom_param</name>
+      <name>ObjectType_param</name>
       <expose v="true" />
     </entityParameter>
     <entityField>
@@ -74,6 +74,13 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>notAddedRecipients</name>
+    </entityField>
+    <entityParameter>
+      <name>ContactFilter_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
index 385706891b99b737c6892b3b1f818cbf0a7c48f2..7e164ae735e3b97b6bd81ff36b0ad192341efae8 100644
--- a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
@@ -1,31 +1,24 @@
-import("FilterviewMenuAction_lib");
-import("Contact_lib");
+import("Util_lib");
+import("system.eMath");
+import("FilterViewAction_lib");
 import("system.result");
 import("Bulkmail_lib");
-import("KeywordRegistry_basic");
-import("system.util");
-import("system.db");
 import("Sql_lib");
 import("system.vars");
+import("system.neon");
 
-var selection = JSON.parse(vars.getString("$param.ContactIds_param"));
-var comingfrom = vars.getString("$param.comingFrom_param");
-var contactIds;
-
-if(!Array.isArray(selection)) //if selection is an array, data has been selected
+var serialLetterId = vars.get("$field.SERIALLETTER_ID");
+if (serialLetterId)
 {
-    var condition = selection.condition;
-    if(comingfrom == "Organisation")
-        contactIds = FilterviewMenuActionUtils.organisationIdsFilter(condition);
-    else if (comingfrom == "Person")
-        contactIds = FilterviewMenuActionUtils.contactIdsFilter(condition);
-}
-var serialLetterId = vars.get("$field.SERIALLETTER_ID")
+    var contactIds = Utils.parseJSON(vars.get("$param.ContactIds_param"));
+    var contactFilter = vars.get("$param.ContactFilter_param");
+    var context = vars.getString("$param.ObjectType_param");
 
-var res;
-if (serialLetterId)
-    res = JSON.stringify(BulkMailUtils.filterNewRecipients(serialLetterId, contactIds));
+    contactIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, contactIds, contactFilter);
+
+    var recipients = SerialLetterUtils.filterNewRecipients(serialLetterId, contactIds);
+    neon.setFieldValue("$field.notAddedRecipients", eMath.subInt(parseInt(contactIds.length), parseInt(recipients.length)));
+    result.string(JSON.stringify(recipients));
+}
 else
-    res = null;
-    
-result.string(res);
\ No newline at end of file
+    result.string(null);
\ No newline at end of file
diff --git a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
index 2b4640522a0c4e9846c48c703bfb48d31a71490f..3b3d66c60e9357e9627c8085febffecddc04af20 100644
--- a/entity/SerialLetterAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
+++ b/entity/SerialLetterAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
@@ -4,11 +4,18 @@ import("system.vars");
 
 var count = vars.getString("$field.recipientcount")
 var res = "";
+var resNotAdded = "\n\
+";
 if (count && !vars.get("$sys.validationerrors"))
 {
     if (count == "0")
         res = translate.text("No new recipients found that can be added to the serial letter.");
     else
+    {
         res = translate.withArguments("%0 new recipients will be added to the serial letter.", [count]);
+        var notAdded = vars.get("$field.notAddedRecipients")
+        if (notAdded > 0)
+            resNotAdded += translate.withArguments("%0 of the chosen records are already recipients.", [notAdded]);
+    }
 }
-result.string(res);
\ No newline at end of file
+result.string(res + resNotAdded);
\ No newline at end of file
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index f7d8c265e98e23fb12a9c4e7611637664ada76f1..315503bad3d29396d5daeabbf8bff267ab8147d1 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -192,6 +192,10 @@
           <name>AssignmentName_param</name>
           <valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>DisallowCreate_param</name>
+          <valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityActionField>
diff --git a/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js b/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/SerialLetter_entity/grantDeleteProcess.js b/entity/SerialLetter_entity/grantDeleteProcess.js
index f4b411ed0162386b27b09491f902f83d696c3733..42f09d992d2bb464b25697b2d48066511e580e6d 100644
--- a/entity/SerialLetter_entity/grantDeleteProcess.js
+++ b/entity/SerialLetter_entity/grantDeleteProcess.js
@@ -8,7 +8,7 @@ var currentContext = ContextUtils.getCurrentContextId();
 
 var canDelete = new HasLinkedObjectTester()
     .andNoEntityRows("LetterRecipient_entity", "SerialLetterRecipients", {SerialLetterId_param : rowId}) //Recipients
-    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activites
+    .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activiites
     .validate();
 
 result.string(canDelete);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 23f83fc09c4d9449f6417d8d3b3fa3f2674d57a7..a289e1083cc46db17d59d4a393a87e5537cb64f2 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -22,6 +22,12 @@
           <fieldName>SupportTickets</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>3190ea51-a767-436f-af75-869b43d0c568</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>SupportTickets</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
@@ -415,6 +421,44 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>SupportTicketChildren</name>
+      <documentation>%aditoprj%/entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>TicketType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterOnlyOwnTicket_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>TASK_ICON_COLOR</name>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -554,6 +598,17 @@
           <aggregateType>COUNT</aggregateType>
         </aggregateFieldDbMapping>
       </recordFieldMappings>
+      <filterExtensions>
+        <filterExtension>
+          <name>Favorite_filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <isLookupFilter v="false" />
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
+      </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/SupportTicket_entity/afterUiInit.js b/entity/SupportTicket_entity/afterUiInit.js
index 9080cb34c8aa3a5e80c59ab564a3014f11216c9c..ecada6ad975a6f1d1b79ef0e39f3ad5372d5d593 100644
--- a/entity/SupportTicket_entity/afterUiInit.js
+++ b/entity/SupportTicket_entity/afterUiInit.js
@@ -8,16 +8,6 @@ import("ActivityTask_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    var presetLinks = JSON.parse(vars.getString("$param.PresetLinks_param"));
-        if(presetLinks[0][0] == "Person")
-        {
-            var contactId = presetLinks[0][1];
-
-            var orgContactId = ContactUtils.getOrganisationContactId(contactId);
-            
-            presetLinks[1] =  ["Organisation", orgContactId];
-        }
-    
-    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", presetLinks, "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
+    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
 }
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc b/entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fb163a939ec1b50a4c312589a663a6eb309f588c
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc
@@ -0,0 +1,5 @@
+Provides SupportTickets that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5381e94ed349aaf085f56d443df54cf3afea7ec
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+
+switch(vars.getString("$field.TASK_PRIORITY"))
+{
+    case $KeywordRegistry.taskPriority$none():
+        result.string(neon.PRIORITY_NONE_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$low():
+        result.string(neon.PRIORITY_LOW_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$medium():
+        result.string(neon.PRIORITY_MEDIUM_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$high():
+        result.string(neon.PRIORITY_HIGH_COLOR);
+        break;
+}
+
diff --git a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
index d5381e94ed349aaf085f56d443df54cf3afea7ec..a769772aeb44b795fb37db6acdcad4ee4aca6a35 100644
--- a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
+++ b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
@@ -1,21 +1,4 @@
 import("system.vars");
-import("KeywordRegistry_basic");
 import("system.result");
-import("system.neon");
-
-switch(vars.getString("$field.TASK_PRIORITY"))
-{
-    case $KeywordRegistry.taskPriority$none():
-        result.string(neon.PRIORITY_NONE_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$low():
-        result.string(neon.PRIORITY_LOW_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$medium():
-        result.string(neon.PRIORITY_MEDIUM_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$high():
-        result.string(neon.PRIORITY_HIGH_COLOR);
-        break;
-}
 
+result.string(vars.get("$field.TASK_ICON_COLOR"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index a3fb601aa08385a85a4370d783a55ea681ed90f6..1cc6eb48ac1da6603edbdb729d16af958c269aa5 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -28,5 +28,8 @@ if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
                             , SqlBuilder.IN());
 }
 
+cond.andIfSet("TASK.PARENT_ID", "$param.ParentId_param");
+cond.andIfSet("TASK.PARENT_CONTEXT", "$param.ParentContext_param");
+
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..765e2ce46b47b556bb602c68ad610db83b1195df
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js
@@ -0,0 +1,11 @@
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var favoFilterCond = newWhere();
+var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+
+for(i = 0; i < rowIds.length; i++)
+    favoFilterCond.or("TICKET.TICKETID", rowIds[i], SqlBuilder.EQUAL());
+
+result.string(favoFilterCond.toString());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97692e13aa5f4ed03bcb9bccd4ac3b5b11872be4
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
@@ -0,0 +1,4 @@
+import("Favorites_lib");
+import("system.result");
+
+result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index ad5dad51bb4d3975801b944f026c6ad35db6a2d9..759282daf39bbcbd59b7a37223e1c9d4873dfaca 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -37,6 +37,7 @@
       <name>Link</name>
       <targetContextField>OBJECT_TYPE</targetContextField>
       <targetIdField>OBJECT_ROWID</targetIdField>
+      <documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>
diff --git a/entity/TaskLink_entity/entityfields/link/documentation.adoc b/entity/TaskLink_entity/entityfields/link/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..34f2521ccb43a373cae26c3ce30dcfe15921d898
--- /dev/null
+++ b/entity/TaskLink_entity/entityfields/link/documentation.adoc
@@ -0,0 +1,3 @@
+Provides links of tasks where data is filtered for one specific task.
+
+Use case: "give me all task links for task X".
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index d425425dcf17d3d5a4916d9989cf43b08dc8c0ee..0ed30f9267ac826ee8fa702c136cbdb52ddb1502 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -288,6 +288,7 @@
     </entityConsumer>
     <entityProvider>
       <name>Tasks</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/tasks/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
@@ -468,6 +469,40 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>TaskChildren</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/taskchildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterOnlyOwnTask_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>ICON_COLOR</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/icon_color/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Task_entity/entityfields/icon_color/valueProcess.js b/entity/Task_entity/entityfields/icon_color/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f15523e7246f5c3c3c6336802201bbdc9c1ad65b
--- /dev/null
+++ b/entity/Task_entity/entityfields/icon_color/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+
+switch(vars.getString("$field.PRIORITY"))
+{
+    case $KeywordRegistry.taskPriority$none():
+        result.string(neon.PRIORITY_NONE_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$low():
+        result.string(neon.PRIORITY_LOW_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$medium():
+        result.string(neon.PRIORITY_MEDIUM_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$high():
+        result.string(neon.PRIORITY_HIGH_COLOR);
+        break;
+}
+
diff --git a/entity/Task_entity/entityfields/priority_icon/colorProcess.js b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
index a78d7b1ee74f2a6200bdd2982e818d40102d5020..c8bbe213f0f44234253c460fcd52607267e196b3 100644
--- a/entity/Task_entity/entityfields/priority_icon/colorProcess.js
+++ b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
@@ -1,21 +1,6 @@
 import("system.vars");
-import("KeywordRegistry_basic");
 import("system.result");
-import("system.neon");
-
-switch(vars.getString("$field.PRIORITY"))
-{
-    case $KeywordRegistry.taskPriority$none():
-        result.string(neon.PRIORITY_NONE_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$low():
-        result.string(neon.PRIORITY_LOW_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$medium():
-        result.string(neon.PRIORITY_MEDIUM_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$high():
-        result.string(neon.PRIORITY_HIGH_COLOR);
-        break;
-}
 
+var color = vars.get("$field.ICON_COLOR")
+if (color)
+    result.string(color);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/taskchildren/documentation.adoc b/entity/Task_entity/entityfields/taskchildren/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..13806cbe8e78035b8dbe1f1e88a9d07238d2f47c
--- /dev/null
+++ b/entity/Task_entity/entityfields/taskchildren/documentation.adoc
@@ -0,0 +1,5 @@
+Provides Tasks that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tasks/documentation.adoc b/entity/Task_entity/entityfields/tasks/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..2d404a44292ca92a10d14e3559666267bb9bf9ff
--- /dev/null
+++ b/entity/Task_entity/entityfields/tasks/documentation.adoc
@@ -0,0 +1 @@
+Generic provider that provides task where data is filtered for a given task link. (e.g.: "give me all tasks for Company X").
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/conditionProcess.js b/entity/Task_entity/recordcontainers/db/conditionProcess.js
index aeaf998bec85dc61e32fafcbb7c2138486c7e21a..d8acb4d11fe9b9f26e89c697f74bf887f928b04c 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -26,6 +26,8 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
                                 .and("TASKLINK.OBJECT_TYPE", "$param.ObjectId_param")
                             , SqlBuilder.IN());
 }
+cond.andIfSet("TASK.PARENT_ID", "$param.ParentId_param");
+cond.andIfSet("TASK.PARENT_CONTEXT", "$param.ParentContext_param");
 
 if (loadNothing)
 {
@@ -44,7 +46,7 @@ else
                 )
         );
     }
-    cond.and(protectionLevelCondition)
+    cond.and(protectionLevelCondition);
   
     //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
     result.string(cond.toString());
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index d82d86fc8e713e9f8c8bf436b817cf363b0414b8..42eb73a718ae614066df3597d25cc982dc96b69b 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -11,6 +11,7 @@
     </entityProvider>
     <entityProvider>
       <name>ForUnlinkedMail</name>
+      <documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc</documentation>
       <children>
         <entityParameter>
           <name>UnlinkedMailId_param</name>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
index 8559ac9a3d3510fee097ccf7ae20ef2a3d086328..cda1b4330c1d5effa2db18b1e2353b2c942d23ab 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
+++ b/entity/UnlinkedMailMappingWrapper_entity/documentation.adoc
@@ -1,3 +1,7 @@
 = UnlinkedMailMappingWrapper_entity
 
-For manual linking of an unlinked mail
\ No newline at end of file
+For manual linking of an unlinked mail
+
+WARNING: This is deprecated and should not longer be used. Activities are now created always and have some or no activity links.
+
+//todo: remove entity
\ No newline at end of file
diff --git a/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fb63d20fd2612a5756ff4adf0fb95bdcbdc14a3d
--- /dev/null
+++ b/entity/UnlinkedMailMappingWrapper_entity/entityfields/forunlinkedmail/documentation.adoc
@@ -0,0 +1,3 @@
+Provides a wrapper for Unlinked Mails. 
+
+WARNING: This is deprecated and should not longer be used. Activities are now created always and have some or no activity links.
\ No newline at end of file
diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources/UserhelpResources.aod
index 9a1b9a31ac53d820cfeed19fdd689c0c796a9bdd..7775d3fd5a4ba8d43ec112062c7772b437bd68c9 100644
--- a/entity/UserhelpResources/UserhelpResources.aod
+++ b/entity/UserhelpResources/UserhelpResources.aod
@@ -2,6 +2,7 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
   <name>UserhelpResources</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/UserhelpResources/documentation.adoc</documentation>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index e285bf117fd449c0c0986c0044d4a32aece2822c..63130c5f63deebc3bc36702245a2755785fe4a50 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -33,11 +33,10 @@
       <title>Info</title>
     </entityField>
     <entityField>
-      <name>PERSON_ID</name>
+      <name>CONTACT_ID</name>
       <title>Employee</title>
-      <consumer>Persons</consumer>
-      <valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js</displayValueProcess>
+      <state>INVISIBLE</state>
+      <valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>icon</name>
@@ -134,11 +133,11 @@
           <recordfield>VISITPLANEMPLOYEEWEEK.INFO</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>PERSON_ID.value</name>
+          <name>CONTACT_ID.value</name>
           <recordfield>VISITPLANEMPLOYEEWEEK.CONTACT_ID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>PERSON_ID.displayValue</name>
+          <name>CONTACT_ID.displayValue</name>
           <expression>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
       </recordFieldMappings>
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js
similarity index 71%
rename from entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js
rename to entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js
index 0bb4d7463fcdc9d1dc9e14fb04772208f00176f4..d8bc2ef0356d39de62e987e2884977ea1fc0d7d5 100644
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js
+++ b/entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js
@@ -2,7 +2,6 @@ import("system.neon");
 import("system.result");
 import("Employee_lib");
 import("system.vars");
-import("Sql_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(EmployeeUtils.getCurrentContactId());
+    result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js
deleted file mode 100644
index 2161701ba3a4caa82d099c7a996759a6ce1d862a..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Contact_lib");
-
-//show the simple title since this will be later an employee-entry and therefore no organisation is needed
-var title = ContactUtils.getTitleByContactId(vars.get("$field.PERSON_ID"));
-result.string(title);
diff --git a/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js b/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js
deleted file mode 100644
index b061026da323fff3513e5cf1b6162b3dbd804430..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Person_lib");
-
-result.string(PersUtils.getResolvingDisplaySubSql("VISITPLANEMPLOYEEWEEK.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index d70a400985b91ad3a29962af6bdcc05c735e3467..2aed7529f61a7f8a7854f62e48ef1957834e49f3 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -5,6 +5,8 @@
   <documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
   <title>Visit Recommendation</title>
   <grantCreate v="true" />
+  <grantUpdateProcess>%aditoprj%/entity/VisitRecommendation_entity/grantUpdateProcess.js</grantUpdateProcess>
+  <grantDeleteProcess>%aditoprj%/entity/VisitRecommendation_entity/grantDeleteProcess.js</grantDeleteProcess>
   <iconId>VAADIN:BRIEFCASE</iconId>
   <image>VAADIN:BRIEFCASE</image>
   <titlePlural>Visit Recommendations</titlePlural>
@@ -58,6 +60,8 @@
     <entityField>
       <name>PRIORITY_SOURCE</name>
       <title>Priority Source</title>
+      <consumer>KeywordVisitRecommendationSource</consumer>
+      <displayValueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>DUE_DATE</name>
@@ -158,6 +162,20 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityConsumer>
+      <name>KeywordVisitRecommendationSource</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..06491a0184adef6625940873337299d34dd2fc1a
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/keywordvisitrecommendationsource/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result"); 
+import("Keyword_lib"); 
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.visitRecommendationPrioSource());
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a52185f9fcf8f4d79b310065b92d9b56452fe621
--- /dev/null
+++ b/entity/VisitRecommendation_entity/entityfields/priority_source/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), vars.get("$field.PRIORITY_SOURCE")));
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/grantDeleteProcess.js b/entity/VisitRecommendation_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4265dc9ea048593adafc2e916aa129869c0d1fd8
--- /dev/null
+++ b/entity/VisitRecommendation_entity/grantDeleteProcess.js
@@ -0,0 +1,8 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$field.PRIORITY_SOURCE") == $KeywordRegistry.visitRecommendationPrioSource$visitFrequency())
+    result.string(false);
+else
+    result.string(true);
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/grantUpdateProcess.js b/entity/VisitRecommendation_entity/grantUpdateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4265dc9ea048593adafc2e916aa129869c0d1fd8
--- /dev/null
+++ b/entity/VisitRecommendation_entity/grantUpdateProcess.js
@@ -0,0 +1,8 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$field.PRIORITY_SOURCE") == $KeywordRegistry.visitRecommendationPrioSource$visitFrequency())
+    result.string(false);
+else
+    result.string(true);
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index c6952bf184b937774b43b5417af3e459b2414987..2dcf9d475228056db770c57f0e2cfaef41fd5c80 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -44,7 +44,7 @@ if(idValues == false)
                                                         .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
                                                         .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
                                                         .cell(), AddressUtils.formatOnelineSql(), 
-                                                        "visitPlanFrequency.ID_VALUE", "'VISITFREQUENCY                      '", activitySubQuery, "CONTACTID",
+                                                        "visitPlanFrequency.ID_VALUE", "'" + $KeywordRegistry.visitRecommendationPrioSource$visitFrequency()+"'" , activitySubQuery, "CONTACTID",
                                             newSelect("min(ENTRYDATE)")
                                                         .from("VISITPLANENTRY") 
                                                         .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID") 
@@ -132,11 +132,12 @@ for( let i = 0; i < recommendationSQLData.length; i++)
     tmpData[1] = organisationName;                          //Organisation Name
     tmpData[3] = recommendationSQLData[i][6];               //Address
     tmpData[4] = prio; 
-    tmpData[5] = recommendationSQLData[i][4];               //Source of Priority
+    tmpData[5] = recommendationSQLData[i][4];               //Source of Priority (Id)
     tmpData[7] = recommendationSQLData[i][3];               //Due Date
     tmpData[8] = recommendationSQLData[i][5];               //Info
     tmpData[9] = recommendationSQLData[i][1];               //CONTACT_ID
     tmpData[2] = recommendationSQLData[i][8];               //Data_planned
+    tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), recommendationSQLData[i][4]) //Source of Priority (displayvalue)
     
 
     recommendationData.push(tmpData);
@@ -164,11 +165,12 @@ if(idValues == false)
         tmpData[0] = visitFrequencyData[i][0];                 //UID
         tmpData[1] = visitFrequencyData[i][1];                 //Organisation Name
         tmpData[3] = visitFrequencyData[i][2];                 //Address
-        tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority
+        tmpData[5] = visitFrequencyData[i][4];                 //Source of Priority (Id)
         tmpData[8] = "";
         tmpData[4] = visitFrequencyData[i][5];                 //last visit
         tmpData[9] = visitFrequencyData[i][6];                 //ContactId
         tmpData[2] = visitFrequencyData[i][1];                 //OrganisationId
+        tmpData[6] = KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), visitFrequencyData[i][4]) //Source of Priority (displayvalue)
         var dueDate = "";
         var lastVisitDate = "";
 
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/onDelete.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/onDelete.js
index e63bd391cfc137ff9a12eaa47bef9002f2d79875..56f6213679982f9854442412db97ea434168e409 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/onDelete.js
@@ -1,5 +1,5 @@
 import("Sql_lib");
 import("system.vars");
 
-newWhere("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+newWhere("VISITRECOMMENDATION.VISITRECOMMENDATIONID", "$field.UID")
     .deleteData();
\ No newline at end of file
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index 606db71e8c973f170c928b4eebebbb107835c771..8c35ddbe8c30a3772342c03d9a04d3f9c1b60dd4 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
@@ -7,7 +7,7 @@
   <grantCreate v="false" />
   <grantUpdate v="false" />
   <grantDelete v="false" />
-  <titlePlural>Activites</titlePlural>
+  <titlePlural>Activities</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 015587fddd109630585f0945d66409a8a1d03134..2853fb597879f3ed452efdb45a7998fc36e0f0cd 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -786,9 +786,6 @@
     <entry>
       <key>February</key>
     </entry>
-    <entry>
-      <key>Abomodel</key>
-    </entry>
     <entry>
       <key>Confirmed</key>
     </entry>
@@ -2082,12 +2079,6 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-    </entry>
-    <entry>
-      <key>Date (Day)</key>
-    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -2175,24 +2166,12 @@
     <entry>
       <key>New appointment</key>
     </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
     <entry>
       <key>Other Contactroles</key>
     </entry>
     <entry>
       <key>OK</key>
     </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
-    </entry>
     <entry>
       <key>normal</key>
     </entry>
@@ -2241,12 +2220,6 @@
     <entry>
       <key>Marketing</key>
     </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
     <entry>
       <key>${QUANTITY_LOWER_THAN_1}</key>
     </entry>
@@ -3201,9 +3174,6 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -3309,21 +3279,12 @@
     <entry>
       <key>Price Condition</key>
     </entry>
-    <entry>
-      <key>Entität</key>
-    </entry>
-    <entry>
-      <key>Feld</key>
-    </entry>
     <entry>
       <key>Possible Value</key>
     </entry>
     <entry>
       <key>Could not determine the current Classification type (usage).</key>
     </entry>
-    <entry>
-      <key>The new Classification name already exists.</key>
-    </entry>
     <entry>
       <key>Campaign planning</key>
     </entry>
@@ -4491,9 +4452,6 @@
     <entry>
       <key>no valid phone number</key>
     </entry>
-    <entry>
-      <key>EntityToFilterParam</key>
-    </entry>
     <entry>
       <key>Sender</key>
     </entry>
@@ -4734,9 +4692,6 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -4818,12 +4773,6 @@
     <entry>
       <key>Cancellation</key>
     </entry>
-    <entry>
-      <key>Vacation examination by</key>
-    </entry>
-    <entry>
-      <key>Vacation approval by</key>
-    </entry>
     <entry>
       <key>Credit</key>
     </entry>
@@ -4851,9 +4800,6 @@
     <entry>
       <key>HTML template - Only for .html</key>
     </entry>
-    <entry>
-      <key>Plaintext template - Only for .txt and .html</key>
-    </entry>
     <entry>
       <key>Use template attachments</key>
     </entry>
@@ -4875,9 +4821,6 @@
     <entry>
       <key>Private person</key>
     </entry>
-    <entry>
-      <key>Displays the amounts of my personal forecast and the turnover I have already made</key>
-    </entry>
     <entry>
       <key>My Keyfigures</key>
     </entry>
@@ -5025,9 +4968,6 @@
     <entry>
       <key>Ignore whole Cluster</key>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nFunktion und Organisation neu angelegt</key>
-    </entry>
     <entry>
       <key>Has sales approved this step?</key>
     </entry>
@@ -5195,9 +5135,6 @@
     <entry>
       <key>Duplicate</key>
     </entry>
-    <entry>
-      <key>Is ID field</key>
-    </entry>
     <entry>
       <key>Import date</key>
     </entry>
@@ -5276,18 +5213,9 @@
     <entry>
       <key>Info (Contact)</key>
     </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Data could not be imported.</key>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion neu angelegt</key>
-    </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson und Funktion neu angelegt</key>
-    </entry>
     <entry>
       <key>Duplicate status</key>
     </entry>
@@ -5297,15 +5225,9 @@
     <entry>
       <key>Transfer data</key>
     </entry>
-    <entry>
-      <key>Organisation und Person schon vorhanden\nFunktion neu angelegt</key>
-    </entry>
     <entry>
       <key>Ignore daily series</key>
     </entry>
-    <entry>
-      <key>Max results threshold</key>
-    </entry>
     <entry>
       <key>Import Fields</key>
     </entry>
@@ -5354,9 +5276,6 @@
     <entry>
       <key>Import canceled</key>
     </entry>
-    <entry>
-      <key>CSV benötigt</key>
-    </entry>
     <entry>
       <key>Internal (2)</key>
     </entry>
@@ -5366,45 +5285,24 @@
     <entry>
       <key>Import user</key>
     </entry>
-    <entry>
-      <key>Person neu angelegt\nOrganisation mögliche Dublette</key>
-    </entry>
     <entry>
       <key> Info</key>
     </entry>
     <entry>
       <key>Contact Owner</key>
     </entry>
-    <entry>
-      <key>Zeilen verarbeitet</key>
-    </entry>
-    <entry>
-      <key>Organisation und Person mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Import name</key>
     </entry>
     <entry>
       <key>Entity field name</key>
     </entry>
-    <entry>
-      <key>Bug Ticket</key>
-    </entry>
     <entry>
       <key>Salesproject source Id</key>
     </entry>
-    <entry>
-      <key>yearly series not specified</key>
-    </entry>
-    <entry>
-      <key>Organisation oder Person neu angelegt</key>
-    </entry>
     <entry>
       <key>Data imported.</key>
     </entry>
-    <entry>
-      <key>Organisation neu angelegt\nPerson mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Info (Company)</key>
     </entry>
@@ -5414,18 +5312,9 @@
     <entry>
       <key>Möglicherweise ist ein Import-Feld zu groß für das Zielfeld.</key>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nOrganisation mögliche Dublette</key>
-    </entry>
-    <entry>
-      <key>double</key>
-    </entry>
     <entry>
       <key>Record separator</key>
     </entry>
-    <entry>
-      <key>New Bugticket</key>
-    </entry>
     <entry>
       <key>Culture, Sport and Leisure</key>
     </entry>
@@ -5480,9 +5369,6 @@
     <entry>
       <key>Lead preview</key>
     </entry>
-    <entry>
-      <key>No duplicate</key>
-    </entry>
     <entry>
       <key>Standard city</key>
     </entry>
@@ -5507,9 +5393,6 @@
     <entry>
       <key>Internet</key>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion schon vorhanden</key>
-    </entry>
     <entry>
       <key>Negotiations</key>
     </entry>
@@ -5660,9 +5543,6 @@
     <entry>
       <key>unknown</key>
     </entry>
-    <entry>
-      <key>series delete action</key>
-    </entry>
     <entry>
       <key>Choose a campaign and a step to add the contact to a  campaign</key>
     </entry>
@@ -5702,9 +5582,6 @@
     <entry>
       <key>Evaluation</key>
     </entry>
-    <entry>
-      <key>not started</key>
-    </entry>
     <entry>
       <key>cancelled</key>
     </entry>
@@ -5717,9 +5594,6 @@
     <entry>
       <key>booked</key>
     </entry>
-    <entry>
-      <key>off-site</key>
-    </entry>
     <entry>
       <key>Recipt</key>
     </entry>
@@ -5729,9 +5603,6 @@
     <entry>
       <key>Select user</key>
     </entry>
-    <entry>
-      <key>beschränken</key>
-    </entry>
     <entry>
       <key>confirmed</key>
     </entry>
@@ -5756,9 +5627,6 @@
     <entry>
       <key>Tasks of</key>
     </entry>
-    <entry>
-      <key>Datensatz</key>
-    </entry>
     <entry>
       <key>delegated</key>
     </entry>
@@ -5771,9 +5639,6 @@
     <entry>
       <key>deferred</key>
     </entry>
-    <entry>
-      <key>erlauben</key>
-    </entry>
     <entry>
       <key>Error when reading the file!</key>
     </entry>
@@ -5789,15 +5654,9 @@
     <entry>
       <key>Campaign steps </key>
     </entry>
-    <entry>
-      <key>No transfer of private tasks possible!</key>
-    </entry>
     <entry>
       <key>No authorization to postpone the task</key>
     </entry>
-    <entry>
-      <key>LinkedIn</key>
-    </entry>
     <entry>
       <key>low</key>
     </entry>
@@ -5840,15 +5699,9 @@
     <entry>
       <key>Your changes may have an impact on the data privacy information (GDPR).\n Please update these.</key>
     </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
-    </entry>
     <entry>
       <key>Owner</key>
     </entry>
-    <entry>
-      <key>Download Process</key>
-    </entry>
     <entry>
       <key>BPMN</key>
     </entry>
@@ -5891,9 +5744,6 @@
     <entry>
       <key>Manually</key>
     </entry>
-    <entry>
-      <key>Export process</key>
-    </entry>
     <entry>
       <key>To check</key>
     </entry>
@@ -5909,9 +5759,6 @@
     <entry>
       <key>SqlBuilder: The provided values object for updateFields is invalid or is not an object.</key>
     </entry>
-    <entry>
-      <key>Weitere Kontakte</key>
-    </entry>
     <entry>
       <key>Task done</key>
     </entry>
@@ -5927,18 +5774,12 @@
     <entry>
       <key>Permission procurer</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: AB_PERMISSIONCALENDARID or UID and OBJECT_TYPE and PERMISSIONDEALER_ID is not set.</key>
-    </entry>
     <entry>
       <key>Workflow signal</key>
     </entry>
     <entry>
       <key>Signals</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: PERMISSION is not set.</key>
-    </entry>
     <entry>
       <key>AddAction</key>
     </entry>
@@ -5966,9 +5807,6 @@
     <entry>
       <key>Permission Dealer</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onInsert: This operation isn't allowed.</key>
-    </entry>
     <entry>
       <key>LimitedReadPermission</key>
     </entry>
@@ -5978,9 +5816,6 @@
     <entry>
       <key>Permission Dealer User</key>
     </entry>
-    <entry>
-      <key>Berechtigungen</key>
-    </entry>
     <entry>
       <key>Claim task</key>
     </entry>
@@ -5999,15 +5834,9 @@
     <entry>
       <key>Calendar Permission</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onDelete: This operation isn't allowed.</key>
-    </entry>
     <entry>
       <key>Claim date</key>
     </entry>
-    <entry>
-      <key>Auf eigenen Benutzer kann keine Berechtigung gesetzt werden!</key>
-    </entry>
     <entry>
       <key>You can't set a permission to yourself!</key>
     </entry>
@@ -6077,9 +5906,6 @@
     <entry>
       <key>Field and Position</key>
     </entry>
-    <entry>
-      <key>AExport fields of this table</key>
-    </entry>
     <entry>
       <key>Place of Use</key>
     </entry>
@@ -6170,9 +5996,6 @@
     <entry>
       <key>Complete tasks</key>
     </entry>
-    <entry>
-      <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'</key>
-    </entry>
     <entry>
       <key>show visit planning of the week</key>
     </entry>
@@ -6254,9 +6077,6 @@
     <entry>
       <key>Send email</key>
     </entry>
-    <entry>
-      <key>Activites</key>
-    </entry>
     <entry>
       <key>Dispatch as mail</key>
     </entry>
@@ -6275,9 +6095,6 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6332,15 +6149,6 @@
     <entry>
       <key>Visit Recommendations</key>
     </entry>
-    <entry>
-      <key>Besuchsreport erstellt</key>
-    </entry>
-    <entry>
-      <key>geplant</key>
-    </entry>
-    <entry>
-      <key>Termin vereinbart</key>
-    </entry>
     <entry>
       <key>Contactreport</key>
     </entry>
@@ -6389,9 +6197,6 @@
     <entry>
       <key>Parallel gateway</key>
     </entry>
-    <entry>
-      <key>Intermediate throwing event</key>
-    </entry>
     <entry>
       <key>End event</key>
     </entry>
@@ -6410,9 +6215,6 @@
     <entry>
       <key>User task</key>
     </entry>
-    <entry>
-      <key>Intermediate catching event</key>
-    </entry>
     <entry>
       <key>Business rule task</key>
     </entry>
@@ -6533,18 +6335,12 @@
     <entry>
       <key>Archive</key>
     </entry>
-    <entry>
-      <key>BOOL VALUE</key>
-    </entry>
     <entry>
       <key>Support ticket</key>
     </entry>
     <entry>
       <key>Type</key>
     </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
     <entry>
       <key>Senden per E-Mail</key>
     </entry>
@@ -6602,36 +6398,21 @@
     <entry>
       <key>Linked in</key>
     </entry>
-    <entry>
-      <key>Mahnung</key>
-    </entry>
     <entry>
       <key>Lead Imports</key>
     </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
     <entry>
       <key>No Standard-E-Mail available!</key>
     </entry>
     <entry>
       <key>Leadimport</key>
     </entry>
-    <entry>
-      <key>EXPORTTEMPLATE.FIELDLIMITER</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
     <entry>
       <key>Relation type 1</key>
     </entry>
     <entry>
       <key>Relation type 2</key>
     </entry>
-    <entry>
-      <key>Nicht begonnen</key>
-    </entry>
     <entry>
       <key>task number</key>
     </entry>
@@ -6641,30 +6422,18 @@
     <entry>
       <key>hoch</key>
     </entry>
-    <entry>
-      <key>Export coloumns using a exporttemplate</key>
-    </entry>
     <entry>
       <key>QuickEntry</key>
     </entry>
     <entry>
       <key>Leadimports</key>
     </entry>
-    <entry>
-      <key>keine Standard-E-Mail Büro vorhanden !</key>
-    </entry>
     <entry>
       <key>Entry date</key>
     </entry>
     <entry>
       <key>Relation type</key>
     </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
     <entry>
       <key>Leadimport Reset</key>
     </entry>
@@ -6674,24 +6443,12 @@
     <entry>
       <key>finished</key>
     </entry>
-    <entry>
-      <key>EA private task cannot be assigned to somebody else.</key>
-    </entry>
-    <entry>
-      <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key>
-    </entry>
     <entry>
       <key>tentative</key>
     </entry>
     <entry>
       <key>Nein</key>
     </entry>
-    <entry>
-      <key>Termine von</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
     <entry>
       <key>Caimpaignsteps</key>
     </entry>
@@ -6716,9 +6473,6 @@
     <entry>
       <key>Not created yet</key>
     </entry>
-    <entry>
-      <key>ankle of</key>
-    </entry>
     <entry>
       <key>New Visit Recommendation</key>
     </entry>
@@ -6798,132 +6552,167 @@
       <key>Offerrequest</key>
     </entry>
     <entry>
-      <key>Full Permissions</key>
+      <key>Number of employees</key>
     </entry>
     <entry>
-      <key>Full permissions already assigned</key>
+      <key>2. Customer value</key>
     </entry>
     <entry>
-      <key>Import Daten</key>
+      <key>Product preference</key>
     </entry>
     <entry>
-      <key>Import Logs</key>
+      <key>Business development</key>
     </entry>
     <entry>
-      <key>Transferdaten</key>
+      <key>Headquarters</key>
     </entry>
     <entry>
-      <key>Valid from (as </key>
+      <key>Current supply share</key>
     </entry>
     <entry>
-      <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
+      <key>Purchasing potential p. a.</key>
     </entry>
     <entry>
-      <key>Settings</key>
+      <key>ScoreTargetGgroup</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the bulk mail.</key>
+      <key>Stagnated</key>
     </entry>
     <entry>
-      <key>Add Recipients</key>
+      <key>Negative</key>
     </entry>
     <entry>
-      <key>Add Participants</key>
+      <key>1. Target group</key>
     </entry>
     <entry>
-      <key>Download letter and create Activity</key>
+      <key>Positive</key>
     </entry>
     <entry>
-      <key>and open Report</key>
+      <key>0-50</key>
     </entry>
     <entry>
-      <key>export</key>
+      <key>251-1000</key>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
+      <key>Full Permissions</key>
     </entry>
     <entry>
-      <key>No new recipients found that can be added to the serial letter.</key>
+      <key>Full permissions already assigned</key>
     </entry>
     <entry>
-      <key>send mail</key>
+      <key>51-100</key>
     </entry>
     <entry>
-      <key>and open modeler</key>
+      <key>Import Daten</key>
     </entry>
     <entry>
-      <key>Create model</key>
+      <key>Grading</key>
     </entry>
     <entry>
-      <key>Edit workflow</key>
+      <key>Import Logs</key>
     </entry>
     <entry>
-      <key>Receive new Department Permission</key>
+      <key>101-250</key>
     </entry>
     <entry>
-      <key>Receive new User Permission</key>
+      <key>Gradings</key>
     </entry>
     <entry>
-      <key>workflow notification</key>
+      <key>Valid from (as </key>
     </entry>
     <entry>
-      <key>Workflow Model</key>
+      <key>${SQL_LIB_FIELD_WRONG_FORMAT}</key>
     </entry>
     <entry>
-      <key>Current Recipients</key>
+      <key>yellow</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>Is unlinked activity</key>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>Extend</key>
     </entry>
     <entry>
-      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
-                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+      <key>red</key>
     </entry>
     <entry>
-      <key>Recipients after adding</key>
+      <key>Return</key>
     </entry>
     <entry>
-      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+      <key>green</key>
     </entry>
     <entry>
-      <key>Organisations will be exported</key>
+      <key>No new recipients found that can be added to the bulk mail.</key>
     </entry>
     <entry>
-      <key>Contacts will be exported</key>
+      <key>Add Recipients</key>
     </entry>
     <entry>
-      <key>%0 new participants will be added to the campaign.</key>
+      <key>Add Participants</key>
     </entry>
     <entry>
-      <key>%0 of the chosen records are already in the campaign</key>
+      <key>Download letter and create Activity</key>
     </entry>
     <entry>
-      <key>Permission received</key>
+      <key>and open Report</key>
     </entry>
     <entry>
-      <key>leadimport notification</key>
+      <key>export</key>
     </entry>
     <entry>
-      <key>granted permission</key>
+      <key>No new recipients found that can be added to the serial letter.</key>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>send mail</key>
     </entry>
     <entry>
-      <key>download ready</key>
+      <key>and open modeler</key>
+    </entry>
+    <entry>
+      <key>Create model</key>
+    </entry>
+    <entry>
+      <key>Edit workflow</key>
+    </entry>
+    <entry>
+      <key>Receive new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Receive new User Permission</key>
+    </entry>
+    <entry>
+      <key>workflow notification</key>
+    </entry>
+    <entry>
+      <key>Permission received</key>
+    </entry>
+    <entry>
+      <key>granted permission</key>
+    </entry>
+    <entry>
+      <key>Bulk mail sent</key>
+    </entry>
+    <entry>
+      <key>download ready</key>
     </entry>
     <entry>
       <key>Total in euros</key>
     </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
     <entry>
       <key>{SENT_MAIL}</key>
     </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
     <entry>
       <key>Ø Probability</key>
     </entry>
@@ -6943,7 +6732,7 @@
       <key>Archived</key>
     </entry>
     <entry>
-      <key>asdf</key>
+      <key>Settings</key>
     </entry>
     <entry>
       <key>Latitude</key>
@@ -6964,346 +6753,536 @@
       <key>Default</key>
     </entry>
     <entry>
-      <key>Grant new Department Permission</key>
+      <key>Titel</key>
     </entry>
     <entry>
-      <key>Permission Procurer Department</key>
+      <key>Set missing address locations</key>
     </entry>
     <entry>
-      <key>Permission Procurer User</key>
+      <key>FavoriteFilter_view</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
+      <key>Typ</key>
     </entry>
     <entry>
-      <key>yellow</key>
+      <key>Set all address locations</key>
     </entry>
     <entry>
-      <key>Number of employees</key>
+      <key>favorties</key>
     </entry>
     <entry>
-      <key>Borrow</key>
+      <key>Password must contain special characters</key>
     </entry>
     <entry>
-      <key>Selection placeholder</key>
+      <key>Password must be at least %0 characters</key>
     </entry>
     <entry>
-      <key>0-50</key>
+      <key>favorite</key>
     </entry>
     <entry>
-      <key>2. Customer value</key>
+      <key>Repeat password</key>
     </entry>
     <entry>
-      <key>Product preference</key>
+      <key>%0: %1/%2points = %3</key>
     </entry>
     <entry>
-      <key>Business development</key>
+      <key>SELECTION_NULL</key>
     </entry>
     <entry>
-      <key>Till Score</key>
+      <key>Selection ignore case</key>
     </entry>
     <entry>
-      <key>Current password</key>
+      <key>Calendar maintime end</key>
     </entry>
     <entry>
-      <key>Headquarters</key>
+      <key>%0: %1/%2 points = %3</key>
     </entry>
     <entry>
-      <key>Calendar maintime start</key>
+      <key>Classification: </key>
     </entry>
     <entry>
-      <key>251-1000</key>
+      <key>Classificationgroup</key>
     </entry>
     <entry>
-      <key>ab 1000</key>
+      <key>Classificationgroups</key>
     </entry>
     <entry>
-      <key>favorties</key>
+      <key>Indicator</key>
     </entry>
     <entry>
-      <key>Gradings</key>
+      <key>favorites</key>
     </entry>
     <entry>
-      <key>200-349 T€</key>
+      <key>Refresh</key>
     </entry>
     <entry>
-      <key>Fantasy</key>
+      <key>SELECTION_NEITHER</key>
     </entry>
     <entry>
-      <key>100-199 T€</key>
+      <key>Password must contain numbers</key>
     </entry>
     <entry>
-      <key>Password must contain special characters</key>
+      <key>New password</key>
     </entry>
     <entry>
-      <key>Current supply share</key>
+      <key>Calendar hour divider</key>
     </entry>
     <entry>
-      <key>51-100</key>
+      <key>SELECTION_BOTH</key>
     </entry>
     <entry>
-      <key>Password must be at least %0 characters</key>
+      <key>SELECTION_POSTFIX</key>
     </entry>
     <entry>
-      <key>Purchasing potential p. a.</key>
+      <key>Password must contain letters</key>
     </entry>
     <entry>
-      <key>favorite</key>
+      <key>SELECTION_PREFIX</key>
     </entry>
     <entry>
-      <key>Repeat password</key>
+      <key>Password must contain spaces</key>
     </entry>
     <entry>
-      <key>Extend</key>
+      <key>export using the selected template</key>
     </entry>
     <entry>
-      <key>%0: %1/%2points = %3</key>
+      <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
     </entry>
     <entry>
-      <key>ab 350 T€</key>
+      <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
     </entry>
     <entry>
-      <key>Krimi</key>
+      <key>${ACTION_DO_OPEN}</key>
     </entry>
     <entry>
-      <key>red</key>
+      <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
     </entry>
     <entry>
-      <key>0-49 T€</key>
+      <key>Radius Search</key>
     </entry>
     <entry>
-      <key>Return</key>
+      <key>Input value</key>
     </entry>
     <entry>
-      <key>Grading</key>
+      <key>Output value</key>
     </entry>
     <entry>
-      <key>SELECTION_NULL</key>
+      <key>Startdatum</key>
     </entry>
     <entry>
-      <key>ScoreTargetGgroup</key>
+      <key>Mapping</key>
     </entry>
     <entry>
-      <key>Stagnated</key>
+      <key>Mappings</key>
     </entry>
     <entry>
-      <key>Is unlinked activity</key>
+      <key>Radius in km</key>
     </entry>
     <entry>
-      <key>Selection ignore case</key>
+      <key>Members</key>
     </entry>
     <entry>
-      <key>Negative</key>
+      <key>The radius has to be %0 or lesser.</key>
     </entry>
     <entry>
-      <key>Calendar maintime end</key>
+      <key>The given starting location is empty. An area search can not be performed.</key>
     </entry>
     <entry>
-      <key>%0: %1/%2 points = %3</key>
+      <key>The radius has to be at least %0.</key>
     </entry>
     <entry>
-      <key>Classification: </key>
+      <key>Sort up</key>
     </entry>
     <entry>
-      <key>Classificationgroup</key>
+      <key>Sort down</key>
     </entry>
     <entry>
-      <key>Classificationgroups</key>
+      <key>Enter current password to verify</key>
     </entry>
     <entry>
-      <key>Indicator</key>
+      <key>Serverprocess has been started</key>
     </entry>
     <entry>
-      <key>green</key>
+      <key>Run Serverprocess</key>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>200-349 D€</key>
     </entry>
     <entry>
-      <key>Refresh</key>
+      <key>0-49 D€</key>
     </entry>
     <entry>
-      <key>Run ServerProcess</key>
+      <key>100-199 D€</key>
     </entry>
     <entry>
-      <key>1. Target group</key>
+      <key>50-99 D€</key>
     </entry>
     <entry>
-      <key>SELECTION_NEITHER</key>
+      <key>Max Value</key>
     </entry>
     <entry>
-      <key>Password must contain numbers</key>
+      <key>Points</key>
     </entry>
     <entry>
-      <key>New password</key>
+      <key>Child Attributes</key>
     </entry>
     <entry>
-      <key>Actionthriller</key>
+      <key>Recalculate all Classifications</key>
     </entry>
     <entry>
-      <key>Calendar hour divider</key>
+      <key>Reminder:</key>
     </entry>
     <entry>
-      <key>Positive</key>
+      <key>Start Serveprocess</key>
     </entry>
     <entry>
-      <key>SELECTION_BOTH</key>
+      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
     </entry>
     <entry>
-      <key>50-99 T€</key>
+      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
     </entry>
     <entry>
-      <key>SELECTION_POSTFIX</key>
+      <key>Hint</key>
     </entry>
     <entry>
-      <key>101-250</key>
+      <key>Unread</key>
     </entry>
     <entry>
-      <key>Password must contain letters</key>
+      <key>Parent Filter</key>
     </entry>
     <entry>
-      <key>SELECTION_PREFIX</key>
+      <key>Filter information</key>
     </entry>
     <entry>
-      <key>Password must contain spaces</key>
+      <key>District Responsible</key>
     </entry>
     <entry>
-      <key>The use of any of your previous %0 passwords is prohibited</key>
+      <key>Responsibles</key>
     </entry>
     <entry>
-      <key>export using the selected template</key>
+      <key>Districts</key>
     </entry>
     <entry>
-      <key>${DISPLAY_AND_OPEN_ONE_HIT}</key>
+      <key>{$DISTRICTNUMBER}</key>
     </entry>
     <entry>
-      <key>${DISPLAY_AND_OPEN_%0_OF_%1_HITS}</key>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
     </entry>
     <entry>
-      <key>${ACTION_DO_OPEN}</key>
+      <key>Responsible Districts</key>
     </entry>
     <entry>
-      <key>${DISPLAY_AND_OPEN_%0_HITS}</key>
+      <key>District No.:</key>
     </entry>
     <entry>
-      <key>Radius Search</key>
+      <key>Customer counting</key>
     </entry>
     <entry>
-      <key>Input value</key>
+      <key>{$PARENT_DISTRICT}</key>
     </entry>
     <entry>
-      <key>Output value</key>
+      <key>{$DISTRICT_NUMBER}</key>
     </entry>
     <entry>
-      <key>Enddatum</key>
+      <key>District definition</key>
     </entry>
     <entry>
-      <key>Startdatum</key>
+      <key>{$DISTRICT_NO}</key>
     </entry>
     <entry>
-      <key>Mapping</key>
+      <key>{$DISTRICT}</key>
     </entry>
     <entry>
-      <key>Typ</key>
+      <key>The district no has to be bigger than %0</key>
     </entry>
     <entry>
-      <key>Mappings</key>
+      <key>District Filter</key>
     </entry>
     <entry>
-      <key>Radius in km</key>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
     </entry>
     <entry>
-      <key>Titel</key>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</key>
     </entry>
     <entry>
-      <key>Set missing address locations</key>
+      <key>Update all Classification entries in the system</key>
     </entry>
     <entry>
-      <key>FavoriteFilter_view</key>
+      <key>Lead import</key>
     </entry>
     <entry>
-      <key>Set all address locations</key>
+      <key>Nr</key>
     </entry>
     <entry>
-      <key>Members</key>
+      <key>Userhelp Ressources</key>
     </entry>
     <entry>
-      <key>Gruppenname</key>
+      <key>Worklow started</key>
     </entry>
     <entry>
-      <key>The radius has to be %0 or lesser.</key>
+      <key>Selection placeholder</key>
     </entry>
     <entry>
-      <key>The given starting location is empty. An area search can not be performed.</key>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
     </entry>
     <entry>
-      <key>The radius has to be at least %0.</key>
+      <key>Grant new Department Permission</key>
     </entry>
     <entry>
-      <key>Sort up</key>
+      <key>Current password</key>
     </entry>
     <entry>
-      <key>Sort down</key>
+      <key>Calendar maintime start</key>
     </entry>
     <entry>
-      <key>Enter current password to verify</key>
+      <key>The status of the offer was changed to \"sent\".</key>
     </entry>
     <entry>
-      <key>Serverprocess has been started</key>
+      <key>Permission Procurer Department</key>
     </entry>
     <entry>
-      <key>Run Serverprocess</key>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
     </entry>
     <entry>
-      <key>ab 350 D€</key>
+      <key>Organisations will be exported</key>
     </entry>
     <entry>
-      <key>200-349 D€</key>
+      <key>Recipients after adding</key>
     </entry>
     <entry>
-      <key>0-49 D€</key>
+      <key>Contacts will be exported</key>
     </entry>
     <entry>
-      <key>100-199 D€</key>
+      <key>%0 new participants will be added to the campaign.</key>
     </entry>
     <entry>
-      <key>50-99 D€</key>
+      <key>%0 of the chosen records are already in the campaign</key>
     </entry>
     <entry>
-      <key>Max Value</key>
+      <key>Permission Procurer User</key>
     </entry>
     <entry>
-      <key>Points</key>
+      <key>The status of the order was changed to \"sent\".</key>
     </entry>
     <entry>
-      <key>OLDACTION</key>
+      <key>Mark all cached record containers as invalid</key>
     </entry>
     <entry>
-      <key>Run Upgrade Serverprocess</key>
+      <key>%0 of the chosen records are already recipients.</key>
     </entry>
     <entry>
-      <key>Child Attributes</key>
+      <key>Shows the number of Activities of the Grouped Fields</key>
     </entry>
     <entry>
-      <key>Recalculate all Classifications</key>
+      <key>Sales Staff Activity</key>
     </entry>
     <entry>
-      <key>Reminder:</key>
+      <key>Month</key>
     </entry>
     <entry>
-      <key>Start Serveprocess</key>
+      <key>Responsible Department</key>
     </entry>
     <entry>
-      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+      <key>Shows the different conversion rates of the sales project phases</key>
     </entry>
     <entry>
-      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+      <key>Salesproject Convertion Rates</key>
     </entry>
     <entry>
-      <key>Hint</key>
+      <key>Conversion Rate</key>
     </entry>
     <entry>
-      <key>Unread</key>
+      <key>AB_KEYWORD_ENTRYID</key>
+    </entry>
+    <entry>
+      <key>A person can only have one private Contact.</key>
+    </entry>
+    <entry>
+      <key>Linked in (Person)</key>
+    </entry>
+    <entry>
+      <key>Mobile number (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Linked in (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Xing (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Mail (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Mail (Person)</key>
+    </entry>
+    <entry>
+      <key>Blog (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Internet (Person)</key>
+    </entry>
+    <entry>
+      <key>Mobile number (Person)</key>
+    </entry>
+    <entry>
+      <key>Internet (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Blog (Person)</key>
+    </entry>
+    <entry>
+      <key>Phone number (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Xing (Person)</key>
+    </entry>
+    <entry>
+      <key>Phone number (Person)</key>
+    </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+    </entry>
+    <entry>
+      <key>more contacts</key>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>from 350 €</key>
+    </entry>
+    <entry>
+      <key>from 1000</key>
+    </entry>
+    <entry>
+      <key>erlauben</key>
+    </entry>
+    <entry>
+      <key>Intermediate catching event</key>
+    </entry>
+    <entry>
+      <key>Entität</key>
+    </entry>
+    <entry>
+      <key>LinkedIn</key>
+    </entry>
+    <entry>
+      <key>Groupname</key>
+    </entry>
+    <entry>
+      <key>No duplicate</key>
+    </entry>
+    <entry>
+      <key>Vacation examination by</key>
+    </entry>
+    <entry>
+      <key>0-49 €</key>
+    </entry>
+    <entry>
+      <key>100-199 €</key>
+    </entry>
+    <entry>
+      <key>Feld</key>
+    </entry>
+    <entry>
+      <key>Intermediate throwing event</key>
+    </entry>
+    <entry>
+      <key>50-99 €</key>
+    </entry>
+    <entry>
+      <key>Enddate</key>
+    </entry>
+    <entry>
+      <key>200-349 €</key>
+    </entry>
+    <entry>
+      <key>Datensatz</key>
+    </entry>
+    <entry>
+      <key>Startdate</key>
+    </entry>
+    <entry>
+      <key>Vacation approval by</key>
+    </entry>
+    <entry>
+      <key>File from this template could not be found anymore.</key>
+    </entry>
+    <entry>
+      <key>allow</key>
+    </entry>
+    <entry>
+      <key>field</key>
+    </entry>
+    <entry>
+      <key>restrict</key>
+    </entry>
+    <entry>
+      <key>dataset</key>
+    </entry>
+    <entry>
+      <key>entity</key>
+    </entry>
+    <entry>
+      <key>The end date has to be after the start.</key>
+    </entry>
+    <entry>
+      <key>Open Location</key>
+    </entry>
+    <entry>
+      <key>beschränken</key>
+    </entry>
+    <entry>
+      <key>ab 350 D€</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>The start date has to be before the end date.</key>
+    </entry>
+    <entry>
+      <key>Serial Actions</key>
+    </entry>
+    <entry>
+      <key>FavoriteGroup</key>
+    </entry>
+    <entry>
+      <key>Favoritegroup</key>
+    </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+    </entry>
+    <entry>
+      <key>Count Chart</key>
+    </entry>
+    <entry>
+      <key>Sum Chart</key>
+    </entry>
+    <entry>
+      <key>Probability Chart</key>
+    </entry>
+    <entry>
+      <key>Probability in %</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
@@ -7320,11 +7299,11 @@ select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
 union
 select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE
 union
-select TITLE from CLASSIFICATIONSCORE
+select distinct CLASSIFICATIONSCORE.TITLE from CLASSIFICATIONSCORE
 union
-select SCORETYPE from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONTYPE.SCORETYPE from CLASSIFICATIONTYPE
 union
-select distinct CLASSIFICATIONGROUP from CLASSIFICATIONTYPE
+select distinct CLASSIFICATIONGROUP.TITLE from CLASSIFICATIONGROUP
 union
 select AB_ATTRIBUTE.ATTRIBUTE_NAME from AB_ATTRIBUTE</element>
       </statements>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d2e2a0d023e094123b76ba50a54f3b610318892f..f2aba5d40f04df4be587f4dc4b73a2c1f7ceb8d8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
       <key>Probability AI</key>
       <value>Wahrscheinlichkeit KI</value>
     </entry>
+    <entry>
+      <key>The start date has to be before the end date.</key>
+      <value>Das Startdatum muss vor dem Enddatum sein.</value>
+    </entry>
     <entry>
       <key>The given starting location is empty. An area search can not be performed.</key>
       <value>Der übergebene Startpunkt ist leer. Die Umkreissuche kann nicht ausgeführt werden.</value>
@@ -30,6 +34,10 @@
       <key>Open modeler</key>
       <value>Modeler öffnen</value>
     </entry>
+    <entry>
+      <key>Favoritegroup</key>
+      <value>Favoritengruppe</value>
+    </entry>
     <entry>
       <key>Data imported. Contact not found.</key>
       <value>Daten importiert. Keine weiteren Personendaten gefunden.</value>
@@ -40,6 +48,7 @@
     </entry>
     <entry>
       <key>Finished</key>
+      <value>Fertig</value>
     </entry>
     <entry>
       <key>Show my organisations</key>
@@ -107,6 +116,7 @@
     </entry>
     <entry>
       <key>Claim task</key>
+      <value>Aufgabe annehmen</value>
     </entry>
     <entry>
       <key>Finished tasks</key>
@@ -134,6 +144,7 @@
     </entry>
     <entry>
       <key>Maximal</key>
+      <value>Maximal</value>
     </entry>
     <entry>
       <key>Sender address</key>
@@ -305,7 +316,7 @@
     </entry>
     <entry>
       <key>SEEN</key>
-      <value>Neu</value>
+      <value>Ungelesen</value>
     </entry>
     <entry>
       <key>UNSEEN</key>
@@ -387,10 +398,6 @@
       <key>Entrydate (Day)</key>
       <value>Eingangsdatum (Tag)</value>
     </entry>
-    <entry>
-      <key>Date (Day)</key>
-      <value>Datum (Tag)</value>
-    </entry>
     <entry>
       <key>still incorrect</key>
       <value>weiterhin fehlerhaft</value>
@@ -543,10 +550,6 @@
       <key>Entrydate (Month)</key>
       <value>Eingangsdatum (Monat)</value>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-      <value>Datum (Monat)</value>
-    </entry>
     <entry>
       <key>Usage</key>
       <value>Verwendung</value>
@@ -717,6 +720,7 @@
     </entry>
     <entry>
       <key>Edit workflow</key>
+      <value>Workflow editieren</value>
     </entry>
     <entry>
       <key>Date of request</key>
@@ -1161,6 +1165,7 @@
     </entry>
     <entry>
       <key>Liter</key>
+      <value>Liter</value>
     </entry>
     <entry>
       <key>Key account</key>
@@ -1356,6 +1361,7 @@
     </entry>
     <entry>
       <key>Standard</key>
+      <value>Standard</value>
     </entry>
     <entry>
       <key>I / O</key>
@@ -1570,6 +1576,7 @@
     </entry>
     <entry>
       <key>Option4</key>
+      <value>Option4</value>
     </entry>
     <entry>
       <key>Offers</key>
@@ -1577,12 +1584,15 @@
     </entry>
     <entry>
       <key>Option3</key>
+      <value>Option3</value>
     </entry>
     <entry>
       <key>Option2</key>
+      <value>Option2</value>
     </entry>
     <entry>
       <key>Option1</key>
+      <value>Option1</value>
     </entry>
     <entry>
       <key>Countries</key>
@@ -1590,6 +1600,7 @@
     </entry>
     <entry>
       <key>Options</key>
+      <value>Optionen</value>
     </entry>
     <entry>
       <key>Total gross</key>
@@ -1837,12 +1848,15 @@
     </entry>
     <entry>
       <key>Pos.</key>
+      <value>Pos.</value>
     </entry>
     <entry>
       <key>ISO 3166-1 alpha-3</key>
+      <value>ISO 3166-1 alpha-3</value>
     </entry>
     <entry>
       <key>ISO 3166-1 alpha-2</key>
+      <value>ISO 3166-1 alpha-2</value>
     </entry>
     <entry>
       <key>Field staff</key>
@@ -2009,10 +2023,6 @@
       <key>Entrydate must not be in the future</key>
       <value>Eingangsdatum darf nicht in der Zukunft liegen</value>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-      <value>Datum darf nicht in der Zukunft liegen</value>
-    </entry>
     <entry>
       <key>Copy receipt</key>
       <value>Beleg kopieren</value>
@@ -2681,6 +2691,10 @@
       <key>Fiji</key>
       <value>Fidschi</value>
     </entry>
+    <entry>
+      <key>A person can only have one private Contact.</key>
+      <value>Eine Person kann nur einen privaten Kontakt haben.</value>
+    </entry>
     <entry>
       <key>Guinea</key>
       <value>Guinea</value>
@@ -2847,6 +2861,7 @@
     </entry>
     <entry>
       <key>jdito</key>
+      <value>jdito</value>
     </entry>
     <entry>
       <key>Ireland</key>
@@ -3118,6 +3133,7 @@
     </entry>
     <entry>
       <key>Minimal</key>
+      <value>Minimal</value>
     </entry>
     <entry>
       <key>Vanuatu</key>
@@ -3623,18 +3639,23 @@
     </entry>
     <entry>
       <key>MAL</key>
+      <value>MAL</value>
     </entry>
     <entry>
       <key>SQO</key>
+      <value>SQO</value>
     </entry>
     <entry>
       <key>NQC</key>
+      <value>NQC</value>
     </entry>
     <entry>
       <key>MQL</key>
+      <value>MQL</value>
     </entry>
     <entry>
       <key>SAL</key>
+      <value>SAL</value>
     </entry>
     <entry>
       <key>Syrian Arab Republic</key>
@@ -3666,9 +3687,11 @@
     </entry>
     <entry>
       <key>Name \"%0\" already used for container \"%1\"</key>
+      <value>Name \"%0\" wird bereits für Container \"%1\" "benutzt</value>
     </entry>
     <entry>
       <key>CHAR_VALUE</key>
+      <value>CHAR_VALUE</value>
     </entry>
     <entry>
       <key>Keyword Attribute</key>
@@ -3720,6 +3743,7 @@
     </entry>
     <entry>
       <key>relations</key>
+      <value>Beziehungen</value>
     </entry>
     <entry>
       <key>Time</key>
@@ -3754,6 +3778,7 @@
     </entry>
     <entry>
       <key>Mobil</key>
+      <value>Handy</value>
     </entry>
     <entry>
       <key>25%</key>
@@ -3766,6 +3791,7 @@
     </entry>
     <entry>
       <key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
+      <value>Kein Schlüsselwortattribut \"%0\" gefunden in Schlüsselwortcontainer \"%1\"</value>
     </entry>
     <entry>
       <key>competitor</key>
@@ -3864,6 +3890,7 @@
     </entry>
     <entry>
       <key>MQC</key>
+      <value>MQC</value>
     </entry>
     <entry>
       <key>France</key>
@@ -3887,6 +3914,7 @@
     </entry>
     <entry>
       <key>CIF</key>
+      <value>CIF</value>
     </entry>
     <entry>
       <key>ex works</key>
@@ -3908,38 +3936,21 @@
       <key>Contactrole</key>
       <value>Funktion</value>
     </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
     <entry>
       <key>Other Contactroles</key>
       <value>Weitere Funktionen</value>
     </entry>
     <entry>
       <key>OK</key>
-    </entry>
-    <entry>
-      <key>Nicht begonnen</key>
+      <value>OK</value>
     </entry>
     <entry>
       <key>True</key>
       <value>Ja</value>
     </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
     <entry>
       <key>hoch</key>
-      <value></value>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
+      <value>hoch</value>
     </entry>
     <entry>
       <key>Username</key>
@@ -3947,9 +3958,7 @@
     </entry>
     <entry>
       <key>normal</key>
-    </entry>
-    <entry>
-      <key>Termine von</key>
+      <value>Normal</value>
     </entry>
     <entry>
       <key>Product content</key>
@@ -4033,6 +4042,7 @@
     </entry>
     <entry>
       <key>CSO</key>
+      <value>Vertriebsvorstand</value>
     </entry>
     <entry>
       <key>Executive board</key>
@@ -4108,6 +4118,7 @@
     </entry>
     <entry>
       <key>Chart</key>
+      <value>Diagram</value>
     </entry>
     <entry>
       <key>Pending</key>
@@ -4151,6 +4162,7 @@
     </entry>
     <entry>
       <key>Successful</key>
+      <value>Erfolgreich</value>
     </entry>
     <entry>
       <key>Enable relation type 2</key>
@@ -4158,6 +4170,7 @@
     </entry>
     <entry>
       <key>Salesproject Analyses</key>
+      <value>Vertriebsprojektanalysen</value>
     </entry>
     <entry>
       <key>Days count</key>
@@ -4177,18 +4190,23 @@
     </entry>
     <entry>
       <key>[%0]the tableName is not a string after interpreting</key>
+      <value>[%0]Der TabellenName ist nach dem interpretieren nicht vom Typ "string"</value>
     </entry>
     <entry>
       <key>[%0]%1 has to be a string or array but it is %2</key>
+      <value>[%0]%1 muss ein string oder ein array sein, ist aber %2</value>
     </entry>
     <entry>
       <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+      <value>[%0]hat jetzt eine falsche Länge; Elemente erwartet: 2 aber stattdessen %1 bekommen</value>
     </entry>
     <entry>
       <key>[%0]the columnName is not a string after interpreting</key>
+      <value>[%0]Der Spaltenname ist nach dem interpretieren nicht vom Typ "string"</value>
     </entry>
     <entry>
       <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+      <value>[%0]%1 ist vom typ "object" aber scheint kein valides array oder array-ähnlich zu sein</value>
     </entry>
     <entry>
       <key>Responsible</key>
@@ -4222,12 +4240,6 @@
       <key>In planning</key>
       <value>In Planung</value>
     </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
     <entry>
       <key>Added</key>
       <value>Hinzugefügt</value>
@@ -4309,6 +4321,7 @@
     </entry>
     <entry>
       <key>Id value</key>
+      <value>Id Wert</value>
     </entry>
     <entry>
       <key>Order executed</key>
@@ -4316,9 +4329,11 @@
     </entry>
     <entry>
       <key>Liquibase</key>
+      <value>Liquibase</value>
     </entry>
     <entry>
       <key>Number value</key>
+      <value>Zahlenwert</value>
     </entry>
     <entry>
       <key>Author</key>
@@ -4326,12 +4341,15 @@
     </entry>
     <entry>
       <key>Position Id</key>
+      <value>PositionsId</value>
     </entry>
     <entry>
       <key>ISO3</key>
+      <value>ISO3</value>
     </entry>
     <entry>
       <key>ISO2</key>
+      <value>ISO2</value>
     </entry>
     <entry>
       <key>Communication Id</key>
@@ -4343,6 +4361,7 @@
     </entry>
     <entry>
       <key>Modification user</key>
+      <value>Modifizierungsuser</value>
     </entry>
     <entry>
       <key>Headline</key>
@@ -4354,12 +4373,15 @@
     </entry>
     <entry>
       <key>Salesproject milestone Id</key>
+      <value>VertriebsprojektsmeilensteinId</value>
     </entry>
     <entry>
       <key>Appointment Id</key>
+      <value>Termin Id</value>
     </entry>
     <entry>
       <key>Locked</key>
+      <value>Gelocked</value>
     </entry>
     <entry>
       <key>Timetracking Id</key>
@@ -4371,6 +4393,7 @@
     </entry>
     <entry>
       <key>NUMBER VALUE</key>
+      <value>Zahlenwert</value>
     </entry>
     <entry>
       <key>ID</key>
@@ -4390,6 +4413,7 @@
     </entry>
     <entry>
       <key>Object 1 row Id</key>
+      <value>Objekt 1 Row Id</value>
     </entry>
     <entry>
       <key>Side</key>
@@ -4397,6 +4421,7 @@
     </entry>
     <entry>
       <key>Salesproject Id</key>
+      <value>VertriebsprojektId</value>
     </entry>
     <entry>
       <key>Product Id</key>
@@ -4415,6 +4440,7 @@
     </entry>
     <entry>
       <key>Maximal count</key>
+      <value>Maximale Anzahl</value>
     </entry>
     <entry>
       <key>Data executed</key>
@@ -4426,6 +4452,7 @@
     </entry>
     <entry>
       <key>Appointment link Id</key>
+      <value>Terminverknüpfungs Id</value>
     </entry>
     <entry>
       <key>Relation Type</key>
@@ -4449,6 +4476,7 @@
     </entry>
     <entry>
       <key>Object 2 row Id</key>
+      <value>Objekt 2 Row Id</value>
     </entry>
     <entry>
       <key>Source tablename Id</key>
@@ -4468,9 +4496,11 @@
     </entry>
     <entry>
       <key>Parent Id</key>
+      <value>Ãœbergeordnete Id</value>
     </entry>
     <entry>
       <key>Task link Id</key>
+      <value>AufgabenverknüpfungsId</value>
     </entry>
     <entry>
       <key>Keyword attribute Id</key>
@@ -4478,9 +4508,11 @@
     </entry>
     <entry>
       <key>Log type</key>
+      <value>Logtyp</value>
     </entry>
     <entry>
       <key>Object row Id</key>
+      <value>Objekt Row Id</value>
     </entry>
     <entry>
       <key>Labels</key>
@@ -4508,6 +4540,7 @@
     </entry>
     <entry>
       <key>Name native</key>
+      <value>Name Muttersprache</value>
     </entry>
     <entry>
       <key>Flag</key>
@@ -4523,6 +4556,7 @@
     </entry>
     <entry>
       <key>Sex</key>
+      <value>Geschlecht</value>
     </entry>
     <entry>
       <key>Product price Id</key>
@@ -4534,21 +4568,27 @@
     </entry>
     <entry>
       <key>Object Relation Type</key>
+      <value>Objektrelationstyp</value>
     </entry>
     <entry>
       <key>Entry date</key>
+      <value>Eintrittsdatum</value>
     </entry>
     <entry>
       <key>Object relation type 2</key>
+      <value>Objektrelationstyp 2</value>
     </entry>
     <entry>
       <key>Object relation type 1</key>
+      <value>Objektrelationstyp 1</value>
     </entry>
     <entry>
       <key>Modification date</key>
+      <value>Modifizierungsdaten</value>
     </entry>
     <entry>
       <key>Object Type</key>
+      <value>Objekttyp</value>
     </entry>
     <entry>
       <key>%0 from \"%1\" to \"%2\"</key>
@@ -4556,6 +4596,7 @@
     </entry>
     <entry>
       <key>MD5 Sum</key>
+      <value>MD5 Summe</value>
     </entry>
     <entry>
       <key>Letter salutation</key>
@@ -4563,6 +4604,7 @@
     </entry>
     <entry>
       <key>Lock granted</key>
+      <value>Lock gewährt</value>
     </entry>
     <entry>
       <key>Required fields</key>
@@ -4582,9 +4624,11 @@
     </entry>
     <entry>
       <key>LogHistory</key>
+      <value>Loghistorie</value>
     </entry>
     <entry>
       <key>Locked by</key>
+      <value>Gelocked durch</value>
     </entry>
     <entry>
       <key>Salutation Id</key>
@@ -4596,6 +4640,7 @@
     </entry>
     <entry>
       <key>Task Id</key>
+      <value>AufgabenId</value>
     </entry>
     <entry>
       <key>Valid to</key>
@@ -4603,6 +4648,7 @@
     </entry>
     <entry>
       <key>ZIP regex</key>
+      <value>Plz regex</value>
     </entry>
     <entry>
       <key>Keyword entry Id</key>
@@ -4610,6 +4656,7 @@
     </entry>
     <entry>
       <key>Stop costs</key>
+      <value>Stoppkosten</value>
     </entry>
     <entry>
       <key>Contexts</key>
@@ -4625,9 +4672,11 @@
     </entry>
     <entry>
       <key>Date start</key>
+      <value>Startdatum</value>
     </entry>
     <entry>
       <key>Deployment Id</key>
+      <value>Deployment Id</value>
     </entry>
     <entry>
       <key>Address format</key>
@@ -4635,6 +4684,7 @@
     </entry>
     <entry>
       <key>Activity link Id</key>
+      <value>Activity link Id</value>
     </entry>
     <entry>
       <key>Date end</key>
@@ -4642,10 +4692,11 @@
     </entry>
     <entry>
       <key>Creation user</key>
-      <value></value>
+      <value>Ersteller</value>
     </entry>
     <entry>
       <key>Object Id</key>
+      <value>Objekt Id</value>
     </entry>
     <entry>
       <key>Is active</key>
@@ -4670,6 +4721,7 @@
     </entry>
     <entry>
       <key>Tag</key>
+      <value>Tag</value>
     </entry>
     <entry>
       <key>Title suffix</key>
@@ -4677,6 +4729,7 @@
     </entry>
     <entry>
       <key>Step costs</key>
+      <value>Schrittkosten</value>
     </entry>
     <entry>
       <key>Please check if the Salesproject has all necessary information</key>
@@ -4692,9 +4745,11 @@
     </entry>
     <entry>
       <key>Stock Id</key>
+      <value>Lager Id</value>
     </entry>
     <entry>
       <key>Tablename</key>
+      <value>Tabellenname</value>
     </entry>
     <entry>
       <key>CHAR VALUE</key>
@@ -4707,6 +4762,7 @@
     </entry>
     <entry>
       <key>Parent context</key>
+      <value>Ãœbergeordneter Kontext</value>
     </entry>
     <entry>
       <key>Linked Appointments</key>
@@ -4718,6 +4774,7 @@
     </entry>
     <entry>
       <key>Tablename Id</key>
+      <value>TabellennamenId</value>
     </entry>
     <entry>
       <key>rebuild Index</key>
@@ -4737,9 +4794,11 @@
     </entry>
     <entry>
       <key>Logs</key>
+      <value>Logs</value>
     </entry>
     <entry>
       <key>Mail</key>
+      <value>E-Mail</value>
     </entry>
     <entry>
       <key>Phonecall</key>
@@ -4751,6 +4810,7 @@
     </entry>
     <entry>
       <key>Log</key>
+      <value>Log</value>
     </entry>
     <entry>
       <key>Offer Header Text</key>
@@ -5057,6 +5117,7 @@
     </entry>
     <entry>
       <key>Start</key>
+      <value>Start</value>
     </entry>
     <entry>
       <key>End</key>
@@ -5104,10 +5165,11 @@
     </entry>
     <entry>
       <key>Read</key>
-      <value>gelesen</value>
+      <value>Gelesen</value>
     </entry>
     <entry>
       <key>Permission Set ID</key>
+      <value>BerechtigungssetzId</value>
     </entry>
     <entry>
       <key>Create</key>
@@ -5127,6 +5189,7 @@
     </entry>
     <entry>
       <key>View</key>
+      <value>Ansicht</value>
     </entry>
     <entry>
       <key>Salutations</key>
@@ -5164,12 +5227,6 @@
       <key>Price Condition</key>
       <value>Preiskonditionen</value>
     </entry>
-    <entry>
-      <key>Entität</key>
-    </entry>
-    <entry>
-      <key>Feld</key>
-    </entry>
     <entry>
       <key>Possible Value</key>
       <value>Möglicher Wert</value>
@@ -5178,9 +5235,6 @@
       <key>Could not determine the current Classification type (usage).</key>
       <value>der aktuelle Klassifizierungstyp konnte nicht ermittelt werden</value>
     </entry>
-    <entry>
-      <key>The new Classification name already exists.</key>
-    </entry>
     <entry>
       <key>Campaign planning</key>
       <value>Kampagnenplanung</value>
@@ -5530,6 +5584,7 @@
     </entry>
     <entry>
       <key>Support Tickets</key>
+      <value>Supporttickets</value>
     </entry>
     <entry>
       <key>Handcraft</key>
@@ -5857,6 +5912,7 @@
     </entry>
     <entry>
       <key>UID</key>
+      <value>UID</value>
     </entry>
     <entry>
       <key>ticket number</key>
@@ -5868,6 +5924,7 @@
     </entry>
     <entry>
       <key>DATE_NEW_CONTACT</key>
+      <value>Ersteller</value>
     </entry>
     <entry>
       <key>Icon</key>
@@ -5879,12 +5936,15 @@
     </entry>
     <entry>
       <key>PARENT_CONTEXT</key>
+      <value>PARENT_CONTEXT</value>
     </entry>
     <entry>
       <key>OFFER_ID</key>
+      <value>OFFER_ID</value>
     </entry>
     <entry>
       <key>SMS</key>
+      <value>SMS</value>
     </entry>
     <entry>
       <key>CAMPAIGNID (UID)</key>
@@ -5892,6 +5952,7 @@
     </entry>
     <entry>
       <key>PARENT_ID</key>
+      <value>PARENT_ID</value>
     </entry>
     <entry>
       <key>Interfaces</key>
@@ -5903,6 +5964,7 @@
     </entry>
     <entry>
       <key>ORGANISATIONID (UID)</key>
+      <value>ORGANISATIONID (UID)</value>
     </entry>
     <entry>
       <key>SALESORDER_ID</key>
@@ -5930,6 +5992,7 @@
     </entry>
     <entry>
       <key>TASKID (UID)</key>
+      <value>TASKID (UID)</value>
     </entry>
     <entry>
       <key>Fax</key>
@@ -5937,9 +6000,11 @@
     </entry>
     <entry>
       <key>DATE_EDIT</key>
+      <value>Bearbeitungsdatum</value>
     </entry>
     <entry>
       <key>OFFERID (UID)</key>
+      <value>OFFERID (UID)</value>
     </entry>
     <entry>
       <key>Connection Type</key>
@@ -5959,6 +6024,7 @@
     </entry>
     <entry>
       <key>ACTIVITYID (UID)</key>
+      <value>ACTIVITYID (UID)</value>
     </entry>
     <entry>
       <key>Issue</key>
@@ -5978,9 +6044,11 @@
     </entry>
     <entry>
       <key>DATE_NEW</key>
+      <value>Erstellungsdatum</value>
     </entry>
     <entry>
       <key>SALESPROJECTID (UID)</key>
+      <value>SALESPROJECTID (UID)</value>
     </entry>
     <entry>
       <key>ORGANISATION_ID</key>
@@ -5988,21 +6056,26 @@
     </entry>
     <entry>
       <key>CONTRACTID (UID)</key>
+      <value>CONTRACTID (UID)</value>
     </entry>
     <entry>
       <key>[%0]it was necessary to create a file from a blob-field but no lob-file-path was specified.</key>
+      <value>[%0]es war Notwendig eine Datei von einem blob-Feld zu erstellen aber es wurde kein lob-Dateipfad angegeben.</value>
     </entry>
     <entry>
       <key>SqlUtils.getSqlInStatement: if pAsPrepared is true, pPreparedDbType has to be filld with the correct db type</key>
     </entry>
     <entry>
       <key>[%0]it was necessary to create a text-file from a clob-field but no lob-file-path was specified.</key>
+      <value>[%0]es war Notwendig eine Textdatei von einem clob-Feld zu erstellen aber es wurde kein lob-Dateipfad angegeben.</value>
     </entry>
     <entry>
       <key>USER_NEW</key>
+      <value>USER_NEW</value>
     </entry>
     <entry>
       <key>USER_EDIT</key>
+      <value>USER_EDIT</value>
     </entry>
     <entry>
       <key>CONTACTID (UID)</key>
@@ -6018,6 +6091,7 @@
     </entry>
     <entry>
       <key>Support ticket</key>
+      <value>Supportticket</value>
     </entry>
     <entry>
       <key>Modul group</key>
@@ -6029,6 +6103,7 @@
     </entry>
     <entry>
       <key>no keyword attribute \"%0\" found in keyword \"%1\" from container \"%2\"</key>
+      <value>Kein Schlüsselwortattribute \"%0\" gefunden in Schlüsselwort \"%1\" von Container \"%2\"</value>
     </entry>
     <entry>
       <key>SALESORDERID (UID)</key>
@@ -6048,6 +6123,7 @@
     </entry>
     <entry>
       <key>USER_NEW_CONTACT</key>
+      <value>USER_NEW_CONTACT</value>
     </entry>
     <entry>
       <key>All selected participants already are in the campaign</key>
@@ -6083,6 +6159,7 @@
     </entry>
     <entry>
       <key>Update</key>
+      <value>Update</value>
     </entry>
     <entry>
       <key>Blog</key>
@@ -6098,9 +6175,7 @@
     </entry>
     <entry>
       <key>Xing</key>
-    </entry>
-    <entry>
-      <key>LinkedIn</key>
+      <value>Xing</value>
     </entry>
     <entry>
       <key>%0 new recipients will be added to the serial letter.</key>
@@ -6287,14 +6362,13 @@
       <key>no valid phone number</key>
       <value>keine gültige Telefonnummer</value>
     </entry>
-    <entry>
-      <key>EntityToFilterParam</key>
-    </entry>
     <entry>
       <key>Sender</key>
+      <value>Sender</value>
     </entry>
     <entry>
       <key>parameter</key>
+      <value>Parameter</value>
     </entry>
     <entry>
       <key>Test DuplicateSearch</key>
@@ -6346,6 +6420,7 @@
     </entry>
     <entry>
       <key>Exec type</key>
+      <value>"Exec" Typ</value>
     </entry>
     <entry>
       <key>Permission Details</key>
@@ -6415,9 +6490,6 @@
       <key>Texts</key>
       <value>Texte</value>
     </entry>
-    <entry>
-      <key>keine Standard-E-Mail Büro vorhanden !</key>
-    </entry>
     <entry>
       <key>Choose payment address</key>
       <value>Zahlungsadresse auswählen</value>
@@ -6472,7 +6544,7 @@
     </entry>
     <entry>
       <key>Print order</key>
-      <value>Beleg drucken</value>
+      <value>Beleg anzeigen</value>
     </entry>
     <entry>
       <key>Order number</key>
@@ -6500,6 +6572,7 @@
     </entry>
     <entry>
       <key>Rech.-Betrag</key>
+      <value></value>
     </entry>
     <entry>
       <key>Order date</key>
@@ -6513,9 +6586,6 @@
       <key>Order amount</key>
       <value>Bestellmenge</value>
     </entry>
-    <entry>
-      <key>Mahnung</key>
-    </entry>
     <entry>
       <key>Due</key>
       <value>Fällig</value>
@@ -6530,6 +6600,7 @@
     </entry>
     <entry>
       <key>No duplicates allowed: action '</key>
+      <value>Keine Duplikate erlaubt: Aktion '</value>
     </entry>
     <entry>
       <key>Empty actions are not allowed!</key>
@@ -6547,10 +6618,6 @@
       <key>Entrydate (Year)</key>
       <value>Eingangsdatum (Jahr)</value>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-      <value>Datum (Jahr)</value>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
       <value>Attribute müssen eindeutig sein</value>
@@ -6561,6 +6628,7 @@
     </entry>
     <entry>
       <key>This error should never appear - contact administrator (PermissionDetail_entity.PermissionAction.onValidation).</key>
+      <value>Dieser Fehler sollte nie erscheinen - kontaktieren sie einen Administrator (PermissionDetail_entity.PermissionAction.onValidation).</value>
     </entry>
     <entry>
       <key>Empty actions are invalid!</key>
@@ -6600,6 +6668,7 @@
     </entry>
     <entry>
       <key>Sender: %0</key>
+      <value>Sender: %0</value>
     </entry>
     <entry>
       <key>Offer Id</key>
@@ -6629,6 +6698,7 @@
     </entry>
     <entry>
       <key>Name latin</key>
+      <value>Name Latein</value>
     </entry>
     <entry>
       <key>Order confirmation</key>
@@ -6644,18 +6714,12 @@
     </entry>
     <entry>
       <key>Receipt Header Text</key>
-      <value>Beleg kopftext</value>
+      <value>Beleg Kopftext</value>
     </entry>
     <entry>
       <key>Cancellation</key>
       <value>Stornierung</value>
     </entry>
-    <entry>
-      <key>Vacation examination by</key>
-    </entry>
-    <entry>
-      <key>Vacation approval by</key>
-    </entry>
     <entry>
       <key>Credit</key>
       <value>Gutschrift</value>
@@ -6674,6 +6738,7 @@
     </entry>
     <entry>
       <key>Wrong filetype for the current document template type and classification.</key>
+      <value>Falscher Dateityp für den derzeitigen dokumentenvorlagentyp und Klassifizierung.</value>
     </entry>
     <entry>
       <key>Use template attachments</key>
@@ -6691,9 +6756,6 @@
       <key>Preview</key>
       <value>Vorschau</value>
     </entry>
-    <entry>
-      <key>Plaintext template - Only for .txt and .html</key>
-    </entry>
     <entry>
       <key>Action not supported</key>
       <value>Aktion wird nicht unterstützt</value>
@@ -6777,9 +6839,11 @@
     </entry>
     <entry>
       <key>The contract number already exists!</key>
+      <value>Die Vertragsnummer existiert bereits!</value>
     </entry>
     <entry>
       <key>Morocco</key>
+      <value>Marokko</value>
     </entry>
     <entry>
       <key>Colombia</key>
@@ -6823,21 +6887,23 @@
     </entry>
     <entry>
       <key>Salesproject forecast Id</key>
+      <value>Vertriebsprojekt VorhersagenId</value>
     </entry>
     <entry>
       <key>Everyone</key>
+      <value>Alle</value>
     </entry>
     <entry>
       <key>Salesproject member Id</key>
+      <value>VertriebsprojektsteilnehmerId</value>
     </entry>
     <entry>
       <key>Edit</key>
+      <value>Editieren</value>
     </entry>
     <entry>
       <key>task number</key>
-    </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+      <value>Afgabennummer</value>
     </entry>
     <entry>
       <key>in process</key>
@@ -6845,6 +6911,7 @@
     </entry>
     <entry>
       <key>Salesproject competition Id</key>
+      <value>VertriebsprojektmitbewerberId</value>
     </entry>
     <entry>
       <key>Ignore series</key>
@@ -6856,6 +6923,7 @@
     </entry>
     <entry>
       <key>To buildingnumber</key>
+      <value>Bis hausnummer</value>
     </entry>
     <entry>
       <key>Ignore daily series</key>
@@ -6865,11 +6933,9 @@
       <key>From buildingnumber</key>
       <value>ab Hausnummer</value>
     </entry>
-    <entry>
-      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
-    </entry>
     <entry>
       <key>Resource</key>
+      <value>Resource</value>
     </entry>
     <entry>
       <key>Internal (2)</key>
@@ -6877,24 +6943,15 @@
     </entry>
     <entry>
       <key>Set campaign step</key>
-    </entry>
-    <entry>
-      <key>Bug Ticket</key>
+      <value>kampagnenschritt setzen</value>
     </entry>
     <entry>
       <key>Salesproject source Id</key>
-    </entry>
-    <entry>
-      <key>yearly series not specified</key>
-    </entry>
-    <entry>
-      <key>double</key>
-    </entry>
-    <entry>
-      <key>New Bugticket</key>
+      <value>VertriebsprojektquellenId</value>
     </entry>
     <entry>
       <key>participants will be added to the selected campaign step</key>
+      <value>Teilnehmer werden dem ausgewähltem Kampagnenschritt hinzugefügt.</value>
     </entry>
     <entry>
       <key>yyyyMMdd</key>
@@ -6905,14 +6962,12 @@
     </entry>
     <entry>
       <key>closed</key>
+      <value>geschlossen</value>
     </entry>
     <entry>
       <key>Internet</key>
       <value>Internet</value>
     </entry>
-    <entry>
-      <key>Displays the amounts of my personal forecast and the turnover I have already made</key>
-    </entry>
     <entry>
       <key>My Keyfigures</key>
       <value>Mein Umsatz und Forecast</value>
@@ -7011,14 +7066,12 @@
     </entry>
     <entry>
       <key>Ignore whole Cluster</key>
+      <value>ganzen Cluster ignorieren</value>
     </entry>
     <entry>
       <key>Data block size</key>
       <value>Datenblockgröße</value>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nFunktion und Organisation neu angelegt</key>
-    </entry>
     <entry>
       <key>Import Date</key>
       <value>Import Datum</value>
@@ -7029,6 +7082,7 @@
     </entry>
     <entry>
       <key>Standard mail</key>
+      <value>Standard E-Mailadresse</value>
     </entry>
     <entry>
       <key>Field delimiter</key>
@@ -7084,6 +7138,7 @@
     </entry>
     <entry>
       <key>Standard street</key>
+      <value>Standardstraße</value>
     </entry>
     <entry>
       <key>Importer created</key>
@@ -7103,9 +7158,11 @@
     </entry>
     <entry>
       <key>CRLF</key>
+      <value>CRLF</value>
     </entry>
     <entry>
       <key>Accept 1st line</key>
+      <value>1. Zeile annehmen</value>
     </entry>
     <entry>
       <key>Inserted rows</key>
@@ -7131,9 +7188,6 @@
       <key>Leadimports</key>
       <value>Leadimport</value>
     </entry>
-    <entry>
-      <key>Is ID field</key>
-    </entry>
     <entry>
       <key>Import date</key>
       <value>Import Datum</value>
@@ -7236,20 +7290,12 @@
     </entry>
     <entry>
       <key>Info (Contact)</key>
-    </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson mögliche Dublette</key>
+      <value>Info (Kontakt)</value>
     </entry>
     <entry>
       <key>Field configuration</key>
       <value>Feldkonfiguration</value>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion neu angelegt</key>
-    </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson und Funktion neu angelegt</key>
-    </entry>
     <entry>
       <key>Duplicate status</key>
       <value>Dublettenstatus</value>
@@ -7258,12 +7304,6 @@
       <key>Transfer data</key>
       <value>Daten transferieren</value>
     </entry>
-    <entry>
-      <key>Organisation und Person schon vorhanden\nFunktion neu angelegt</key>
-    </entry>
-    <entry>
-      <key>Max results threshold</key>
-    </entry>
     <entry>
       <key>Import Fields</key>
       <value>Import Felder</value>
@@ -7274,6 +7314,7 @@
     </entry>
     <entry>
       <key>Rebuild Organisation duplicates cache</key>
+      <value>Firmen Dubletten Cache wiederherstellen</value>
     </entry>
     <entry>
       <key>Tab</key>
@@ -7299,24 +7340,13 @@
       <key>Import canceled</key>
       <value>Import abgebrochen</value>
     </entry>
-    <entry>
-      <key>CSV benötigt</key>
-    </entry>
     <entry>
       <key>Import user</key>
       <value>Import Benutzer</value>
     </entry>
-    <entry>
-      <key>Person neu angelegt\nOrganisation mögliche Dublette</key>
-    </entry>
     <entry>
       <key> Info</key>
-    </entry>
-    <entry>
-      <key>Zeilen verarbeitet</key>
-    </entry>
-    <entry>
-      <key>Organisation und Person mögliche Dublette</key>
+      <value>Info</value>
     </entry>
     <entry>
       <key>Import name</key>
@@ -7326,19 +7356,10 @@
       <key>Entity field name</key>
       <value>Entitäten-Feldname</value>
     </entry>
-    <entry>
-      <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key>
-    </entry>
     <entry>
       <key>Linked in</key>
       <value>LinkedIn</value>
     </entry>
-    <entry>
-      <key>Organisation oder Person neu angelegt</key>
-    </entry>
-    <entry>
-      <key>Organisation neu angelegt\nPerson mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Info (Company)</key>
       <value>Info (Firma)</value>
@@ -7347,19 +7368,17 @@
       <key>Möglicherweise ist ein Import-Feld zu groß für das Zielfeld.</key>
       <value>An import field may be too large for the target field.</value>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nOrganisation mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Record separator</key>
       <value>Satztrenner</value>
     </entry>
     <entry>
       <key>Rebuild Person duplicates cache</key>
-      <value>Firmen Dubletten Cache wiederherstellen</value>
+      <value>Personen Dubletten Cache wiederherstellen</value>
     </entry>
     <entry>
       <key>Unrelated organisation duplicates</key>
+      <value>Unabhängige Firmendupletten</value>
     </entry>
     <entry>
       <key>Load data</key>
@@ -7383,30 +7402,31 @@
     </entry>
     <entry>
       <key>Standard phone</key>
+      <value>Standardtelefonnummer</value>
     </entry>
     <entry>
       <key>Nein</key>
-      <value></value>
+      <value>Nein</value>
     </entry>
     <entry>
       <key>Use for duplicate search</key>
+      <value>Für Duplettensuche benutzen</value>
     </entry>
     <entry>
       <key>Lead preview</key>
       <value>Lead Vorschau</value>
     </entry>
-    <entry>
-      <key>No duplicate</key>
-    </entry>
     <entry>
       <key>Standard city</key>
+      <value>Standardstadt</value>
     </entry>
     <entry>
       <key>Standard zip</key>
+      <value>Standard PLZ</value>
     </entry>
     <entry>
       <key>Leadimport</key>
-      <value></value>
+      <value>Leadimport</value>
     </entry>
     <entry>
       <key>Import logs</key>
@@ -7416,9 +7436,6 @@
       <key>Data loaded</key>
       <value>Daten geladen</value>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion schon vorhanden</key>
-    </entry>
     <entry>
       <key>%0 duplicate has been identified.</key>
       <value>Es wurde %0 Dublette identifiziert.</value>
@@ -7445,6 +7462,7 @@
     </entry>
     <entry>
       <key>Hospitality</key>
+      <value>Gastfreundschaft</value>
     </entry>
     <entry>
       <key>Scan pattern</key>
@@ -7452,12 +7470,14 @@
     </entry>
     <entry>
       <key>No consumer found for context '%0'</key>
+      <value>Kein consumer für den Kontext '%0' gefunden.</value>
     </entry>
     <entry>
       <key>SqlBuilder: pValue (or pFieldOrCond if only one param) is not allowed to be null, undefined or []. (use *IfSet functions if you need optional conditions which are just ignored if value is null or undefined)</key>
     </entry>
     <entry>
       <key>pExecuteOnlyIfConditionExists has to be of type boolean. This parameter controls what happens if the condition is empty (select / delete all or nothing)</key>
+      <value>pExecuteOnlyIfConditionExists muss vom typ "boolean" sein. Dieser Parameter steuert was passiert wenn die condition leer ist (selektieren / löschen alles oder nichts)</value>
     </entry>
     <entry>
       <key>is assignable</key>
@@ -7465,6 +7485,7 @@
     </entry>
     <entry>
       <key>Parent Role</key>
+      <value>Ãœbergeordnete Rolle</value>
     </entry>
     <entry>
       <key>SqlBuilder must be instanciated with 'new' or one of the factory methods (newSelect, newWhere, newWhereIfSet)</key>
@@ -7483,9 +7504,11 @@
     </entry>
     <entry>
       <key>Entity id field name</key>
+      <value>EntitätsIdfeldname</value>
     </entry>
     <entry>
       <key>[%0]has now an incorrect length; estimated 2 or 3 elements but got %1</key>
+      <value>[%0]hat jetzt eine falsche Länge; Elemente erwartet: 2 oder 3 aber stattdessen %1 bekommen</value>
     </entry>
     <entry>
       <key>Children</key>
@@ -7540,12 +7563,15 @@
     </entry>
     <entry>
       <key>[%0]%1 has to be a string without empty spaces, (, ), =, &lt;, &gt;  but it contains at least one of them</key>
+      <value>[%0]%1 muss ein string ohne Leerzeichen, (, ), =, &lt;, &gt;  sein aber beinhaltet mindestens eins davon</value>
     </entry>
     <entry>
       <key>%0 leads imported, %1 errors</key>
+      <value>%0 leads importiert, %1 Fehler.</value>
     </entry>
     <entry>
       <key>[%0]the tableAlias is not a string after interpreting</key>
+      <value>[%0]Der TabellenAlias ist nach dem interpretieren nicht vom Typ "string"</value>
     </entry>
     <entry>
       <key>SqlBuilder: invalid value-type for pFieldOrCond. It can be a fully qualified SqlBuilder (e.g. select, from, ... have to be set) or an jdito-prepared-statement array</key>
@@ -7568,6 +7594,7 @@
     </entry>
     <entry>
       <key>HH:mm</key>
+      <value></value>
     </entry>
     <entry>
       <key>%0 | %1 - %2 o'clock</key>
@@ -7629,9 +7656,6 @@
       <key>Apply changes for all</key>
       <value>Änderungen für alle übernehmen</value>
     </entry>
-    <entry>
-      <key>series delete action</key>
-    </entry>
     <entry>
       <key>New child attribute</key>
       <value>Untergeordnete Eigenschaft anlegen</value>
@@ -7648,28 +7672,26 @@
       <key>Evaluation</key>
       <value>Auswertung</value>
     </entry>
-    <entry>
-      <key>not started</key>
-    </entry>
     <entry>
       <key>cancelled</key>
+      <value>abgebrochen</value>
     </entry>
     <entry>
       <key>free</key>
+      <value>kostenlos</value>
     </entry>
     <entry>
       <key>finished</key>
+      <value>fertig</value>
     </entry>
     <entry>
       <key>tentativ</key>
+      <value>vorläufig</value>
     </entry>
     <entry>
       <key>booked</key>
       <value>gebucht</value>
     </entry>
-    <entry>
-      <key>off-site</key>
-    </entry>
     <entry>
       <key>Recipt</key>
       <value>Beleg</value>
@@ -7680,12 +7702,11 @@
     </entry>
     <entry>
       <key>Select user</key>
-    </entry>
-    <entry>
-      <key>beschränken</key>
+      <value>Benutzer auswählen</value>
     </entry>
     <entry>
       <key>confirmed</key>
+      <value>bestätigt</value>
     </entry>
     <entry>
       <key>Please verify Date</key>
@@ -7698,6 +7719,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Please vertify Date</key>
+      <value>Bitte Datum vertifizieren</value>
     </entry>
     <entry>
       <key>Please set filter conditions</key>
@@ -7711,18 +7733,13 @@ Bitte Datumseingabe prüfen</value>
       <key>Tasks of</key>
       <value>Tasks of</value>
     </entry>
-    <entry>
-      <key>Datensatz</key>
-    </entry>
     <entry>
       <key>delegated</key>
       <value>delegiert</value>
     </entry>
     <entry>
       <key>Desciption</key>
-    </entry>
-    <entry>
-      <key>EA private task cannot be assigned to somebody else.</key>
+      <value>Beschreibung</value>
     </entry>
     <entry>
       <key>A private task cannot be assigned to somebody else.</key>
@@ -7732,9 +7749,6 @@ Bitte Datumseingabe prüfen</value>
       <key>deferred</key>
       <value>erledigt</value>
     </entry>
-    <entry>
-      <key>erlauben</key>
-    </entry>
     <entry>
       <key>Error when reading the file!</key>
       <value>Fehler beim Einlesen der Datei!</value>
@@ -7759,22 +7773,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Campaign steps </key>
       <value>Kampagnen Stufen </value>
     </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>No transfer of private tasks possible!</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
     <entry>
       <key>No authorization to postpone the task</key>
       <value>Keine Berechtigung zum Verschieben der Aufgabe</value>
     </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
     <entry>
       <key>low</key>
       <value>niedrig</value>
@@ -7797,9 +7799,6 @@ Bitte Datumseingabe prüfen</value>
       <key>My workflow tasks</key>
       <value>Meine Workflow Aufgaben</value>
     </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
     <entry>
       <key>Senden per E-Mail</key>
     </entry>
@@ -7809,21 +7808,23 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>QuickEntry</key>
+      <value>Schnelleingabe</value>
     </entry>
     <entry>
       <key>Owner</key>
-    </entry>
-    <entry>
-      <key>Download Process</key>
+      <value>Besitzer</value>
     </entry>
     <entry>
       <key>BPMN</key>
+      <value>BPMN</value>
     </entry>
     <entry>
       <key>Process</key>
+      <value>Prozess</value>
     </entry>
     <entry>
       <key>Test</key>
+      <value>Test</value>
     </entry>
     <entry>
       <key>Trigger</key>
@@ -7835,9 +7836,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Version</key>
+      <value>Version</value>
     </entry>
     <entry>
       <key>The file must be a XML</key>
+      <value>Die Datei muss vom typ "XML" sein</value>
     </entry>
     <entry>
       <key>Quick Entry</key>
@@ -7845,18 +7848,22 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Additional Contacts</key>
+      <value>zusätzliche Kontakte</value>
     </entry>
     <entry>
       <key>SqlBuilder: The provided values object for updateFields is invalid or is not an object.</key>
     </entry>
     <entry>
-      <key>Weitere Kontakte</key>
+      <key>Serial Actions</key>
+      <value>Serienaktionen</value>
     </entry>
     <entry>
       <key>${CANCELLED}</key>
+      <value>Abgebrochen</value>
     </entry>
     <entry>
       <key>Workflow signal</key>
+      <value>Workflow Signal</value>
     </entry>
     <entry>
       <key>Seperator</key>
@@ -7872,6 +7879,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Context</key>
+      <value>Kontext</value>
     </entry>
     <entry>
       <key>ExportTemplateFieldID</key>
@@ -7879,6 +7887,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Signal</key>
+      <value>Signal</value>
     </entry>
     <entry>
       <key>Export Template Field</key>
@@ -7890,6 +7899,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Scope</key>
+      <value>Scope</value>
     </entry>
     <entry>
       <key>Export Template</key>
@@ -7905,6 +7915,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Claim date</key>
+      <value>Zuweisungsdatum</value>
     </entry>
     <entry>
       <key>Comma</key>
@@ -7930,9 +7941,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Field and Position</key>
       <value>Feld und Position</value>
     </entry>
-    <entry>
-      <key>AExport fields of this table</key>
-    </entry>
     <entry>
       <key>Place of Use</key>
       <value>Verwendungsort</value>
@@ -7987,12 +7995,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Senderemail</key>
+      <value>Senderemail-adresse</value>
     </entry>
     <entry>
       <key>Senderphone</key>
+      <value>Sendertelefonnummer</value>
     </entry>
     <entry>
       <key>Sendername</key>
+      <value>Sendername</value>
     </entry>
     <entry>
       <key>FullAddress</key>
@@ -8031,16 +8042,20 @@ Bitte Datumseingabe prüfen</value>
       <value>Trennzeichen</value>
     </entry>
     <entry>
-      <key>File from this template could not be found anymore. </key>
+      <key>File from this template could not be found anymore.</key>
+      <value>Datei von diesem Template konnte nicht mehr gefunden werden.</value>
     </entry>
     <entry>
       <key>delete linked permissions and hierarchies</key>
+      <value>lösche verlinkte Berechtigungen und Hierachien</value>
     </entry>
     <entry>
       <key>Child Roles</key>
+      <value>Kinderrollen</value>
     </entry>
     <entry>
       <key>Parent Roles</key>
+      <value>Ãœbergeordnete Rollen</value>
     </entry>
     <entry>
       <key>Export columns using a exporttemplate</key>
@@ -8050,14 +8065,9 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission procurer</key>
       <value>Rechteempfänger</value>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: AB_PERMISSIONCALENDARID or UID and OBJECT_TYPE and PERMISSIONDEALER_ID is not set.</key>
-    </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: PERMISSION is not set.</key>
-    </entry>
     <entry>
       <key>AddAction</key>
+      <value>Hinzufügen-Action</value>
     </entry>
     <entry>
       <key>NoPermissions</key>
@@ -8079,9 +8089,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Permission Dealer</key>
       <value>Rechtegeber</value>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onInsert: This operation isn't allowed.</key>
-    </entry>
     <entry>
       <key>LimitedReadPermission</key>
       <value>eingeschränkte Leseberechtigung</value>
@@ -8106,12 +8113,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Calendar Permission</key>
       <value>Kalender-Berechtigungen</value>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onDelete: This operation isn't allowed.</key>
-    </entry>
-    <entry>
-      <key>Auf eigenen Benutzer kann keine Berechtigung gesetzt werden!</key>
-    </entry>
     <entry>
       <key>You can't set a permission to yourself!</key>
       <value>Sie können keine Berechtigungen für sich selbst setzen.</value>
@@ -8122,6 +8123,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Deparment</key>
+      <value>Abteilung</value>
     </entry>
     <entry>
       <key>Add new User Permission</key>
@@ -8137,6 +8139,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>External Service</key>
+      <value>Aussendienst</value>
     </entry>
     <entry>
       <key>show visit planning of the week</key>
@@ -8176,6 +8179,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>The endtime can't be before begintime!</key>
+      <value>Die Endzeit darf nicht vor der Startzeit liegen!</value>
     </entry>
     <entry>
       <key>Rights of access</key>
@@ -8183,12 +8187,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Leadimport Reset</key>
+      <value>Leadimport zurücksetzen</value>
     </entry>
     <entry>
       <key>Create notification</key>
+      <value>benachrichtigung erstellen</value>
     </entry>
     <entry>
       <key>Set attribute</key>
+      <value>Eigenschaft setzen</value>
     </entry>
     <entry>
       <key>End time</key>
@@ -8200,6 +8207,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Workflow management</key>
+      <value>Workflow management</value>
     </entry>
     <entry>
       <key>my visit planning</key>
@@ -8207,6 +8215,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Update offer</key>
+      <value>Angebot updaten</value>
     </entry>
     <entry>
       <key>New Visit Recommendation</key>
@@ -8220,6 +8229,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Monthly</key>
       <value>monatlich</value>
     </entry>
+    <entry>
+      <key>The status of the order was changed to \"sent\".</key>
+      <value>Der Status des Belegs wurde auf \"versendet\" gesetzt.</value>
+    </entry>
     <entry>
       <key>Yearly</key>
       <value>jährlich</value>
@@ -8232,10 +8245,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Entrydate has to be in the selected calendar week!</key>
       <value>Eingangsdatum muss in der ausgewählten Kalenderwoche liegen!</value>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-      <value>Datum muss in der ausgewählten Kalenderwoche liegen!</value>
-    </entry>
     <entry>
       <key>Invalid year!</key>
       <value>Ungültiges jahr!</value>
@@ -8254,12 +8263,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Send email</key>
-    </entry>
-    <entry>
-      <key>Activites</key>
-    </entry>
-    <entry>
-      <key>Export process</key>
+      <value>E-Mail senden</value>
     </entry>
     <entry>
       <key>From</key>
@@ -8272,6 +8276,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Date Planned</key>
+      <value>geplanntes Datum</value>
     </entry>
     <entry>
       <key>Priority Source</key>
@@ -8279,6 +8284,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Planned By</key>
+      <value>Geplannt von</value>
     </entry>
     <entry>
       <key>Due Date</key>
@@ -8290,6 +8296,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Appointment arranged</key>
+      <value>Termin vereinbart</value>
     </entry>
     <entry>
       <key>Visitreport created</key>
@@ -8309,6 +8316,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Linked Appointment</key>
+      <value>Verknüpfte Termine</value>
     </entry>
     <entry>
       <key>Visitplan Entries</key>
@@ -8318,15 +8326,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Visit Recommendations</key>
       <value>Besuchsvorschläge</value>
     </entry>
-    <entry>
-      <key>Besuchsreport erstellt</key>
-    </entry>
-    <entry>
-      <key>geplant</key>
-    </entry>
-    <entry>
-      <key>Termin vereinbart</key>
-    </entry>
     <entry>
       <key>Contactreport</key>
       <value>Kontaktbericht</value>
@@ -8339,20 +8338,13 @@ Bitte Datumseingabe prüfen</value>
       <key>Visitreport</key>
       <value>Besuchsbericht</value>
     </entry>
-    <entry>
-      <key>Export coloumns using a exporttemplate</key>
-    </entry>
     <entry>
       <key>add new Department Permission</key>
+      <value>neue Abteilungsberechtigung</value>
     </entry>
     <entry>
       <key>add new User Permission</key>
-    </entry>
-    <entry>
-      <key>ankle of</key>
-    </entry>
-    <entry>
-      <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'</key>
+      <value>neue Userberechtigung hinzufügen</value>
     </entry>
     <entry>
       <key>Create new Visitreport</key>
@@ -8406,9 +8398,6 @@ Bitte Datumseingabe prüfen</value>
       <key>Parallel gateway</key>
       <value>Paralleles Gateway</value>
     </entry>
-    <entry>
-      <key>Intermediate throwing event</key>
-    </entry>
     <entry>
       <key>End event</key>
       <value>End-Ereignis</value>
@@ -8433,9 +8422,6 @@ Bitte Datumseingabe prüfen</value>
       <key>User task</key>
       <value>Benutzer-Aufgabe</value>
     </entry>
-    <entry>
-      <key>Intermediate catching event</key>
-    </entry>
     <entry>
       <key>Business rule task</key>
       <value>Geschäftsregel-Aufgabe</value>
@@ -8466,6 +8452,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Their Permissions</key>
+      <value>Ihre Berechtigungen</value>
     </entry>
     <entry>
       <key>SqlBuilder: The provided callback function is not a function.</key>
@@ -8483,11 +8470,12 @@ Bitte Datumseingabe prüfen</value>
       <value>Angebot anzeigen</value>
     </entry>
     <entry>
-      <key>The status of the offer was changed to \"Sent\".</key>
-      <value>Der Status des Angebots wurde auf \"Versendet\" gesetzt.</value>
+      <key>The status of the offer was changed to \"sent\".</key>
+      <value>Der Status des Angebots wurde auf \"versendet\" gesetzt.</value>
     </entry>
     <entry>
       <key>pCallbackFn is not a function</key>
+      <value>pCallbackFn ist keine Funktion</value>
     </entry>
     <entry>
       <key>Offer status changed</key>
@@ -8499,6 +8487,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Offer status changed!</key>
+      <value>Angebotsstatus geändert!</value>
     </entry>
     <entry>
       <key>semicolon</key>
@@ -8522,12 +8511,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>pSqlQuery must be of type SqlBuilder</key>
+      <value>pSqlQuery muss vom typ "SqlBuilder" sein.</value>
     </entry>
     <entry>
       <key>rights of access</key>
-    </entry>
-    <entry>
-      <key>EXPORTTEMPLATE.FIELDLIMITER</key>
+      <value>Zugangsrechte</value>
     </entry>
     <entry>
       <key>Other Calendars</key>
@@ -8539,9 +8527,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Variable</key>
+      <value>Variable</value>
+    </entry>
+    <entry>
+      <key>The end date has to be after the start.</key>
+      <value>Das Enddatum muss nach dem Startdatum kommen.</value>
     </entry>
     <entry>
       <key>me</key>
+      <value>ich</value>
     </entry>
     <entry>
       <key>Sales Dashboard</key>
@@ -8577,6 +8571,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Point of Contact</key>
+      <value>Berührungspunkt</value>
     </entry>
     <entry>
       <key>Subscription model</key>
@@ -8588,6 +8583,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Angebot</key>
+      <value>Angebot</value>
     </entry>
     <entry>
       <key>Article Number</key>
@@ -8599,18 +8595,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Appointment checkup</key>
+      <value>Terminüberprüfung</value>
     </entry>
     <entry>
       <key>Articlenumber</key>
-    </entry>
-    <entry>
-      <key>Berechtigungen</key>
-    </entry>
-    <entry>
-      <key>BOOL VALUE</key>
+      <value>Artikelnummer</value>
     </entry>
     <entry>
       <key>Lead Import Reset</key>
+      <value>Leadimport zurücksetzen</value>
     </entry>
     <entry>
       <key>Type</key>
@@ -8618,45 +8611,59 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>von</key>
+      <value>von</value>
     </entry>
     <entry>
       <key>Minimal count</key>
+      <value>Minimale Anzahl</value>
     </entry>
     <entry>
       <key>Todo</key>
+      <value>Todo</value>
     </entry>
     <entry>
       <key>Relation Type 1</key>
+      <value>Beziehungstyp 1</value>
     </entry>
     <entry>
       <key>Relation Type 2</key>
+      <value>Beziehungstyp 2</value>
     </entry>
     <entry>
       <key>Min. stock</key>
+      <value>Min. Anzahl</value>
     </entry>
     <entry>
       <key>No Standard-E-Mail available!</key>
+      <value>Keine Standard-E-Mail-Adresse verfügbar!</value>
     </entry>
     <entry>
       <key>details</key>
+      <value>Details</value>
     </entry>
     <entry>
       <key>Please pay the outstanding amount,this is you first/second reminder.</key>
+      <value>Bitte zahle den ausstehenden Betrag, dies ist ihre erste/zweite Mahnung.</value>
     </entry>
     <entry>
       <key>Zip</key>
+      <value>Plz</value>
     </entry>
     <entry>
       <key>type</key>
+      <value>Typ</value>
     </entry>
     <entry>
       <key>Lead Imports</key>
+      <value>Leadimporte</value>
     </entry>
     <entry>
       <key>Caimpaignsteps</key>
+      <value>Kampagnenschritte</value>
     </entry>
     <entry>
       <key>Seen</key>
+      <value>Gelesen</value>
     </entry>
     <entry>
       <key>Unseen</key>
@@ -8668,15 +8675,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Linked In</key>
-    </entry>
-    <entry>
-      <key>Abomodel</key>
+      <value>Linked In</value>
     </entry>
     <entry>
       <key>Set salesproject phase</key>
+      <value>Vertriebsprojektphase setzen</value>
     </entry>
     <entry>
       <key>Create salesproject</key>
+      <value>Vertriebsprojekt erstellen</value>
     </entry>
     <entry>
       <key> number of connections</key>
@@ -8684,6 +8691,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Create salesproject touchpoint</key>
+      <value>Vertriebsprojektberührungspunkt erstellen</value>
     </entry>
     <entry>
       <key>Limited details</key>
@@ -8737,11 +8745,9 @@ Bitte Datumseingabe prüfen</value>
       <key>Not created yet</key>
       <value>Noch nicht erstellt</value>
     </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
     <entry>
       <key>Sales Projects</key>
+      <value>Vertriebsprojekte</value>
     </entry>
     <entry>
       <key>set Read</key>
@@ -8761,9 +8767,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Version %0</key>
+      <value>Version %0</value>
     </entry>
     <entry>
       <key>data</key>
+      <value>Daten</value>
     </entry>
     <entry>
       <key>Offer No.</key>
@@ -8815,6 +8823,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Negative</key>
+      <value>Negativ</value>
     </entry>
     <entry>
       <key>1. Target group</key>
@@ -8822,28 +8831,21 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Positive</key>
+      <value>Positiv</value>
     </entry>
     <entry>
       <key>0-50</key>
     </entry>
-    <entry>
-      <key>Till Score</key>
-    </entry>
     <entry>
       <key>251-1000</key>
     </entry>
-    <entry>
-      <key>asdf</key>
-    </entry>
-    <entry>
-      <key>ab 1000</key>
-    </entry>
     <entry>
       <key>Gradings</key>
       <value>Bewertungen</value>
     </entry>
     <entry>
       <key>Full Permissions</key>
+      <value>Komplette  Berechtigungen</value>
     </entry>
     <entry>
       <key>200-349 D€</key>
@@ -8853,15 +8855,14 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Full permissions already assigned</key>
+      <value>Komplette  Berechtigungen bereits vergeben</value>
     </entry>
     <entry>
       <key>51-100</key>
     </entry>
     <entry>
       <key>Import Daten</key>
-    </entry>
-    <entry>
-      <key>ab 350 D€</key>
+      <value>Daten importieren</value>
     </entry>
     <entry>
       <key>0-49 D€</key>
@@ -8872,9 +8873,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Import Logs</key>
-    </entry>
-    <entry>
-      <key>Transferdaten</key>
+      <value>logs importieren</value>
     </entry>
     <entry>
       <key>50-99 D€</key>
@@ -8888,9 +8887,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>yellow</key>
-    </entry>
-    <entry>
-      <key>Borrow</key>
+      <value>gelb</value>
     </entry>
     <entry>
       <key>Is unlinked activity</key>
@@ -8898,37 +8895,39 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Download letter and create Activity</key>
+      <value>Brief herunterladen und Aktivität erstellen</value>
     </entry>
     <entry>
       <key>Extend</key>
-    </entry>
-    <entry>
-      <key>Krimi</key>
+      <value>Vergrößern</value>
     </entry>
     <entry>
       <key>red</key>
+      <value>rot</value>
     </entry>
     <entry>
       <key>Return</key>
+      <value>Return</value>
     </entry>
     <entry>
       <key>green</key>
-    </entry>
-    <entry>
-      <key>Actionthriller</key>
+      <value>grün</value>
     </entry>
     <entry>
       <key>and open modeler</key>
+      <value>und modeler öffnen</value>
     </entry>
     <entry>
       <key>export</key>
+      <value>exportieren</value>
     </entry>
     <entry>
-      <key>export using the selected  template</key>
+      <key>Receive new Department Permission</key>
+      <value>Neue Abteilungsberechtigung erhalten</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
-      <value>Keine neuen Teilnehmer gefunden die zum Serienbrief hinzugefügt werden können.</value>
+      <value>Keine neuen empfänger gefunden die zum Serienbrief hinzugefügt werden können.</value>
     </entry>
     <entry>
       <key>New</key>
@@ -8936,28 +8935,35 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Archived</key>
+      <value>Archiviert</value>
     </entry>
     <entry>
       <key>Receive new User Permission</key>
+      <value>Neue Benutzerberechtigung erhalten</value>
     </entry>
     <entry>
       <key>workflow notification</key>
+      <value>Workflow Benachrichtigung</value>
     </entry>
     <entry>
       <key>Permission received</key>
-    </entry>
-    <entry>
-      <key>leadimport notification</key>
+      <value>Erhaltene Berechtigungen</value>
     </entry>
     <entry>
       <key>Workflow Model</key>
+      <value>Workflow Modell</value>
     </entry>
     <entry>
       <key>Workflow deploy failed</key>
+      <value>Workflow deploy fehlgeschlagen</value>
     </entry>
     <entry>
-      <key>Current Recipients</key>
-      <value>Aktuelle Empfänger</value>
+      <key>Total in euros</key>
+      <value>Gesamt in Euro</value>
+    </entry>
+    <entry>
+      <key>send mail</key>
+      <value>E-Mail versenden</value>
     </entry>
     <entry>
       <key>%0: %1/%2points = %3</key>
@@ -8965,6 +8971,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>%0: %1/%2 points = %3</key>
+      <value>%0: %1/%2 Punkte = %3</value>
     </entry>
     <entry>
       <key>Classification: </key>
@@ -8980,24 +8987,27 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Add Participants</key>
+      <value>Teilnehmer hinzufügen</value>
     </entry>
     <entry>
       <key>and open Report</key>
+      <value>und Report öffnen</value>
     </entry>
     <entry>
       <key>Add Recipients</key>
+      <value>Empfänger hinzufügen</value>
     </entry>
     <entry>
       <key>{SEND_MAIL}</key>
-    </entry>
-    <entry>
-      <key>Total in euros</key>
+      <value>Email versenden</value>
     </entry>
     <entry>
       <key>The workflow could not be deployed</key>
+      <value>Der Workflow konnte nicht deployed werden</value>
     </entry>
     <entry>
       <key>Create model</key>
+      <value>Modell erstellen</value>
     </entry>
     <entry>
       <key>Recipients after adding</key>
@@ -9027,28 +9037,24 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
                             %1 of the chosen records are already recipients or don't have an e-mail set</key>
+      <value>%0 neue Empfänger werden der Serienmail hinzugefügt. \n\
+                            %1 der ausgewählten Datensätze sind bereits Empfänger oder haben keine E-Mail-Adresse hinterlegt.</value>
     </entry>
     <entry>
       <key>download ready</key>
+      <value>Downlaod bereit</value>
     </entry>
     <entry>
       <key>export using the selected template</key>
       <value>Mit der ausgewählten Vorlage Exportieren</value>
     </entry>
-    <entry>
-      <key>send mail</key>
-      <value>E-Mail versenden</value>
-    </entry>
-    <entry>
-      <key>Receive new Department Permission</key>
-    </entry>
     <entry>
       <key>Selection placeholder</key>
       <value>Suche Platzhalter</value>
     </entry>
     <entry>
       <key>Grant new Department Permission</key>
-      <value>Neue Abteilungs-Berechtigung vergeben</value>
+      <value>Neue Abteilungsberechtigung vergeben</value>
     </entry>
     <entry>
       <key>Current password</key>
@@ -9064,6 +9070,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>favorite</key>
+      <value>favorisieren</value>
     </entry>
     <entry>
       <key>New password</key>
@@ -9119,6 +9126,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
+      <value>E-Mail versandt</value>
     </entry>
     <entry>
       <key>Password must contain numbers</key>
@@ -9126,9 +9134,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>favorties</key>
-    </entry>
-    <entry>
-      <key>Fantasy</key>
+      <value>Favoriten</value>
     </entry>
     <entry>
       <key>Permission Procurer Department</key>
@@ -9136,12 +9142,15 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Release</key>
+      <value>Release</value>
     </entry>
     <entry>
       <key>granted permission</key>
+      <value>Vergebene Berechtigungen</value>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>Bulk mail sent</key>
+      <value>Serienmail gesendet</value>
     </entry>
     <entry>
       <key>Permission Procurer User</key>
@@ -9153,38 +9162,43 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
+      <value>Keine neuen empfänger gefunden die zur Serienmail hinzugefügt werden können.</value>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
-      <value>Neue Benutzer-Berechtigung vergeben</value>
+      <key>Titel</key>
+      <value>Titel</value>
     </entry>
     <entry>
       <key>Password must contain spaces</key>
       <value>Passwort muss Leerzeichen enhalten</value>
     </entry>
-    <entry>
-      <key>Enddatum</key>
-    </entry>
     <entry>
       <key>Startdatum</key>
+      <value>Startdatum</value>
     </entry>
     <entry>
-      <key>favorites</key>
+      <key>Set all address locations</key>
+      <value>Setze alle Addressstandorte</value>
     </entry>
     <entry>
       <key>Input value</key>
+      <value>Eingebewert</value>
     </entry>
     <entry>
       <key>Output value</key>
+      <value>Ausgabewert</value>
     </entry>
     <entry>
       <key>Mapping</key>
+      <value>Mapping</value>
     </entry>
     <entry>
       <key>Mappings</key>
+      <value>Mappings</value>
     </entry>
     <entry>
       <key>Sort up</key>
+      <value>aufsteigend sortieren</value>
     </entry>
     <entry>
       <key>Password must contain letters</key>
@@ -9212,45 +9226,35 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Radius in km</key>
+      <value>Radius in km</value>
     </entry>
     <entry>
       <key>Set missing address locations</key>
-    </entry>
-    <entry>
-      <key>Set all address locations</key>
-    </entry>
-    <entry>
-      <key>Titel</key>
-    </entry>
-    <entry>
-      <key>Gruppenname</key>
+      <value>Fehlende AddresStandorte setzen</value>
     </entry>
     <entry>
       <key>FavoriteFilter_view</key>
+      <value>FavoriteFilter_view</value>
     </entry>
     <entry>
       <key>Typ</key>
+      <value>Typ</value>
     </entry>
     <entry>
       <key>Members</key>
+      <value>Mitglieder</value>
     </entry>
     <entry>
       <key>Sort down</key>
+      <value>Absteigend sortieren</value>
     </entry>
     <entry>
       <key>Longitude</key>
-    </entry>
-    <entry>
-      <key>0-49 T€</key>
+      <value>Längengad</value>
     </entry>
     <entry>
       <key>Refresh</key>
-    </entry>
-    <entry>
-      <key>Run ServerProcess</key>
-    </entry>
-    <entry>
-      <key>50-99 T€</key>
+      <value>Refresh</value>
     </entry>
     <entry>
       <key>Max Value</key>
@@ -9260,17 +9264,13 @@ Bitte Datumseingabe prüfen</value>
       <key>Points</key>
       <value>Punkte</value>
     </entry>
-    <entry>
-      <key>OLDACTION</key>
-    </entry>
-    <entry>
-      <key>Run Upgrade Serverprocess</key>
-    </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
+      <value>vertriebsprojekt darf nur gefüllt sein wenn eine Firma festgelegt wurde.</value>
     </entry>
     <entry>
       <key>Child Attributes</key>
+      <value>Diagrameigenschaften</value>
     </entry>
     <entry>
       <key>Recalculate all Classifications</key>
@@ -9278,6 +9278,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Reminder:</key>
+      <value>Erinnerung:</value>
     </entry>
     <entry>
       <key>Start Serveprocess</key>
@@ -9296,16 +9297,370 @@ Bitte Datumseingabe prüfen</value>
       <value>Hinweis</value>
     </entry>
     <entry>
-      <key>200-349 T€</key>
+      <key>Parent Filter</key>
+      <value>Ãœbergeordneter Filter</value>
+    </entry>
+    <entry>
+      <key>Filter information</key>
+      <value>Informationen Filtern</value>
+    </entry>
+    <entry>
+      <key>District Responsible</key>
+      <value>Gebietsverantwortliche</value>
+    </entry>
+    <entry>
+      <key>Responsibles</key>
+      <value>Verantwortliche</value>
+    </entry>
+    <entry>
+      <key>Districts</key>
+      <value>Gebiete</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICTNUMBER}</key>
+      <value>Gebietsnummer</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
+      <value>Ãœbergeordnetes Gebiet</value>
+    </entry>
+    <entry>
+      <key>Responsible Districts</key>
+      <value>Verantwortliche Gebiete</value>
+    </entry>
+    <entry>
+      <key>District No.:</key>
+      <value>Gebiets-Nr.:</value>
+    </entry>
+    <entry>
+      <key>Customer counting</key>
+      <value>Anzahl Kunden</value>
+    </entry>
+    <entry>
+      <key>{$PARENT_DISTRICT}</key>
+      <value>Ãœbergeordnetes Gebiet</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NUMBER}</key>
+      <value>Gebietsnummer</value>
+    </entry>
+    <entry>
+      <key>District definition</key>
+      <value>Gebietsdefinition</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_NO}</key>
+      <value>Gebietsnr.:</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT}</key>
+      <value>Gebiet</value>
+    </entry>
+    <entry>
+      <key>The district no has to be bigger than %0</key>
+      <value>Die Gebietsnummer sollte größer sein als %0</value>
+    </entry>
+    <entry>
+      <key>District Filter</key>
+      <value>Gebietsfilter</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
+      <value>Gebietsverantwortlicher</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+      <value>Umsatz gesamt</value>
+    </entry>
+    <entry>
+      <key>Update all Classification entries in the system</key>
+      <value>Aktualisiere alle gespeicherten Klassifizierungswerte im System.</value>
+    </entry>
+    <entry>
+      <key>Lead import</key>
+      <value>Leadimport</value>
+    </entry>
+    <entry>
+      <key>Nr</key>
+      <value>Nr</value>
+    </entry>
+    <entry>
+      <key>Userhelp Ressources</key>
+      <value>benutzerhilfe Ressourcen</value>
+    </entry>
+    <entry>
+      <key>Worklow started</key>
+      <value>Worklow gestartet</value>
+    </entry>
+    <entry>
+      <key>The status of the offer was changed to \"Sent\".</key>
+      <value>Der Status fes Angebots wurde auf "gesendet" geändert.</value>
+    </entry>
+    <entry>
+      <key>favorites</key>
+      <value>Favoriten</value>
+    </entry>
+    <entry>
+      <key>Mark all cached record containers as invalid</key>
+      <value>Alle gecacheden record container als Invalid markieren</value>
+    </entry>
+    <entry>
+      <key>Current Recipients</key>
+      <value>Derzeitige Empfänger</value>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+      <value>Datum (Monat)</value>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+      <value>Datum (Jahr)</value>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+      <value>Datum (Tag)</value>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+      <value>Neue Benutzerberechtigung vergeben</value>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients.</key>
+      <value>%0 der ausgewählten Datensätze sind schon Empfänger.
+      </value>
+    </entry>
+    <entry>
+      <key>Linked in (Person)</key>
+      <value>Linked In (Person)</value>
+    </entry>
+    <entry>
+      <key>Mobile number (Organisation)</key>
+      <value>Handynummer (Organisation)</value>
+    </entry>
+    <entry>
+      <key>Linked in (Organisation)</key>
+      <value>Linked In (Organisation)</value>
+    </entry>
+    <entry>
+      <key>Xing (Organisation)</key>
+      <value>Xing (Firma)</value>
+    </entry>
+    <entry>
+      <key>Mail (Organisation)</key>
+      <value>E-Mail (Organisation)</value>
+    </entry>
+    <entry>
+      <key>Mail (Person)</key>
+      <value>E-Mail (Person)</value>
+    </entry>
+    <entry>
+      <key>Blog (Organisation)</key>
+      <value>Blog (Firma)</value>
+    </entry>
+    <entry>
+      <key>Internet (Person)</key>
+      <value>Internet (Person)</value>
+    </entry>
+    <entry>
+      <key>Mobile number (Person)</key>
+      <value>Handynummer (Person)</value>
+    </entry>
+    <entry>
+      <key>Internet (Organisation)</key>
+      <value>Internet (Firma)</value>
+    </entry>
+    <entry>
+      <key>Blog (Person)</key>
+      <value>Blog (Person)</value>
+    </entry>
+    <entry>
+      <key>Phone number (Organisation)</key>
+      <value>Telefonnummer (Organisation)</value>
+    </entry>
+    <entry>
+      <key>Phone number (Person)</key>
+      <value>Telefonnummer (Person)</value>
+    </entry>
+    <entry>
+      <key>Xing (Person)</key>
+      <value>Xing (Person)</value>
+    </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+      <value>Datum darf nicht in der Zukunft liegen</value>
+    </entry>
+    <entry>
+      <key>Shows the number of Activities of the Grouped Fields</key>
+      <value>Zeigt die Nummer der Aktivitäten der gruppierten Felder</value>
+    </entry>
+    <entry>
+      <key>Sales Staff Activity</key>
+      <value>Vertriebsmitarbeiteraktivität</value>
+    </entry>
+    <entry>
+      <key>Month</key>
+      <value>Monat</value>
+    </entry>
+    <entry>
+      <key>Responsible Department</key>
+      <value>zuständige Abteilung</value>
+    </entry>
+    <entry>
+      <key>Shows the different conversion rates of the sales project phases</key>
+      <value>zeigt die unterschiedlichen Umrechnungsraten der vertriebsprojektphasen</value>
+    </entry>
+    <entry>
+      <key>Salesproject Convertion Rates</key>
+      <value>Vertriebsprojekt Umrechnungsraten</value>
+    </entry>
+    <entry>
+      <key>Conversion Rate</key>
+      <value>Conversion Rate</value>
+    </entry>
+    <entry>
+      <key>AB_KEYWORD_ENTRYID</key>
+      <value>AB_KEYWORD_ENTRYID</value>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+      <value>BOOL VALUE</value>
+    </entry>
+    <entry>
+      <key>more contacts</key>
+      <value>mehr Kontakte</value>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>from 350 €</key>
+      <value>ab 350€</value>
+    </entry>
+    <entry>
+      <key>from 1000</key>
+      <value>ab 1000</value>
+    </entry>
+    <entry>
+      <key>erlauben</key>
+      <value></value>
+    </entry>
+    <entry>
+      <key>Intermediate catching event</key>
+    </entry>
+    <entry>
+      <key>Entität</key>
+    </entry>
+    <entry>
+      <key>LinkedIn</key>
+      <value>LinkedIn</value>
+    </entry>
+    <entry>
+      <key>Groupname</key>
+      <value>Gruppenname</value>
+    </entry>
+    <entry>
+      <key>No duplicate</key>
+      <value>Keine Duplette</value>
+    </entry>
+    <entry>
+      <key>Vacation examination by</key>
+      <value>Urlaubsgeprüft von</value>
+    </entry>
+    <entry>
+      <key>0-49 €</key>
+    </entry>
+    <entry>
+      <key>100-199 €</key>
+    </entry>
+    <entry>
+      <key>Feld</key>
+    </entry>
+    <entry>
+      <key>Intermediate throwing event</key>
+    </entry>
+    <entry>
+      <key>50-99 €</key>
+    </entry>
+    <entry>
+      <key>Enddate</key>
+      <value>Enddatum</value>
+    </entry>
+    <entry>
+      <key>200-349 €</key>
+    </entry>
+    <entry>
+      <key>Datensatz</key>
+    </entry>
+    <entry>
+      <key>Startdate</key>
+      <value>Startdatum</value>
+    </entry>
+    <entry>
+      <key>Vacation approval by</key>
+      <value>Urlaubsantrag genehmigt von</value>
+    </entry>
+    <entry>
+      <key>File from this template could not be found anymore. </key>
+      <value>Die Datei von dieser Vorlage konnte nicht mehr gefudnen werden.</value>
+    </entry>
+    <entry>
+      <key>allow</key>
+      <value>erlauben</value>
+    </entry>
+    <entry>
+      <key>field</key>
+      <value>Feld</value>
+    </entry>
+    <entry>
+      <key>restrict</key>
+      <value>verbieten</value>
+    </entry>
+    <entry>
+      <key>dataset</key>
+      <value>Datensatz</value>
+    </entry>
+    <entry>
+      <key>entity</key>
+      <value>Entität</value>
+    </entry>
+    <entry>
+      <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+    </entry>
+    <entry>
+      <key>Open Location</key>
+      <value>Standort öffnen</value>
+    </entry>
+    <entry>
+      <key>beschränken</key>
+    </entry>
+    <entry>
+      <key>ab 350 D€</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>FavoriteGroup</key>
+    </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+      <value>Mailbridge fehlgeschlagen: Benutzer '%0' ist unbekannt, kontaktieren sie einen Administrator.</value>
+    </entry>
+    <entry>
+      <key>Count Chart</key>
+      <value>Anzahl Diagramm</value>
     </entry>
     <entry>
-      <key>100-199 T€</key>
+      <key>Sum Chart</key>
+      <value>Summen Diagramm</value>
     </entry>
     <entry>
-      <key>ab 350 T€</key>
+      <key>Probability Chart</key>
+      <value>Wahrscheinlichkeit Diagramm</value>
     </entry>
     <entry>
-      <key>The use of any of your previous %0 passwords is prohibited</key>
+      <key>Probability in %</key>
+      <value>Wahrscheinlichkeit in %</value>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8849809e655a8d93031bdde602aa60e8fd5092c0..b09cc03cdef4fcb4fc80771342b5320e6b3c4172 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -819,9 +819,6 @@
     <entry>
       <key>February</key>
     </entry>
-    <entry>
-      <key>Abomodel</key>
-    </entry>
     <entry>
       <key>Confirmed</key>
     </entry>
@@ -2115,12 +2112,6 @@
     <entry>
       <key>Entrydate (Day)</key>
     </entry>
-    <entry>
-      <key>Date (Month)</key>
-    </entry>
-    <entry>
-      <key>Date (Day)</key>
-    </entry>
     <entry>
       <key>My Dashboard</key>
     </entry>
@@ -2207,24 +2198,12 @@
     <entry>
       <key>New appointment</key>
     </entry>
-    <entry>
-      <key>&amp;Aufg / Term (%0/%1)</key>
-    </entry>
     <entry>
       <key>Other Contactroles</key>
     </entry>
     <entry>
       <key>OK</key>
     </entry>
-    <entry>
-      <key>&amp;Aufgaben (%0)</key>
-    </entry>
-    <entry>
-      <key>Abgesagt</key>
-    </entry>
-    <entry>
-      <key>%0 Aufgabe(n) erfolgreich weitergegeben an: %1</key>
-    </entry>
     <entry>
       <key>normal</key>
     </entry>
@@ -2273,12 +2252,6 @@
     <entry>
       <key>Marketing</key>
     </entry>
-    <entry>
-      <key>Neuer Kampagnenschritt</key>
-    </entry>
-    <entry>
-      <key>Neue Kampagne</key>
-    </entry>
     <entry>
       <key>${QUANTITY_LOWER_THAN_1}</key>
       <value>Quantity should be greater than 0.</value>
@@ -3279,9 +3252,6 @@
     <entry>
       <key>Entrydate must not be in the future</key>
     </entry>
-    <entry>
-      <key>Date must not be in the future</key>
-    </entry>
     <entry>
       <key>Delivery specification</key>
     </entry>
@@ -3387,21 +3357,12 @@
     <entry>
       <key>Price Condition</key>
     </entry>
-    <entry>
-      <key>Entität</key>
-    </entry>
-    <entry>
-      <key>Feld</key>
-    </entry>
     <entry>
       <key>Possible Value</key>
     </entry>
     <entry>
       <key>Could not determine the current Classification type (usage).</key>
     </entry>
-    <entry>
-      <key>The new Classification name already exists.</key>
-    </entry>
     <entry>
       <key>3. Classification</key>
     </entry>
@@ -4568,9 +4529,6 @@
     <entry>
       <key>no valid phone number</key>
     </entry>
-    <entry>
-      <key>EntityToFilterParam</key>
-    </entry>
     <entry>
       <key>Sender</key>
     </entry>
@@ -4811,9 +4769,6 @@
     <entry>
       <key>Entrydate (Year)</key>
     </entry>
-    <entry>
-      <key>Date (Year)</key>
-    </entry>
     <entry>
       <key>Attributes must be unique!</key>
     </entry>
@@ -4895,12 +4850,6 @@
     <entry>
       <key>Cancellation</key>
     </entry>
-    <entry>
-      <key>Vacation examination by</key>
-    </entry>
-    <entry>
-      <key>Vacation approval by</key>
-    </entry>
     <entry>
       <key>Credit</key>
     </entry>
@@ -4931,9 +4880,6 @@
     <entry>
       <key>My Forecast</key>
     </entry>
-    <entry>
-      <key>Plaintext template - Only for .txt and .html</key>
-    </entry>
     <entry>
       <key>Action not supported</key>
     </entry>
@@ -4952,9 +4898,6 @@
     <entry>
       <key>Private person</key>
     </entry>
-    <entry>
-      <key>Displays the amounts of my personal forecast and the turnover I have already made</key>
-    </entry>
     <entry>
       <key>My Keyfigures</key>
     </entry>
@@ -5102,9 +5045,6 @@
     <entry>
       <key>Ignore whole Cluster</key>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nFunktion und Organisation neu angelegt</key>
-    </entry>
     <entry>
       <key>Has sales approved this step?</key>
     </entry>
@@ -5272,9 +5212,6 @@
     <entry>
       <key>Duplicate</key>
     </entry>
-    <entry>
-      <key>Is ID field</key>
-    </entry>
     <entry>
       <key>Import date</key>
     </entry>
@@ -5353,18 +5290,9 @@
     <entry>
       <key>Info (Contact)</key>
     </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Data could not be imported.</key>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion neu angelegt</key>
-    </entry>
-    <entry>
-      <key>Organisation schon vorhanden oder keine Organisation importiert\nPerson und Funktion neu angelegt</key>
-    </entry>
     <entry>
       <key>Duplicate status</key>
     </entry>
@@ -5374,15 +5302,9 @@
     <entry>
       <key>Transfer data</key>
     </entry>
-    <entry>
-      <key>Organisation und Person schon vorhanden\nFunktion neu angelegt</key>
-    </entry>
     <entry>
       <key>Ignore daily series</key>
     </entry>
-    <entry>
-      <key>Max results threshold</key>
-    </entry>
     <entry>
       <key>Import Fields</key>
     </entry>
@@ -5431,9 +5353,6 @@
     <entry>
       <key>Import canceled</key>
     </entry>
-    <entry>
-      <key>CSV benötigt</key>
-    </entry>
     <entry>
       <key>Internal (2)</key>
     </entry>
@@ -5443,45 +5362,24 @@
     <entry>
       <key>Import user</key>
     </entry>
-    <entry>
-      <key>Person neu angelegt\nOrganisation mögliche Dublette</key>
-    </entry>
     <entry>
       <key> Info</key>
     </entry>
     <entry>
       <key>Contact Owner</key>
     </entry>
-    <entry>
-      <key>Zeilen verarbeitet</key>
-    </entry>
-    <entry>
-      <key>Organisation und Person mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Import name</key>
     </entry>
     <entry>
       <key>Entity field name</key>
     </entry>
-    <entry>
-      <key>Bug Ticket</key>
-    </entry>
     <entry>
       <key>Salesproject source Id</key>
     </entry>
-    <entry>
-      <key>yearly series not specified</key>
-    </entry>
-    <entry>
-      <key>Organisation oder Person neu angelegt</key>
-    </entry>
     <entry>
       <key>Data imported.</key>
     </entry>
-    <entry>
-      <key>Organisation neu angelegt\nPerson mögliche Dublette</key>
-    </entry>
     <entry>
       <key>Info (Company)</key>
     </entry>
@@ -5491,18 +5389,9 @@
     <entry>
       <key>Möglicherweise ist ein Import-Feld zu groß für das Zielfeld.</key>
     </entry>
-    <entry>
-      <key>Person schon vorhanden oder keine Person importiert\nOrganisation mögliche Dublette</key>
-    </entry>
-    <entry>
-      <key>double</key>
-    </entry>
     <entry>
       <key>Record separator</key>
     </entry>
-    <entry>
-      <key>New Bugticket</key>
-    </entry>
     <entry>
       <key>Culture, Sport and Leisure</key>
     </entry>
@@ -5557,9 +5446,6 @@
     <entry>
       <key>Lead preview</key>
     </entry>
-    <entry>
-      <key>No duplicate</key>
-    </entry>
     <entry>
       <key>Standard city</key>
     </entry>
@@ -5584,9 +5470,6 @@
     <entry>
       <key>Internet</key>
     </entry>
-    <entry>
-      <key>Organisation, Person und Funktion schon vorhanden</key>
-    </entry>
     <entry>
       <key>Negotiations</key>
     </entry>
@@ -5737,9 +5620,6 @@
     <entry>
       <key>unknown</key>
     </entry>
-    <entry>
-      <key>series delete action</key>
-    </entry>
     <entry>
       <key>Choose a campaign and a step to add the contact to a  campaign</key>
     </entry>
@@ -5779,9 +5659,6 @@
     <entry>
       <key>Evaluation</key>
     </entry>
-    <entry>
-      <key>not started</key>
-    </entry>
     <entry>
       <key>cancelled</key>
     </entry>
@@ -5794,9 +5671,6 @@
     <entry>
       <key>booked</key>
     </entry>
-    <entry>
-      <key>off-site</key>
-    </entry>
     <entry>
       <key>Recipt</key>
     </entry>
@@ -5806,9 +5680,6 @@
     <entry>
       <key>Select user</key>
     </entry>
-    <entry>
-      <key>beschränken</key>
-    </entry>
     <entry>
       <key>confirmed</key>
     </entry>
@@ -5833,9 +5704,6 @@
     <entry>
       <key>Tasks of</key>
     </entry>
-    <entry>
-      <key>Datensatz</key>
-    </entry>
     <entry>
       <key>delegated</key>
     </entry>
@@ -5848,9 +5716,6 @@
     <entry>
       <key>deferred</key>
     </entry>
-    <entry>
-      <key>erlauben</key>
-    </entry>
     <entry>
       <key>Error when reading the file!</key>
     </entry>
@@ -5866,15 +5731,9 @@
     <entry>
       <key>Campaign steps </key>
     </entry>
-    <entry>
-      <key>No transfer of private tasks possible!</key>
-    </entry>
     <entry>
       <key>No authorization to postpone the task</key>
     </entry>
-    <entry>
-      <key>LinkedIn</key>
-    </entry>
     <entry>
       <key>low</key>
     </entry>
@@ -5917,15 +5776,9 @@
     <entry>
       <key>Your changes may have an impact on the data privacy information (GDPR).\n Please update these.</key>
     </entry>
-    <entry>
-      <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
-    </entry>
     <entry>
       <key>Owner</key>
     </entry>
-    <entry>
-      <key>Download Process</key>
-    </entry>
     <entry>
       <key>BPMN</key>
     </entry>
@@ -5968,9 +5821,6 @@
     <entry>
       <key>Manually</key>
     </entry>
-    <entry>
-      <key>Export process</key>
-    </entry>
     <entry>
       <key>To check</key>
     </entry>
@@ -5986,9 +5836,6 @@
     <entry>
       <key>SqlBuilder: The provided values object for updateFields is invalid or is not an object.</key>
     </entry>
-    <entry>
-      <key>Weitere Kontakte</key>
-    </entry>
     <entry>
       <key>Task done</key>
     </entry>
@@ -6003,18 +5850,12 @@
     <entry>
       <key>Permission procurer</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: AB_PERMISSIONCALENDARID or UID and OBJECT_TYPE and PERMISSIONDEALER_ID is not set.</key>
-    </entry>
     <entry>
       <key>Workflow signal</key>
     </entry>
     <entry>
       <key>Signals</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onUpdate: PERMISSION is not set.</key>
-    </entry>
     <entry>
       <key>AddAction</key>
     </entry>
@@ -6044,9 +5885,6 @@
     <entry>
       <key>Permission Dealer</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onInsert: This operation isn't allowed.</key>
-    </entry>
     <entry>
       <key>LimitedReadPermission</key>
       <value>limited read permission</value>
@@ -6076,9 +5914,6 @@
     <entry>
       <key>Calendar Permission</key>
     </entry>
-    <entry>
-      <key>PermissionCalendar_entity.PermissionCalendarJDito.onDelete: This operation isn't allowed.</key>
-    </entry>
     <entry>
       <key>Claim date</key>
     </entry>
@@ -6088,12 +5923,6 @@
     <entry>
       <key>There is already a permission existing!</key>
     </entry>
-    <entry>
-      <key>Auf eigenen Benutzer kann keine Berechtigung gesetzt werden!</key>
-    </entry>
-    <entry>
-      <key>Berechtigungen</key>
-    </entry>
     <entry>
       <key>Deparment</key>
     </entry>
@@ -6105,6 +5934,7 @@
     </entry>
     <entry>
       <key>${CANCELLED}</key>
+      <value>Cancelled</value>
     </entry>
     <entry>
       <key>${WORKFLOW_SUSPEND}</key>
@@ -6158,9 +5988,6 @@
     <entry>
       <key>Field and Position</key>
     </entry>
-    <entry>
-      <key>AExport fields of this table</key>
-    </entry>
     <entry>
       <key>Place of Use</key>
     </entry>
@@ -6267,9 +6094,6 @@
     <entry>
       <key>Complete tasks</key>
     </entry>
-    <entry>
-      <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'</key>
-    </entry>
     <entry>
       <key>Start time</key>
     </entry>
@@ -6333,9 +6157,6 @@
     <entry>
       <key>Entrydate has to be in the selected calendar week!</key>
     </entry>
-    <entry>
-      <key>Date has to be in the selected calendar week!</key>
-    </entry>
     <entry>
       <key>Invalid year!</key>
     </entry>
@@ -6393,15 +6214,6 @@
     <entry>
       <key>Visit Recommendations</key>
     </entry>
-    <entry>
-      <key>Besuchsreport erstellt</key>
-    </entry>
-    <entry>
-      <key>geplant</key>
-    </entry>
-    <entry>
-      <key>Termin vereinbart</key>
-    </entry>
     <entry>
       <key>Contactreport</key>
     </entry>
@@ -6453,9 +6265,6 @@
     <entry>
       <key>Parallel gateway</key>
     </entry>
-    <entry>
-      <key>Intermediate throwing event</key>
-    </entry>
     <entry>
       <key>End event</key>
     </entry>
@@ -6474,9 +6283,6 @@
     <entry>
       <key>User task</key>
     </entry>
-    <entry>
-      <key>Intermediate catching event</key>
-    </entry>
     <entry>
       <key>Business rule task</key>
     </entry>
@@ -6502,9 +6308,6 @@
     <entry>
       <key>Script task</key>
     </entry>
-    <entry>
-      <key>Activites</key>
-    </entry>
     <entry>
       <key>Dispatch as mail</key>
     </entry>
@@ -6512,7 +6315,7 @@
       <key>Show offer</key>
     </entry>
     <entry>
-      <key>The status of the offer was changed to \"Sent\".</key>
+      <key>The status of the offer was changed to \"sent\".</key>
     </entry>
     <entry>
       <key>pCallbackFn is not a function</key>
@@ -6605,18 +6408,12 @@
     <entry>
       <key>Archive</key>
     </entry>
-    <entry>
-      <key>BOOL VALUE</key>
-    </entry>
     <entry>
       <key>Support ticket</key>
     </entry>
     <entry>
       <key>Type</key>
     </entry>
-    <entry>
-      <key>Seite</key>
-    </entry>
     <entry>
       <key>Senden per E-Mail</key>
     </entry>
@@ -6674,36 +6471,21 @@
     <entry>
       <key>Linked in</key>
     </entry>
-    <entry>
-      <key>Mahnung</key>
-    </entry>
     <entry>
       <key>Lead Imports</key>
     </entry>
-    <entry>
-      <key>Kundenstammblatt</key>
-    </entry>
     <entry>
       <key>No Standard-E-Mail available!</key>
     </entry>
     <entry>
       <key>Leadimport</key>
     </entry>
-    <entry>
-      <key>EXPORTTEMPLATE.FIELDLIMITER</key>
-    </entry>
-    <entry>
-      <key>niedrig</key>
-    </entry>
     <entry>
       <key>Relation type 1</key>
     </entry>
     <entry>
       <key>Relation type 2</key>
     </entry>
-    <entry>
-      <key>Nicht begonnen</key>
-    </entry>
     <entry>
       <key>task number</key>
     </entry>
@@ -6713,30 +6495,18 @@
     <entry>
       <key>hoch</key>
     </entry>
-    <entry>
-      <key>Export coloumns using a exporttemplate</key>
-    </entry>
     <entry>
       <key>QuickEntry</key>
     </entry>
     <entry>
       <key>Leadimports</key>
     </entry>
-    <entry>
-      <key>keine Standard-E-Mail Büro vorhanden !</key>
-    </entry>
     <entry>
       <key>Entry date</key>
     </entry>
     <entry>
       <key>Relation type</key>
     </entry>
-    <entry>
-      <key>Kampagnenschritte</key>
-    </entry>
-    <entry>
-      <key>frei</key>
-    </entry>
     <entry>
       <key>Leadimport Reset</key>
     </entry>
@@ -6746,24 +6516,12 @@
     <entry>
       <key>finished</key>
     </entry>
-    <entry>
-      <key>EA private task cannot be assigned to somebody else.</key>
-    </entry>
-    <entry>
-      <key>Ein Fehler ist aufgetreten beim Import dieses Datensatzes:\n</key>
-    </entry>
     <entry>
       <key>tentative</key>
     </entry>
     <entry>
       <key>Nein</key>
     </entry>
-    <entry>
-      <key>Termine von</key>
-    </entry>
-    <entry>
-      <key>Kategorie</key>
-    </entry>
     <entry>
       <key>Caimpaignsteps</key>
     </entry>
@@ -6803,9 +6561,6 @@
     <entry>
       <key>Visit Planning</key>
     </entry>
-    <entry>
-      <key>ankle of</key>
-    </entry>
     <entry>
       <key>Set salesproject phase</key>
     </entry>
@@ -6924,15 +6679,9 @@
     <entry>
       <key>0-50</key>
     </entry>
-    <entry>
-      <key>Till Score</key>
-    </entry>
     <entry>
       <key>251-1000</key>
     </entry>
-    <entry>
-      <key>ab 1000</key>
-    </entry>
     <entry>
       <key>Full Permissions</key>
     </entry>
@@ -6951,9 +6700,6 @@
     <entry>
       <key>Import Logs</key>
     </entry>
-    <entry>
-      <key>Transferdaten</key>
-    </entry>
     <entry>
       <key>101-250</key>
     </entry>
@@ -6966,21 +6712,12 @@
     <entry>
       <key>yellow</key>
     </entry>
-    <entry>
-      <key>Borrow</key>
-    </entry>
     <entry>
       <key>Is unlinked activity</key>
     </entry>
-    <entry>
-      <key>Fantasy</key>
-    </entry>
     <entry>
       <key>Extend</key>
     </entry>
-    <entry>
-      <key>Krimi</key>
-    </entry>
     <entry>
       <key>red</key>
     </entry>
@@ -6990,9 +6727,6 @@
     <entry>
       <key>green</key>
     </entry>
-    <entry>
-      <key>Actionthriller</key>
-    </entry>
     <entry>
       <key>No new recipients found that can be added to the bulk mail.</key>
     </entry>
@@ -7011,9 +6745,6 @@
     <entry>
       <key>export</key>
     </entry>
-    <entry>
-      <key>export using the selected  template</key>
-    </entry>
     <entry>
       <key>No new recipients found that can be added to the serial letter.</key>
     </entry>
@@ -7021,19 +6752,13 @@
       <key>send mail</key>
     </entry>
     <entry>
-      <key>and open modeler</key>
-    </entry>
-    <entry>
-      <key>Workflow Model</key>
-    </entry>
-    <entry>
-      <key>Current Recipients</key>
+      <key>Receive new Department Permission</key>
     </entry>
     <entry>
-      <key>The workflow could not be deployed</key>
+      <key>Receive new User Permission</key>
     </entry>
     <entry>
-      <key>Workflow deploy failed</key>
+      <key>and open modeler</key>
     </entry>
     <entry>
       <key>Create model</key>
@@ -7041,48 +6766,17 @@
     <entry>
       <key>Edit workflow</key>
     </entry>
-    <entry>
-      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
-                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
-    </entry>
-    <entry>
-      <key>Recipients after adding</key>
-    </entry>
-    <entry>
-      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
-    </entry>
-    <entry>
-      <key>Organisations will be exported</key>
-    </entry>
-    <entry>
-      <key>Contacts will be exported</key>
-    </entry>
-    <entry>
-      <key>%0 new participants will be added to the campaign.</key>
-    </entry>
-    <entry>
-      <key>%0 of the chosen records are already in the campaign</key>
-    </entry>
-    <entry>
-      <key>Receive new Department Permission</key>
-    </entry>
-    <entry>
-      <key>Receive new User Permission</key>
-    </entry>
     <entry>
       <key>workflow notification</key>
     </entry>
     <entry>
       <key>Permission received</key>
     </entry>
-    <entry>
-      <key>leadimport notification</key>
-    </entry>
     <entry>
       <key>granted permission</key>
     </entry>
     <entry>
-      <key>bulk mail sent</key>
+      <key>Bulk mail sent</key>
     </entry>
     <entry>
       <key>download ready</key>
@@ -7090,6 +6784,9 @@
     <entry>
       <key>Total in euros</key>
     </entry>
+    <entry>
+      <key>Workflow Model</key>
+    </entry>
     <entry>
       <key>The Sales Project can only be filled when a company has been specified</key>
     </entry>
@@ -7120,6 +6817,7 @@
     </entry>
     <entry>
       <key>{SENT_MAIL}</key>
+      <value>Mail sent</value>
     </entry>
     <entry>
       <key>favorites</key>
@@ -7127,9 +6825,6 @@
     <entry>
       <key>Refresh</key>
     </entry>
-    <entry>
-      <key>Run ServerProcess</key>
-    </entry>
     <entry>
       <key>favorite</key>
     </entry>
@@ -7173,28 +6868,19 @@
       <key>Default</key>
     </entry>
     <entry>
-      <key>Grant new Department Permission</key>
+      <key>Titel</key>
     </entry>
     <entry>
-      <key>Permission Procurer Department</key>
+      <key>Set missing address locations</key>
     </entry>
     <entry>
-      <key>Permission Procurer User</key>
+      <key>FavoriteFilter_view</key>
     </entry>
     <entry>
-      <key>Grant new User Permission</key>
+      <key>Typ</key>
     </entry>
     <entry>
-      <key>Selection placeholder</key>
-    </entry>
-    <entry>
-      <key>Current password</key>
-    </entry>
-    <entry>
-      <key>Calendar maintime start</key>
-    </entry>
-    <entry>
-      <key>Password must contain special characters</key>
+      <key>Set all address locations</key>
     </entry>
     <entry>
       <key>Password must be at least %0 characters</key>
@@ -7238,9 +6924,6 @@
     <entry>
       <key>Password must contain spaces</key>
     </entry>
-    <entry>
-      <key>The use of any of your previous %0 passwords is prohibited</key>
-    </entry>
     <entry>
       <key>export using the selected template</key>
     </entry>
@@ -7253,18 +6936,12 @@
     <entry>
       <key>Output value</key>
     </entry>
-    <entry>
-      <key>Enddatum</key>
-    </entry>
     <entry>
       <key>Startdatum</key>
     </entry>
     <entry>
       <key>Mapping</key>
     </entry>
-    <entry>
-      <key>Typ</key>
-    </entry>
     <entry>
       <key>Mappings</key>
     </entry>
@@ -7272,109 +6949,421 @@
       <key>Radius in km</key>
     </entry>
     <entry>
-      <key>Titel</key>
+      <key>Members</key>
     </entry>
     <entry>
-      <key>Set missing address locations</key>
+      <key>The radius has to be %0 or lesser.</key>
     </entry>
     <entry>
-      <key>FavoriteFilter_view</key>
+      <key>The given starting location is empty. An area search can not be performed.</key>
     </entry>
     <entry>
-      <key>Set all address locations</key>
+      <key>The radius has to be at least %0.</key>
     </entry>
     <entry>
-      <key>Members</key>
+      <key>Sort up</key>
     </entry>
     <entry>
-      <key>Gruppenname</key>
+      <key>Sort down</key>
     </entry>
     <entry>
-      <key>The radius has to be %0 or lesser.</key>
+      <key>Enter current password to verify</key>
     </entry>
     <entry>
-      <key>The given starting location is empty. An area search can not be performed.</key>
+      <key>200-349 D€</key>
     </entry>
     <entry>
-      <key>The radius has to be at least %0.</key>
+      <key>0-49 D€</key>
     </entry>
     <entry>
-      <key>Sort up</key>
+      <key>100-199 D€</key>
     </entry>
     <entry>
-      <key>Sort down</key>
+      <key>50-99 D€</key>
     </entry>
     <entry>
-      <key>Enter current password to verify</key>
+      <key>Max Value</key>
     </entry>
     <entry>
-      <key>ab 350 D€</key>
+      <key>Points</key>
     </entry>
     <entry>
-      <key>200-349 D€</key>
+      <key>Child Attributes</key>
     </entry>
     <entry>
-      <key>0-49 D€</key>
+      <key>Recalculate all Classifications</key>
     </entry>
     <entry>
-      <key>100-199 D€</key>
+      <key>Reminder:</key>
     </entry>
     <entry>
-      <key>50-99 D€</key>
+      <key>Start Serveprocess</key>
     </entry>
     <entry>
-      <key>asdf</key>
+      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
     </entry>
     <entry>
-      <key>OLDACTION</key>
+      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
     </entry>
     <entry>
-      <key>200-349 T€</key>
+      <key>Hint</key>
     </entry>
     <entry>
-      <key>100-199 T€</key>
+      <key>Unread</key>
     </entry>
     <entry>
-      <key>ab 350 T€</key>
+      <key>Parent Filter</key>
     </entry>
     <entry>
-      <key>0-49 T€</key>
+      <key>Filter information</key>
     </entry>
     <entry>
-      <key>50-99 T€</key>
+      <key>District Responsible</key>
     </entry>
     <entry>
-      <key>Max Value</key>
+      <key>Responsibles</key>
     </entry>
     <entry>
-      <key>Points</key>
+      <key>Districts</key>
     </entry>
     <entry>
-      <key>Run Upgrade Serverprocess</key>
+      <key>{$DISTRICTNUMBER}</key>
+      <value>District Number</value>
     </entry>
     <entry>
-      <key>Child Attributes</key>
+      <key>{$DISTRICT_PARENT_DISTRICT}</key>
+      <value>Parent District</value>
     </entry>
     <entry>
-      <key>Recalculate all Classifications</key>
+      <key>Responsible Districts</key>
     </entry>
     <entry>
-      <key>Reminder:</key>
+      <key>District No.:</key>
     </entry>
     <entry>
-      <key>Start Serveprocess</key>
+      <key>Customer counting</key>
     </entry>
     <entry>
-      <key>Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!</key>
+      <key>{$PARENT_DISTRICT}</key>
+      <value>Parent District</value>
     </entry>
     <entry>
-      <key>This is how the Classification Gradings of the Classification will get affected by these changes:</key>
+      <key>{$DISTRICT_NUMBER}</key>
+      <value>District Number</value>
     </entry>
     <entry>
-      <key>Hint</key>
+      <key>District definition</key>
     </entry>
     <entry>
-      <key>Unread</key>
+      <key>{$DISTRICT_NO}</key>
+      <value>District Number</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT}</key>
+      <value>District</value>
+    </entry>
+    <entry>
+      <key>The district no has to be bigger than %0</key>
+    </entry>
+    <entry>
+      <key>District Filter</key>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_RESPONSIBLE}</key>
+      <value>Responsible</value>
+    </entry>
+    <entry>
+      <key>{$DISTRICT_TOTAL_TURNOVER}</key>
+      <value>Total Turnover</value>
+    </entry>
+    <entry>
+      <key>Update all Classification entries in the system</key>
+    </entry>
+    <entry>
+      <key>Lead import</key>
+    </entry>
+    <entry>
+      <key>Nr</key>
+    </entry>
+    <entry>
+      <key>Userhelp Ressources</key>
+    </entry>
+    <entry>
+      <key>Worklow started</key>
+    </entry>
+    <entry>
+      <key>Selection placeholder</key>
+    </entry>
+    <entry>
+      <key>%0 new recipients will be added to the bulk mail. \n\&#xD;
+                            %1 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Grant new Department Permission</key>
+    </entry>
+    <entry>
+      <key>Current password</key>
+    </entry>
+    <entry>
+      <key>Calendar maintime start</key>
+    </entry>
+    <entry>
+      <key>Password must contain special characters</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer Department</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients or don't have an e-mail set</key>
+    </entry>
+    <entry>
+      <key>Organisations will be exported</key>
+    </entry>
+    <entry>
+      <key>Recipients after adding</key>
+    </entry>
+    <entry>
+      <key>Contacts will be exported</key>
+    </entry>
+    <entry>
+      <key>The status of the offer was changed to \"Sent\".</key>
+    </entry>
+    <entry>
+      <key>The workflow could not be deployed</key>
+    </entry>
+    <entry>
+      <key>Workflow deploy failed</key>
+    </entry>
+    <entry>
+      <key>%0 new participants will be added to the campaign.</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already in the campaign</key>
+    </entry>
+    <entry>
+      <key>Permission Procurer User</key>
+    </entry>
+    <entry>
+      <key>The status of the order was changed to \"sent\".</key>
+    </entry>
+    <entry>
+      <key>Mark all cached record containers as invalid</key>
+    </entry>
+    <entry>
+      <key>Current Recipients</key>
+    </entry>
+    <entry>
+      <key>Conversion Rate</key>
+    </entry>
+    <entry>
+      <key>AB_KEYWORD_ENTRYID</key>
+    </entry>
+    <entry>
+      <key>A person can only have one private Contact.</key>
+    </entry>
+    <entry>
+      <key>Linked in (Person)</key>
+    </entry>
+    <entry>
+      <key>Mobile number (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Linked in (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Xing (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Mail (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Mail (Person)</key>
+    </entry>
+    <entry>
+      <key>Blog (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Internet (Person)</key>
+    </entry>
+    <entry>
+      <key>Mobile number (Person)</key>
+    </entry>
+    <entry>
+      <key>Internet (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Blog (Person)</key>
+    </entry>
+    <entry>
+      <key>Phone number (Organisation)</key>
+    </entry>
+    <entry>
+      <key>Xing (Person)</key>
+    </entry>
+    <entry>
+      <key>Phone number (Person)</key>
+    </entry>
+    <entry>
+      <key>%0 of the chosen records are already recipients.</key>
+    </entry>
+    <entry>
+      <key>Date must not be in the future</key>
+    </entry>
+    <entry>
+      <key>Date (Month)</key>
+    </entry>
+    <entry>
+      <key>Shows the number of Activities of the Grouped Fields</key>
+    </entry>
+    <entry>
+      <key>Sales Staff Activity</key>
+    </entry>
+    <entry>
+      <key>Date (Year)</key>
+    </entry>
+    <entry>
+      <key>Month</key>
+    </entry>
+    <entry>
+      <key>Responsible Department</key>
+    </entry>
+    <entry>
+      <key>Shows the different conversion rates of the sales project phases</key>
+    </entry>
+    <entry>
+      <key>Salesproject Convertion Rates</key>
+    </entry>
+    <entry>
+      <key>Grant new User Permission</key>
+    </entry>
+    <entry>
+      <key>Date (Day)</key>
+    </entry>
+    <entry>
+      <key>BOOL VALUE</key>
+    </entry>
+    <entry>
+      <key>more contacts</key>
+    </entry>
+    <entry>
+      <key>Seite</key>
+    </entry>
+    <entry>
+      <key>from 350 €</key>
+    </entry>
+    <entry>
+      <key>from 1000</key>
+    </entry>
+    <entry>
+      <key>erlauben</key>
+    </entry>
+    <entry>
+      <key>Intermediate catching event</key>
+    </entry>
+    <entry>
+      <key>Entität</key>
+    </entry>
+    <entry>
+      <key>LinkedIn</key>
+    </entry>
+    <entry>
+      <key>Groupname</key>
+    </entry>
+    <entry>
+      <key>No duplicate</key>
+    </entry>
+    <entry>
+      <key>Vacation examination by</key>
+    </entry>
+    <entry>
+      <key>0-49 €</key>
+    </entry>
+    <entry>
+      <key>100-199 €</key>
+    </entry>
+    <entry>
+      <key>Feld</key>
+    </entry>
+    <entry>
+      <key>Intermediate throwing event</key>
+    </entry>
+    <entry>
+      <key>50-99 €</key>
+    </entry>
+    <entry>
+      <key>Enddate</key>
+    </entry>
+    <entry>
+      <key>200-349 €</key>
+    </entry>
+    <entry>
+      <key>Datensatz</key>
+    </entry>
+    <entry>
+      <key>Startdate</key>
+    </entry>
+    <entry>
+      <key>Vacation approval by</key>
+    </entry>
+    <entry>
+      <key>File from this template could not be found anymore.</key>
+    </entry>
+    <entry>
+      <key>allow</key>
+    </entry>
+    <entry>
+      <key>field</key>
+    </entry>
+    <entry>
+      <key>restrict</key>
+    </entry>
+    <entry>
+      <key>dataset</key>
+    </entry>
+    <entry>
+      <key>entity</key>
+    </entry>
+    <entry>
+      <key>The end date has to be after the start.</key>
+    </entry>
+    <entry>
+      <key>Open Location</key>
+    </entry>
+    <entry>
+      <key>beschränken</key>
+    </entry>
+    <entry>
+      <key>ab 350 D€</key>
+    </entry>
+    <entry>
+      <key>ab 1000</key>
+    </entry>
+    <entry>
+      <key>The start date has to be before the end date.</key>
+    </entry>
+    <entry>
+      <key>Serial Actions</key>
+    </entry>
+    <entry>
+      <key>FavoriteGroup</key>
+    </entry>
+    <entry>
+      <key>Favoritegroup</key>
+    </entry>
+    <entry>
+      <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+    </entry>
+    <entry>
+      <key>Count Chart</key>
+    </entry>
+    <entry>
+      <key>Sum Chart</key>
+    </entry>
+    <entry>
+      <key>Probability Chart</key>
+    </entry>
+    <entry>
+      <key>Probability in %</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
diff --git a/neonContext/Activity/Activity.aod b/neonContext/Activity/Activity.aod
index a1422e41f51f12e1f51d461ec428b16219209e31..996107066d1fab5788faf44d301bc207895a864c 100644
--- a/neonContext/Activity/Activity.aod
+++ b/neonContext/Activity/Activity.aod
@@ -41,5 +41,9 @@
       <name>01feb10a-34d2-4ef3-b87b-a1e35a4b12e0</name>
       <view>ActivityUniversalFileProcessorFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f1e3f5e0-1002-4a68-9114-0389c0d7d4d1</name>
+      <view>ActivityAnalyses_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/BulkMail/BulkMail.aod b/neonContext/BulkMail/BulkMail.aod
index 393dc693223f5ae2745076e753013753d582aecf..f87a16ce6022f8b215dccefdc34161255afcdc2d 100644
--- a/neonContext/BulkMail/BulkMail.aod
+++ b/neonContext/BulkMail/BulkMail.aod
@@ -29,9 +29,5 @@
       <name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name>
       <view>BulkMailContent_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>fb5bc6ed-d3c9-45ef-a0c7-17b190e3ce74</name>
-      <view>BulkMailMainPreview_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 355bc08150fab6ab5386e5270d80b186a86747e2..36cdf483335292baf54abb472c038999081e2b0a 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -39,9 +39,5 @@
       <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
       <view>CampaignOverview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
-      <view>CampaignCostFix_view</view>
-    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod
index 56cc86e548426777a6fbf261a6d30ee4b26fa00f..53037d640711f1e4fe24d715c0ea34eccceabeda 100644
--- a/neonContext/CampaignCost/CampaignCost.aod
+++ b/neonContext/CampaignCost/CampaignCost.aod
@@ -22,5 +22,9 @@
       <name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name>
       <view>CampaignCostExtendedFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>4d06f59b-f801-460e-8efd-3c08b14541ec</name>
+      <view>CampaignCostFix_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Classification/Classification.aod b/neonContext/Classification/Classification.aod
index 9bf4ba49ac718b28263d2427a1491f8d90e2478a..b6c29daeda62c2747e8e1f8ba59e94c5b727ada8 100644
--- a/neonContext/Classification/Classification.aod
+++ b/neonContext/Classification/Classification.aod
@@ -3,7 +3,7 @@
   <name>Classification</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/neonContext/Classification/documentation.adoc</documentation>
-  <previewView>ClassificatonPreview_view</previewView>
+  <previewView>ClassificationPreview_view</previewView>
   <entity>Classification_entity</entity>
   <references>
     <neonViewReference>
@@ -12,7 +12,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>50c0d5c5-c84f-452d-9f77-41b82ac0319f</name>
-      <view>ClassificatonPreview_view</view>
+      <view>ClassificationPreview_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/District/District.aod b/neonContext/District/District.aod
new file mode 100644
index 0000000000000000000000000000000000000000..78099d98a22fffa01fd478bdfb484a17398e70ab
--- /dev/null
+++ b/neonContext/District/District.aod
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>District</name>
+  <title>Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <mainView>DistrictMain_view</mainView>
+  <filterView>DistrictFilter_view</filterView>
+  <editView>DistrictEdit_view</editView>
+  <previewView>DistrictPreview_view</previewView>
+  <lookupView>DistrictFilter_view</lookupView>
+  <entity>District_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>7e7c84fd-f4c5-4907-ab43-b31d6fafb42a</name>
+      <view>DistrictFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>12843ee8-b70b-41e3-88e8-4500d299b588</name>
+      <view>DistrictEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>db6ac483-a73c-462f-8e2d-e59db4c7c6a2</name>
+      <view>DistrictMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bb3c4a77-62b0-4749-a4ef-55c60c6b9e5c</name>
+      <view>DistrictPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>bb8600b2-a4ee-49a5-b120-b2e12db7e25c</name>
+      <view>DistrictList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/DistrictResponsible/DistrictResponsible.aod b/neonContext/DistrictResponsible/DistrictResponsible.aod
new file mode 100644
index 0000000000000000000000000000000000000000..58d47bc30bb3ee9a657e860f9b9f6b45872194e5
--- /dev/null
+++ b/neonContext/DistrictResponsible/DistrictResponsible.aod
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>DistrictResponsible</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:GLOBE</icon>
+  <entity>DistrictResponsible_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>ee2298ba-af17-492b-9128-714e82def8e3</name>
+      <view>DistrictResponsibleMultiEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>fc24246c-51de-4d00-b2aa-7e9505461c2e</name>
+      <view>DistrictResponsibleList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cba355d3-4ef4-441e-8976-f51c8fe65eec</name>
+      <view>DistrictResponsiblePreviewList_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Member/Member.aod b/neonContext/Member/Member.aod
index f1747c11e2e9712b54b37442635bd3f3e3d56734..35fc63e30202d49291cc8baac99a5bf003189f3d 100644
--- a/neonContext/Member/Member.aod
+++ b/neonContext/Member/Member.aod
@@ -19,4 +19,11 @@
       <view>MemberDrawer_view</view>
     </neonViewReference>
   </references>
+  <viewmodeProvider>
+    <staticContentEntry>
+      <name>editView</name>
+      <key>editView</key>
+      <value>Links</value>
+    </staticContentEntry>
+  </viewmodeProvider>
 </neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 5303c6b55cee4d3796c3573e87fe61bf836703ec..87f1786ecea40ec5b4903385bde15598fa3f9489 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -51,10 +51,6 @@
       <name>c72caf13-37cf-4af9-811d-832f43801369</name>
       <view>OrganisationAttributeRestriction_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name>
-      <view>OrganisationNoNoiseTable_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
       <view>OrganisationReport_view</view>
@@ -63,6 +59,10 @@
       <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
       <view>OrganisationClassification</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d9065774-5ef3-4d1c-b96f-b2f98e6a581c</name>
+      <view>OrganisationNoNoiseTable_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>0b052872-d6b4-41ac-ad0b-580575893e1b</name>
       <view>OrganisationLesserNoiseTable_view</view>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index fc510061011c9a189deefff688d5284d4855b38f..4b997e115ae5c4e69f504b7c85f89b98a9327fb8 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -67,5 +67,13 @@
       <name>50993084-896d-4d90-9f5e-cd84d3a4dce5</name>
       <view>SalesprojectMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>70a70c7a-ac4e-4022-bfb5-5d13de4cfe6b</name>
+      <view>SalesprojectAnalysesPhases_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>079db4ee-86fc-4985-a253-249622d9f3ce</name>
+      <view>SalesprojectAnalyses_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
index 686800c1bf8e835926a710699ae1436e58948fee..fcebed52c4331297779102d0fb40ecdb1cecc989 100644
--- a/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
+++ b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
@@ -4,10 +4,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entity>SalesprojectAnalyses_entity</entity>
   <references>
-    <neonViewReference>
-      <name>c50b2e10-86ca-4a5b-83d4-946a78c18786</name>
-      <view>SalesprojectPhases_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>ccb97c28-966a-4206-b981-140e87e680bf</name>
       <view>SalesprojectScoreCard_view</view>
diff --git a/neonContext/SalesprojectConversionRate/SalesprojectConversionRate.aod b/neonContext/SalesprojectConversionRate/SalesprojectConversionRate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d4721f5aef44cad0f1051bc46bf753663482294a
--- /dev/null
+++ b/neonContext/SalesprojectConversionRate/SalesprojectConversionRate.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+  <name>SalesprojectConversionRate</name>
+  <title>Conversion Rate</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterView>SalesprojectConversionRate_view</filterView>
+  <entity>SalesprojectConversionRate_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>31c78b8b-2c5c-40d2-9cb1-0994f65e079d</name>
+      <view>SalesprojectConversionRate_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Userhelp/Userhelp.aod b/neonContext/Userhelp/Userhelp.aod
index bcacbf186d03fb6b955af671930d99f2ab22457f..435de68c2c1e230ca426a074593bb1004a7ebf6d 100644
--- a/neonContext/Userhelp/Userhelp.aod
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -3,13 +3,8 @@
   <name>Userhelp</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterView>Userhelp_FilterView</filterView>
-  <editView>Userhelp_EditView</editView>
   <entity>UserhelpResources</entity>
   <references>
-    <neonViewReference>
-      <name>44005781-a90b-468f-a970-7833d170f671</name>
-      <view>Userhelp_EditView</view>
-    </neonViewReference>
     <neonViewReference>
       <name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
       <view>Userhelp_FilterView</view>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index 61143b9768b36969cd29c740cd09c8bb721faefa..870d8ef2f23bf7f719d7a43c0dc70deec2075f06 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -35,39 +35,51 @@
       </uiConfiguration>
     </neonDashlet>
     <neonDashlet>
-      <name>Dashlet5</name>
-      <viewName>TurnoverChart_view</viewName>
-      <configName>TurnoverDashlet</configName>
+      <name>Dashlet2</name>
+      <viewName>SalesprojectFilter_view</viewName>
+      <configName>OpenSalesprojectsDashlet</configName>
       <uiConfiguration>
         <name>uiConfiguration</name>
         <xPos v="0" />
-        <yPos v="0" />
-        <colspan v="1" />
+        <yPos v="10" />
+        <colspan v="2" />
         <rowspan v="5" />
       </uiConfiguration>
     </neonDashlet>
     <neonDashlet>
-      <name>Dashlet2</name>
-      <viewName>SalesprojectFilter_view</viewName>
-      <configName>OpenSalesprojectsDashlet</configName>
+      <name>Dashlet3</name>
+      <viewName>SalesprojectAnalyses_view</viewName>
+      <configName>SalesprojectPhases</configName>
       <uiConfiguration>
         <name>uiConfiguration</name>
         <xPos v="1" />
         <yPos v="5" />
-        <colspan v="2" />
+        <colspan v="1" />
         <rowspan v="5" />
       </uiConfiguration>
     </neonDashlet>
     <neonDashlet>
-      <name>Dashlet3</name>
-      <viewName>SalesprojectPhases_view</viewName>
-      <configName>SalesprojectPhases</configName>
+      <name>Dashlet6</name>
+      <viewName>SalesprojectConversionRate_view</viewName>
+      <configName>ConvertionRates</configName>
       <uiConfiguration>
         <name>uiConfiguration</name>
         <xPos v="0" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="10" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet7</name>
+      <viewName>ActivityAnalyses_view</viewName>
+      <configName>analysesChart</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="2" />
         <yPos v="5" />
         <colspan v="1" />
-        <rowspan v="5" />
+        <rowspan v="10" />
       </uiConfiguration>
     </neonDashlet>
   </defaultDashlets>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index a6ca35f6cba049f162b252adbba2b7f913310576..fcb25887036ae11c5a7be2a6c77d2efe26ad5056 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -2,7 +2,7 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>360DegreeFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
+  <filterable v="false" />
   <layout>
     <groupLayout>
       <name>layout</name>
@@ -15,17 +15,19 @@
       <titleField>TITLE</titleField>
       <descriptionField>DATE</descriptionField>
       <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>ENTITY_NAME</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
     </treeViewTemplate>
     <timelineViewTemplate>
       <name>Timeline</name>
+      <favoriteActionGroup2>newModule</favoriteActionGroup2>
       <dateField>DATE</dateField>
       <titleField>TITLE</titleField>
       <descriptionField>ENTITY_NAME</descriptionField>
       <iconIdField>ICON</iconIdField>
+      <hideContentSearch v="false" />
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
   </children>
diff --git a/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod b/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..606d13134ae41b3962b0b2c53d81c3d7c9e4a9ca
--- /dev/null
+++ b/neonView/ActivityAnalyses_view/ActivityAnalyses_view.aod
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>ActivityAnalyses_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>analysesChart</name>
+      <title>Sales Staff Activity</title>
+      <description>Shows the number of Activities of the Grouped Fields</description>
+      <fragment>Activity/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiIjRVhURU5TSU9OLlJlc3BvbnNpYmxlRGVwYXJ0bWVudF9maWx0ZXIuUmVzcG9uc2libGVEZXBhcnRtZW50X2ZpbHRlciNURVhUIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiVmVydHJpZWIiLCJrZXkiOiJjOWQ4MTEwOS00NDA2LTQyMDUtOGI5MC1lMjdhY2Y1ODdjZjEiLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiRU5UUllEQVRFIiwib3BlcmF0b3IiOiJUSU1FRlJBTUVfRVFVQUwiLCJ2YWx1ZSI6IkRpZXNlcyBKYWhyIiwia2V5IjoiUkVMPUFESlVTVEVEO1VOSVQ9WUVBUiIsImNvbnRlbnR0eXBlIjoiREFURSJ9XX0%3D&amp;axes=COUNT&amp;grouping=RESPONSIBLE%2CCATEGORY</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
+      <icon>VAADIN:BAR_CHART_H</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>charts</name>
+          <title>Charts</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <dynamicMultiDataChartViewTemplate>
+      <name>dynamicChart</name>
+      <chartType>COLUMN</chartType>
+      <yAxisLabel>Count</yAxisLabel>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonDynamicMultiDataChartColumn>
+          <name>5d99020c-0bf4-4815-9a67-9e378fa66b66</name>
+          <entityField>COUNT</entityField>
+          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+        </neonDynamicMultiDataChartColumn>
+      </columns>
+    </dynamicMultiDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 43d67ddddc3f0b08fbc3158cd66b5647bc83a8a0..955128744e3c02f1cc7e83bef1f2ea5537d11db4 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -24,14 +24,14 @@
           <name>b90a5d96-9d1f-4eeb-b42c-0debeb7cf260</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>921a6690-43dc-488b-ae0a-4a0ab88a99ab</name>
-          <entityField>CATEGORY</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>a787b6c0-078d-47ff-9bff-eee1623d1760</name>
           <entityField>ENTRYDATE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>921a6690-43dc-488b-ae0a-4a0ab88a99ab</name>
+          <entityField>CATEGORY</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>d767e312-b28a-42e9-9e7d-b4ad82f25ff0</name>
           <entityField>DIRECTION</entityField>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 0d59f1b7b3c98f9bf630fee21e641c2801b5022b..a94234cc3f8111fcfbd178556efd0d9f5b4be5a6 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -116,18 +116,10 @@
         </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
-    <dynamicMultiDataChartViewTemplate>
-      <name>DynamicMultiDataChart</name>
-      <chartType>COLUMN</chartType>
-      <yAxisLabel>Count</yAxisLabel>
+    <neonViewReference>
+      <name>d09b51b2-9b8c-4aa1-8226-f20554491951</name>
       <entityField>#ENTITY</entityField>
-      <columns>
-        <neonDynamicMultiDataChartColumn>
-          <name>fce2e978-e34d-4c6d-84f0-94d698ae793e</name>
-          <entityField>COUNT</entityField>
-          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
-        </neonDynamicMultiDataChartColumn>
-      </columns>
-    </dynamicMultiDataChartViewTemplate>
+      <view>ActivityAnalyses_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ActivityUniversalFileProcessorFilter_view/ActivityUniversalFileProcessorFilter_view.aod b/neonView/ActivityUniversalFileProcessorFilter_view/ActivityUniversalFileProcessorFilter_view.aod
index a40577f24e623131aba304a68873f02eb1055f0f..eaec7e7ddba0db1de1262c4b98c9c9bb7202877e 100644
--- a/neonView/ActivityUniversalFileProcessorFilter_view/ActivityUniversalFileProcessorFilter_view.aod
+++ b/neonView/ActivityUniversalFileProcessorFilter_view/ActivityUniversalFileProcessorFilter_view.aod
@@ -2,6 +2,7 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>ActivityUniversalFileProcessorFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
   <layout>
     <groupLayout>
       <name>layout</name>
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index f9a869de8f6f78539fabe2b86d157941758c32d8..f0540f0420d82a95401fb023d144ebba72f28923 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -39,10 +39,6 @@
           <name>d26696ac-199c-45f0-9147-b75dee3f4b65</name>
           <entityField>ATTRIBUTE_ACTIVE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>c8a5f45e-8092-45f4-ac22-681700447235</name>
-          <entityField>ATTRIBUTE_LEVEL</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
deleted file mode 100644
index fa1411c9d21a1afae615cf923881e008421f31b0..0000000000000000000000000000000000000000
--- a/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>BulkMailMainPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-      <footer>e8f0200f-3447-4196-8aba-f2966e83689a</footer>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>2a1f719c-1838-4f30-8fb7-27cd7bbf16ee</name>
-      <entityField>#ENTITY</entityField>
-      <view>BulkMailPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e8f0200f-3447-4196-8aba-f2966e83689a</name>
-      <entityField>RecipientStatusChart</entityField>
-      <view>BulkMailStatusChart_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index 64a7c61cca27d47514a451609401f0bff91f054c..5c3d99ce8a8ab59e419574c23b7bee838b8889ae 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -5,7 +5,7 @@
   <layout>
     <masterSlaveLayout>
       <name>layout</name>
-      <master>3f7fc7d4-7cda-428c-8acb-364addc5239c</master>
+      <master>9dd4620e-2945-4f14-8e22-443812056001</master>
     </masterSlaveLayout>
   </layout>
   <children>
@@ -30,9 +30,9 @@
       <view>LogHistoryFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>3f7fc7d4-7cda-428c-8acb-364addc5239c</name>
+      <name>9dd4620e-2945-4f14-8e22-443812056001</name>
       <entityField>#ENTITY</entityField>
-      <view>BulkMailMainPreview_view</view>
+      <view>BulkMailPreview_view</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index f01706069a8926bf0cb54332799f86a76a03dead..7e3f5b4804e41dc7046fcb805cb520328e2d6ba6 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -69,5 +69,10 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>23ab3cb7-2d15-467d-8bd1-536ddd6262c7</name>
+      <entityField>RecipientStatusChart</entityField>
+      <view>BulkMailStatusChart_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
index 810bd1d346de0ccd495f545db7e1eda47d5ff882..4397f42cbf18230de40eb4ebb24f8505ada8c7a8 100644
--- a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
+++ b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>CampaignCostFix_view</name>
+  <title>Fix costs</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <noneLayout>
+    <drawerLayout>
       <name>layout</name>
-    </noneLayout>
+      <layoutCaption>Fix costs</layoutCaption>
+      <fixedDrawer v="true" />
+    </drawerLayout>
   </layout>
   <children>
-    <neonViewReference>
-      <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name>
-      <entityField>CampaignCosts</entityField>
-      <view>CampaignCostFilter_view</view>
-    </neonViewReference>
+    <tableViewTemplate>
+      <name>CampaignCostFix</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>1b2b3ce3-eaff-472b-a873-5e054adac89a</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>00630ccd-689f-4cf7-9dfc-cc0a67771c0c</name>
+          <entityField>NET</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
index c06e0922320bf320166cf42e3444e2208a7098c7..c29615b901e9d02f3a1e4ec26a3249bdcecaa4d3 100644
--- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -14,11 +14,10 @@
   <children>
     <treeTableViewTemplate>
       <name>CostTreeTable</name>
-      <favoriteActionGroup1>alter</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>CAMPAIGNSTEP_ID</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
           <name>457caff8-0403-425f-839c-62e5d05fe3a1</name>
diff --git a/neonView/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod
index 5fdcc86527717b04f2342d680a95644a45b8bfd9..03ccab3dbb9ccba29ba81793ec30f82fa684d0b2 100644
--- a/neonView/CampaignCost_view/CampaignCost_view.aod
+++ b/neonView/CampaignCost_view/CampaignCost_view.aod
@@ -17,8 +17,8 @@
       <view>CampaignCostVariable_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>c4476130-ca57-4707-9448-266138c09880</name>
-      <entityField>#ENTITY</entityField>
+      <name>cc960341-1f55-4ad5-8ae9-dece0df73b5c</name>
+      <entityField>CampaignCosts</entityField>
       <view>CampaignCostFix_view</view>
     </neonViewReference>
     <neonViewReference>
diff --git a/neonView/CampaignEdit_view/CampaignEdit_view.aod b/neonView/CampaignEdit_view/CampaignEdit_view.aod
index 09b485472214afe13ea75e7c74e38728eb6f02de..4636fbdffb1c079793fdc18ffea90285a8c6a508 100644
--- a/neonView/CampaignEdit_view/CampaignEdit_view.aod
+++ b/neonView/CampaignEdit_view/CampaignEdit_view.aod
@@ -18,7 +18,7 @@
       <showDrawer v="false" />
       <drawerCaption></drawerCaption>
       <entityField>#ENTITY</entityField>
-      <title>Neue Kampagne</title>
+      <title>New Campaign</title>
       <fields>
         <entityFieldLink>
           <name>df6356cf-e0bd-4947-8163-736301e622cf</name>
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 3dde5d4e26421ec75dbe34bc35a40fdb4fd0d3f2..0f7b7272655670436b4f21df4c6f9c78f65cb426 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -65,10 +65,6 @@
           <name>b5cf0352-2bb7-4219-afab-49ffd8c46fcc</name>
           <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>88e47cfc-d8cd-4192-aa70-3afb8588f75a</name>
-          <entityField>#TITLE</entityField>
-        </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
   </children>
diff --git a/neonView/CampaignPreview_view/CampaignPreview_view.aod b/neonView/CampaignPreview_view/CampaignPreview_view.aod
index a85780112dc3b54a37cb4fb08a11199bc1dfe5a0..6cbe20bbb71cbf84ade1963352435ae8982265bd 100644
--- a/neonView/CampaignPreview_view/CampaignPreview_view.aod
+++ b/neonView/CampaignPreview_view/CampaignPreview_view.aod
@@ -34,6 +34,7 @@
       <showDrawer v="true" />
       <drawerCaption>Campaign Period</drawerCaption>
       <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
       <title>Campaign Period</title>
       <fields>
         <entityFieldLink>
diff --git a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
index 52b5809134df11f418be3df6730105fc7bb397d3..975475f46305254376b82932f589d15c80d3f7c1 100644
--- a/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
+++ b/neonView/CampaignStepAddParticipants_view/CampaignStepAddParticipants_view.aod
@@ -22,10 +22,6 @@
           <name>62805d6e-3b77-4af3-b282-13720dd615df</name>
           <entityField>CAMPAIGNSTEPID</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>6c1ec68e-64fd-4eaf-8d74-047e9a8703fa</name>
-          <entityField>ADDPARTICIPANTSMESSAGE</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
index 65f90217df30f11791d438ff19ea290ba522e654..930baab2cbd6a0b9e3c993bfb014837b126262dc 100644
--- a/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
+++ b/neonView/CampaignStepEdit_view/CampaignStepEdit_view.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>CampaignStepEdit_view</name>
-  <title>Neuer Kampagnenschritt</title>
+  <title>New campaign step</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <size>SMALL</size>
   <overlayOrientation>PORTRAIT</overlayOrientation>
diff --git a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
index df00821f423a60a11108767bd997bea3198c8710..dc45eb0e658ba1ae7eba7072fac749bc7051813d 100644
--- a/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
+++ b/neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
@@ -88,6 +88,14 @@
           <name>cf22f88f-186f-4df5-bafb-d0ea9e2035de</name>
           <entityField>CurrentMaxParticipantsInfo</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>64d758de-c747-429c-b48d-3360484e25ff</name>
+          <entityField>STATUS</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>f4ab8967-0161-4aeb-a1ec-d21f88e77385</name>
+          <entityField>STEPMEDIUM</entityField>
+        </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
   </children>
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
index 0fd065096d7a63abf690e5285a66a56c2a4d3478..616066188353b8e65c14944886f0d9e36692ef62 100644
--- a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -18,16 +18,8 @@
       <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
-          <name>825a461f-65a1-4483-ae97-655b1f87bc0a</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>4d53ba6d-f0a0-4f04-afaa-3278a45cce86</name>
-          <entityField>CLASSIFICATIONGROUP</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>299d5ef1-31a5-47d2-ae41-573e05a0b6c7</name>
-          <entityField>CLASSIFICATIONTYPEID</entityField>
+          <name>2e04e92e-9af8-46a6-9845-8bf822cd05f3</name>
+          <entityField>#CONTENTTITLE</entityField>
         </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>
diff --git a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
index af9b4f0582b4b37575db7111fe5732d5f8d837b1..8c55fe145f75d6653dc2ba4968b158c6dcf796ed 100644
--- a/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
+++ b/neonView/ClassificationPreview_view/ClassificationPreview_view.aod
@@ -2,30 +2,42 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>ClassificationPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <isOverlay v="false" />
+  <overlayOrientation>PORTRAIT</overlayOrientation>
   <layout>
-    <headerFooterLayout>
+    <boxLayout>
       <name>layout</name>
-    </headerFooterLayout>
+      <autoHeight v="true" />
+    </boxLayout>
   </layout>
   <children>
     <genericViewTemplate>
-      <name>Info</name>
+      <name>classification</name>
+      <showDrawer v="true" />
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
+      <hideEmptyFields v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>51712a19-9a8c-4967-bd15-a448b5bffb77</name>
-          <entityField>CLASSNAME</entityField>
+          <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
+          <entityField>CLASSIFICATIONSCORE_ID</entityField>
         </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <genericViewTemplate>
+      <name>info</name>
+      <showDrawer v="true" />
+      <fixedDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <isEditable v="false" />
+      <title></title>
+      <fields>
         <entityFieldLink>
-          <name>c3621e4e-53b0-4932-b943-e1c07fe16a24</name>
-          <entityField>POINTS</entityField>
+          <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
+          <entityField>Info</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
-    <neonViewReference>
-      <name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
-      <entityField>SalesprojectClassificationEntries</entityField>
-      <view>SalesprojectClassificationEntryPreview_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod b/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
deleted file mode 100644
index c66526bd77fa3230cbf1d393380f6c51b9324411..0000000000000000000000000000000000000000
--- a/neonView/ClassificatonPreview_view/ClassificatonPreview_view.aod
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>ClassificatonPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <isOverlay v="false" />
-  <overlayOrientation>PORTRAIT</overlayOrientation>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-      <autoHeight v="true" />
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>classification</name>
-      <showDrawer v="true" />
-      <fixedDrawer v="true" />
-      <hideLabels v="false" />
-      <hideEmptyFields v="false" />
-      <entityField>#ENTITY</entityField>
-      <fields>
-        <entityFieldLink>
-          <name>dfdbc6f4-4859-495b-96e7-0853bdbc611f</name>
-          <entityField>CLASSIFICATIONSCORE_ID</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-    <genericViewTemplate>
-      <name>info</name>
-      <showDrawer v="true" />
-      <fixedDrawer v="true" />
-      <entityField>#ENTITY</entityField>
-      <isEditable v="false" />
-      <title></title>
-      <fields>
-        <entityFieldLink>
-          <name>2d1fae5e-1b2b-4e29-9bcb-646db9fd9653</name>
-          <entityField>Info</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
index ae4b045d5f0371d9e6a027219786e043b7d9a5b1..2dc804c8fa5e5cc62683314a6c0c390457b807f1 100644
--- a/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
+++ b/neonView/CompetitionEdit_view/CompetitionEdit_view.aod
@@ -39,18 +39,6 @@
           <name>087036b6-4b07-4f7e-90fe-b35c5ceb6dd9</name>
           <entityField>REASON</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>cb795feb-20f0-48d8-a147-5edb6a911d19</name>
-          <entityField>PRICE_POLITICS</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>755e1dc3-08f6-4a03-a572-3bb84ec73b05</name>
-          <entityField>STRENGTH</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>e14f29e5-36ff-4740-ae72-854d713c3f8f</name>
-          <entityField>WEAKNESS</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/DSGVOReport_view/DSGVOReport_view.aod b/neonView/DSGVOReport_view/DSGVOReport_view.aod
index bd894e65e4f84f17dc877903fc87ef21260e7c92..3835fcb15b87bf51c774399be84dcfd926d76757 100644
--- a/neonView/DSGVOReport_view/DSGVOReport_view.aod
+++ b/neonView/DSGVOReport_view/DSGVOReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>REPORT_DATA</reportData>
+      <favoriteActionGroup1>dsgvoReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/DistrictEdit_view/DistrictEdit_view.aod b/neonView/DistrictEdit_view/DistrictEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ef598ae5665601c0ec565416dd283b994c2c4db6
--- /dev/null
+++ b/neonView/DistrictEdit_view/DistrictEdit_view.aod
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictEdit_view</name>
+  <title>Responsible Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>genericViewTemplate</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>3c4e3069-f8ce-4cfc-84f5-17b5cbe606ec</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>fd54e6af-1045-402d-a464-0bcd8d27573c</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ec0706b4-dcf4-4c0d-b99a-cc0b129f3e46</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>325331a3-facb-4fd3-9efb-2bd8ed6f08f0</name>
+          <entityField>ISO3</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>941cb436-8b93-427d-ae2d-3731e55dd040</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f77428c6-eaff-4554-aedb-cf56d4c573d6</name>
+          <entityField>PARENTDISTRICT_DISTRICTID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>914ec7a6-f89f-44c5-9ea9-1a6223e4cf62</name>
+          <entityField>parentFilter</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>44d4f67e-5041-4b3f-a64f-71910050e035</name>
+          <entityField>DISTRICT_FILTER</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <neonViewReference>
+      <name>f1dddbee-5718-46b8-b682-ba4e707bf529</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsibleMultiEdit_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0ae033d2346776a6bb816ef83e21f016045031e5
--- /dev/null
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>treetableViewTemplate</name>
+      <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+      <hideContentSearch v="false" />
+      <showChildrenCount v="false" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>DISTRICT_NAME</element>
+        <element>DISTRICT_NUMBER</element>
+      </linkedColumns>
+      <columns>
+        <neonTreeTableColumn>
+          <name>923c5603-ed8f-4924-8a1d-9f6cc0d170e6</name>
+          <entityField>#ICON</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9f8e99dc-cfb3-4038-b949-27571f787db2</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>98f4acf0-ecb3-4999-8727-16df56e502cc</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9533ae87-3b08-4dd6-8265-13024cbab918</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>df5ff116-cead-46c3-9569-0a51f2243c81</name>
+          <entityField>ISO3</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>87184bb1-4d44-4872-bae7-9be903f71354</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..161c81303a534d682d1517acae5abfef351e9904
--- /dev/null
+++ b/neonView/DistrictList_view/DistrictList_view.aod
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictList_view</name>
+  <title>Responsible Districts</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treeTableViewTemplate>
+      <name>treeTableViewTemplate</name>
+      <parentField>PARENTDISTRICT_DISTRICTID</parentField>
+      <hideActions v="true" />
+      <showChildrenCount v="false" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <defaultGroupFields />
+      <fixedFilterFields />
+      <hideHeader v="false" />
+      <isCreatable v="false" />
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <columns>
+        <neonTreeTableColumn>
+          <name>6c3d52d5-8a51-4fd5-9b26-a54485c8f5a6</name>
+          <entityField>#ICON</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>15a66360-dff7-4d21-b4e1-f48102f0bda1</name>
+          <entityField>DISTRICT_NAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>ca9631f4-f48b-49a6-83dd-3c5b33ee669a</name>
+          <entityField>DISTRICT_NUMBER</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>257e37e4-e6b0-4d74-aa46-9c0643aed985</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>54a43aa1-1347-474c-9465-3a018d0cb99f</name>
+          <entityField>ISO3</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>932b9d0a-ccfc-4d17-b158-b19e3795af0b</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictMain_view/DistrictMain_view.aod b/neonView/DistrictMain_view/DistrictMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..2babd2f4b0b697301ad2cc98105a9779c53e8da9
--- /dev/null
+++ b/neonView/DistrictMain_view/DistrictMain_view.aod
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>8b52b148-a054-4e85-8de0-856be82abc77</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>8b52b148-a054-4e85-8de0-856be82abc77</name>
+      <entityField>#ENTITY</entityField>
+      <view>DistrictPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b409f300-c8b4-4052-9012-5e6b79c03a9c</name>
+      <entityField>Organisations</entityField>
+      <view>OrganisationFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>665bcb1a-aeb5-4dc5-9c2b-5398ee85bdc9</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>7001aa5a-75d1-42b4-bc45-db303d89184e</name>
+      <entityField>LogHistories</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/DistrictPreview_view/DistrictPreview_view.aod b/neonView/DistrictPreview_view/DistrictPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4f778e75402704706fecfd07dcc094377db9573c
--- /dev/null
+++ b/neonView/DistrictPreview_view/DistrictPreview_view.aod
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <headerFooterLayout>
+      <name>layout</name>
+      <header>cardViewTemplate</header>
+      <footer>scoreCardViewTemplate</footer>
+    </headerFooterLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>cardViewTemplate</name>
+      <iconField>#ICON</iconField>
+      <titleField>DISTRICT_NAME</titleField>
+      <descriptionField>DISTRICT_NUMBER_fieldGroup</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <neonViewReference>
+      <name>a7a731e8-f93e-4d90-8459-d249a13ecf0d</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsiblePreviewList_view</view>
+    </neonViewReference>
+    <genericViewTemplate>
+      <name>furtherInfosGenericViewTemplate</name>
+      <showDrawer v="true" />
+      <drawerCaption>Further informations</drawerCaption>
+      <fixedDrawer v="false" />
+      <hideEmptyFields v="true" />
+      <entityField>#ENTITY</entityField>
+      <title>Further informations</title>
+      <fields>
+        <entityFieldLink>
+          <name>f1c69329-5a9f-456f-b37d-1ca1b0e4943c</name>
+          <entityField>DISTRICT_INFO</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>0dddb53a-30ea-4c82-b7c2-7c3372a2968a</name>
+          <entityField>DISTRICT_FILTER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>98be594e-6209-4046-b0e9-07200c8c294e</name>
+          <entityField>DISTRICT_STATUS</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+    <scoreCardViewTemplate>
+      <name>scoreCardViewTemplate</name>
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>5aa54d53-a6c2-4b5f-9eae-67c8e4208cfc</name>
+          <entityField>totalTurnover</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>c76e215e-e2f4-42e5-a245-810003fec56b</name>
+          <entityField>customerCounting</entityField>
+        </entityFieldLink>
+      </fields>
+    </scoreCardViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cab52b315c31f6310d25a10e0194a3df1d0f478b
--- /dev/null
+++ b/neonView/DistrictResponsibleList_view/DistrictResponsibleList_view.aod
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsibleList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>tableViewTemplate</name>
+      <hideActions v="true" />
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>EMPLOYEE_CONTACT_ID</element>
+        <element>DISTRICT_ID</element>
+      </linkedColumns>
+      <fixedFilterFields />
+      <isCreatable v="false" />
+      <isDeletable v="false" />
+      <isEditable v="false" />
+      <title>Responsibles</title>
+      <columns>
+        <neonTableColumn>
+          <name>785ec0b8-e71d-4766-a03e-f125a465aa58</name>
+          <entityField>#ICON</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>158f589a-497f-4522-9b43-d7a6155c6818</name>
+          <entityField>DISTRICT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>32e7b066-76b4-4bd2-b440-bc7844c929a6</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>dc9bce22-9a99-4db9-a76a-8fd4a91d5f0f</name>
+          <entityField>departmentAttributeName</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>fd46a7b9-60bb-48d1-aac5-0ef28943eac9</name>
+          <entityField>PHONE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>5ae3b723-14b5-4100-b78b-2ae2ffa39bae</name>
+          <entityField>MAIL</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9e04ed897b7285c86d4739354d426155106d40dc
--- /dev/null
+++ b/neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsibleMultiEdit_view</name>
+  <title></title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>genericViewTemplate</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonGenericMultipleTableColumn>
+          <name>2c588be3-a0df-4c3f-9632-574e5b975073</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+          <fullWidth v="true" />
+        </neonGenericMultipleTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c1deba893d69a31f4656fc0959d7510422c5171a
--- /dev/null
+++ b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>DistrictResponsiblePreviewList_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <titledListViewTemplate>
+      <name>titledListViewTemplate</name>
+      <titleField>departmentAttributeName</titleField>
+      <entityField>#ENTITY</entityField>
+      <title>Contactperson</title>
+      <columns>
+        <neonTitledListTableColumn>
+          <name>007d67c4-146b-4202-a677-4390059b4a0a</name>
+          <entityField>EMPLOYEE_CONTACT_ID</entityField>
+          <fullWidth v="true" />
+        </neonTitledListTableColumn>
+      </columns>
+    </titledListViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod b/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod
index 26aa81b5f3e801333b1a5dddc11f352353abbf73..f7e201e275a6c8f3fbbad0a3506a24138646e58e 100644
--- a/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod
+++ b/neonView/DocumentMultipleEdit_view/DocumentMultipleEdit_view.aod
@@ -28,6 +28,10 @@
           <name>ab509c66-f72a-46b5-af5d-2b5620506bf5</name>
           <entityField>IS_MAIN_DOCUMENT</entityField>
         </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>48912651-0c8f-42f1-ba85-99ed5566e36f</name>
+          <entityField>KEYWORD</entityField>
+        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index c09f4a9cc317e29c243f81d13878e6d83475a093..7eadad0864f0131a237c2304c05dd0e4c5de519b 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -21,14 +21,13 @@
     </tilesViewTemplate>
     <treeTableViewTemplate>
       <name>SearchTree</name>
-      <parentField>KIND</parentField>
-      <defaultGroupFields>
-        <element>KIND</element>
-      </defaultGroupFields>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>NAME</element>
       </linkedColumns>
+      <defaultGroupFields>
+        <element>KIND</element>
+      </defaultGroupFields>
       <columns>
         <neonTreeTableColumn>
           <name>c0085121-edf6-4e3e-ace4-d599af4aa2f1</name>
diff --git a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
index 1ffb18b8f7876404e349e3e985579cc9a6f342df..e70f21cbb44614edea2bbb1dec7a060ff47f0450 100644
--- a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
+++ b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
@@ -10,10 +10,8 @@
   <children>
     <tableViewTemplate>
       <name>Filters</name>
-      <favoriteActionGroup2></favoriteActionGroup2>
-      <favoriteActionGroup3>RunActionGroup</favoriteActionGroup3>
       <entityField>#ENTITY</entityField>
-      <isCreatable v="true" />
+      <isCreatable v="false" />
       <isDeletable v="false" />
       <isEditable v="true" />
       <columns>
@@ -29,8 +27,9 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>Treetable</name>
-      <favoriteActionGroup3>RunActionGroup</favoriteActionGroup3>
       <entityField>#ENTITY</entityField>
+      <isCreatable v="false" />
+      <isDeletable v="false" />
       <columns>
         <neonTreeTableColumn>
           <name>2ce9962e-4e3e-4cd6-b391-0f61505459f4</name>
diff --git a/neonView/EmployeeLookup_view/EmployeeLookup_view.aod b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
index cece487a6604216437d5bddf5aa06db714d838ec..a213204aaa00a839ea88781d343c6b88b01d0cb8 100644
--- a/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
+++ b/neonView/EmployeeLookup_view/EmployeeLookup_view.aod
@@ -24,6 +24,10 @@
           <name>7c1a3e27-e7da-4e50-bef0-e987d9e1c4c8</name>
           <entityField>LASTNAME</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>bda739a9-24b9-4f58-8a28-9eed99f8bcc2</name>
+          <entityField>DEPARTMENT</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index c3b40d1ec2550fa5f1efc1bbc0462ce659ba8dc4..a7b67bdd57e314e3bf08e166dab14883974cb666 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -17,6 +17,10 @@
           <entityField>ROLE</entityField>
           <fullWidth v="true" />
         </neonGenericMultipleTableColumn>
+        <neonGenericMultipleTableColumn>
+          <name>18831921-1ab2-474c-a9a7-482a62140c45</name>
+          <entityField>UID</entityField>
+        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>
diff --git a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
index 69c2f20b23278d3b1d34088527ef8027638b635b..61070f4ce2ce005795b193ab22e3432174b1d8db 100644
--- a/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
+++ b/neonView/FavoriteFilter_view/FavoriteFilter_view.aod
@@ -29,11 +29,13 @@
   <children>
     <treeTableViewTemplate>
       <name>FavoriteTree</name>
-      <parentField>TITLE</parentField>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>TITLE</element>
+      </linkedColumns>
       <defaultGroupFields>
         <element>GROUP_TITLE</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
       <isEditable v="false" />
       <columns>
diff --git a/neonView/ForecastEdit_view/ForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod
index fe71618badc57d0394b5b8bf28484c9eddc2dc73..28debe56d0facef0164efd638b4d84b4c099a437 100644
--- a/neonView/ForecastEdit_view/ForecastEdit_view.aod
+++ b/neonView/ForecastEdit_view/ForecastEdit_view.aod
@@ -31,10 +31,6 @@
           <name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>382caf7e-d3db-4bac-af99-a95d62504da7</name>
-          <entityField>CONTACT_ID</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/ForecastFilter_view/ForecastFilter_view.aod b/neonView/ForecastFilter_view/ForecastFilter_view.aod
index 400bfb57ed5d2ddfb4f425fe3d4279b6dfc084d0..ffa08904f6bad6d9c86b4f0b7c64718d0bae3851 100644
--- a/neonView/ForecastFilter_view/ForecastFilter_view.aod
+++ b/neonView/ForecastFilter_view/ForecastFilter_view.aod
@@ -14,7 +14,6 @@
       <iconField>#ICON</iconField>
       <titleField>GROUPCODE</titleField>
       <subtitleField>VOLUME</subtitleField>
-      <descriptionField>TYPE</descriptionField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/LeadimportLeadFilter_view/LeadimportLeadFilter_view.aod b/neonView/LeadimportLeadFilter_view/LeadimportLeadFilter_view.aod
index e62ead8520b59abed55d818a3a92c454ea62de93..5d7859d4cc1718a63c414706f9a2348d1f51d310 100644
--- a/neonView/LeadimportLeadFilter_view/LeadimportLeadFilter_view.aod
+++ b/neonView/LeadimportLeadFilter_view/LeadimportLeadFilter_view.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
   <name>LeadimportLeadFilter_view</name>
-  <title>Transferdaten</title>
+  <title>Transfer data</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
diff --git a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
index 1280e176977621652db8dabe25cf0a263d8c7fcd..4e376d9f72a06e405dcbb8f176b68e93d5ecc93e 100644
--- a/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
+++ b/neonView/LeadimportPreview_view/LeadimportPreview_view.aod
@@ -16,7 +16,7 @@
       <titleField>NAME</titleField>
       <subtitleField>IMPORTSOURCE</subtitleField>
       <entityField>#ENTITY</entityField>
-      <informationField>SENTENCESEPERATOR</informationField>
+      <informationField>SENTENCESEPARATOR</informationField>
     </cardViewTemplate>
     <favoriteViewTemplate>
       <name>Favorites</name>
diff --git a/neonView/MemberFilter_view/MemberFilter_view.aod b/neonView/MemberFilter_view/MemberFilter_view.aod
index c432d26441eea86fa088802e5af8e6e2d738ce86..1d4faccbdb00791a08aed0d4aa59df802695a131 100644
--- a/neonView/MemberFilter_view/MemberFilter_view.aod
+++ b/neonView/MemberFilter_view/MemberFilter_view.aod
@@ -23,7 +23,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
-          <entityField>PERSON_FULL_NAME</entityField>
+          <entityField>CONTACT_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
@@ -57,7 +57,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>d84b10a1-593a-4c2f-ba35-4fb80c362850</name>
-          <entityField>PERSON_FULL_NAME</entityField>
+          <entityField>CONTACT_ID</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>22eb0efc-61b3-48fe-989d-2dd4e70ea780</name>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index f1b5cbc5874f615108d90880445a397df6bc40f0..26ee281b76cf7f73fedf86b0c739a12798fa9393 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -29,13 +29,14 @@
     <timelineViewTemplate>
       <name>NotificationTimeline</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
-      <dateField>CREATEDATE</dateField>
+      <dateField>CREATEDAY</dateField>
       <titleField>CAPTION</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
+      <subdescriptionField>CREATEDATE</subdescriptionField>
       <iconIdField>ICON</iconIdField>
+      <additionalInfoField>STATE</additionalInfoField>
       <entityField>#ENTITY</entityField>
       <isEditable v="false" />
-      <informationField>STATE</informationField>
     </timelineViewTemplate>
     <tableViewTemplate>
       <name>NotificationTable</name>
@@ -54,14 +55,14 @@
           <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
           <entityField>ICON</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
-          <entityField>CREATEDATE</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
           <entityField>CAPTION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+          <entityField>CREATEDATE</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
           <entityField>DESCRIPTION</entityField>
@@ -82,14 +83,14 @@
           <name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
           <entityField>ICON</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
-          <entityField>CREATEDATE</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>efefd3d9-7961-4299-aa7e-24d313ad6454</name>
           <entityField>CAPTION</entityField>
         </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
+          <entityField>CREATEDATE</entityField>
+        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>446c3d62-efa4-4f1a-85d4-e4f6a45019c7</name>
           <entityField>DESCRIPTION</entityField>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 0a1ab5740c5a8ae675bc91f798159175c3fdee75..dcfe1e8da8909c739b4d2d7d7cfad05ed4272a66 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -140,7 +140,12 @@
       <name>DynamicMultiDataChartCount</name>
       <chartType>COLUMN</chartType>
       <yAxisLabel>Count</yAxisLabel>
+      <shareParent v="false" />
       <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Count Chart</title>
       <columns>
         <neonDynamicMultiDataChartColumn>
           <name>4bbc9650-47fd-4a59-8e1e-bb60ceb85795</name>
@@ -153,7 +158,12 @@
       <name>DynamicMultiDataChartSum</name>
       <chartType>COLUMN</chartType>
       <yAxisLabel>Total in euros</yAxisLabel>
+      <shareParent v="false" />
       <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Sum Chart</title>
       <columns>
         <neonDynamicMultiDataChartColumn>
           <name>e5d14506-5205-43d0-89cb-416bf6debd25</name>
@@ -162,5 +172,23 @@
         </neonDynamicMultiDataChartColumn>
       </columns>
     </dynamicMultiDataChartViewTemplate>
+    <dynamicMultiDataChartViewTemplate>
+      <name>DynamicMultiDataChartProb</name>
+      <chartType>COLUMN</chartType>
+      <yAxisLabel>Probability in %</yAxisLabel>
+      <shareParent v="false" />
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
+      <title>Probability Chart</title>
+      <columns>
+        <neonDynamicMultiDataChartColumn>
+          <name>e5d14506-5205-43d0-89cb-416bf6debd25</name>
+          <entityField>PROBABILITY</entityField>
+          <aggregateEntityField>PROBABILITY_aggregate</aggregateEntityField>
+        </neonDynamicMultiDataChartColumn>
+      </columns>
+    </dynamicMultiDataChartViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
index d9949333d93de78c8373d7cbe77aa29d49b867d6..44610fe33c49fdcfb14991a4786f970603a8d240 100644
--- a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
+++ b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod
@@ -5,7 +5,7 @@
   <layout>
     <headerFooterLayout>
       <name>layout</name>
-      <footer>Scorecard</footer>
+      <footer>AggregatedValues</footer>
     </headerFooterLayout>
   </layout>
   <children>
@@ -23,12 +23,12 @@
     </dynamicMultiDataChartViewTemplate>
     <treeTableViewTemplate>
       <name>StatusTreeTable</name>
-      <defaultGroupFields>
-        <element>STATUS</element>
-      </defaultGroupFields>
       <hideActions v="true" />
       <entityField>#ENTITY</entityField>
       <linkedColumns />
+      <defaultGroupFields>
+        <element>STATUS</element>
+      </defaultGroupFields>
       <columns>
         <neonTreeTableColumn>
           <name>5cd9839b-0dea-44e8-9e2f-8f75a7e9cb16</name>
@@ -39,7 +39,6 @@
     </treeTableViewTemplate>
     <scoreCardViewTemplate>
       <name>AggregatedValues</name>
-      <entityField>OfferAggregates</entityField>
       <fields>
         <entityFieldLink>
           <name>71cd7dd5-c142-4b4c-8a6b-ca5ed8acf92e</name>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 6965423af47302f7a1d53f275197c4af7645d6ab..cd9156a57cc2dd16a96648a25f31a705d7f0ca8e 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -11,7 +11,6 @@
   <children>
     <treeTableViewTemplate>
       <name>OfferitemsTreeTable</name>
-      <parentField>ASSIGNEDTO</parentField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTreeTableColumn>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index d912f8d7a10ffcbd8e1316878d2792510f6ed73c..df64544990c9918c2e4521789a5b07ced99f9587 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -15,10 +15,18 @@
       <drawerCaption>Detail</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>6813f374-363c-4f99-8ee0-17362635c6d5</name>
+          <entityField>ChosenTexHeader</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
           <entityField>HEADER</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>4812559a-afe1-4036-8688-869d02564db8</name>
+          <entityField>ChosenTexFooter</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name>
           <entityField>FOOTER</entityField>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index e60953c96af16a2f57298f38c281c487fe62d36b..31110f64b91a482ce3b2a3122f0c45fd722a81d9 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -54,12 +54,13 @@
       <inlineEdit v="true" />
       <iconField>IMAGE</iconField>
       <titleField>SALESORDERCODE</titleField>
-      <subtitleField>STATUS</subtitleField>
+      <subtitleField>ORDERSTATUS</subtitleField>
       <descriptionField>NET</descriptionField>
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>SALESORDERCODE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>71f23753-601d-49fa-810d-daa02a1323d8</name>
@@ -101,10 +102,12 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>tree</name>
+      <defaultGroupFields />
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>SALESORDERCODE</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>b55edb3a-ecbc-4d4c-958e-6e491777895b</name>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 0e82bce97afb1a702caa033f36ea29101d9bb9ad..449cb53093e44483cf3aa756620e62102d37d113 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -35,10 +35,6 @@
           <name>0ee64080-2459-4a56-b4b9-cab2cac0f8c3</name>
           <entityField>SALESORDERDATE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>d7bb0f49-34db-4485-9908-598e83f3e73b</name>
-          <entityField>ORDERDATE</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>beb2d15c-6ed9-41fb-b59b-f874568a9896</name>
           <entityField>ORDERTYPE</entityField>
diff --git a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
index ca78ae38cf7495c86338ff4f3ceb317fbd5df3ae..8c0ed255d69772395ea09018326fa4259b6eb61c 100644
--- a/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
+++ b/neonView/OrderReminderReport_view/OrderReminderReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>REMINDER_REPORT_DATA</reportData>
+      <favoriteActionGroup1>reminderReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/OrderReport_view/OrderReport_view.aod b/neonView/OrderReport_view/OrderReport_view.aod
index 8a4fdcad3c61e86ddfebf2fd51d8d6b55fbc4224..0f3487512ac3b724cd6ca4aaba79f0e7c92b5def 100644
--- a/neonView/OrderReport_view/OrderReport_view.aod
+++ b/neonView/OrderReport_view/OrderReport_view.aod
@@ -11,6 +11,8 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>ORDER_REPORT_DATA</reportData>
+      <favoriteActionGroup1>orderReportDispatch</favoriteActionGroup1>
+      <favoriteActionGroup2></favoriteActionGroup2>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index b969a541b7f3b3563add1bbf0bc2b4364bcafd7f..1cbde0c53092405404ec0d317720691ca55d14e3 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -56,6 +56,7 @@
       <linkedColumns>
         <element>NAME</element>
       </linkedColumns>
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>2008e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
@@ -79,7 +80,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>c935dcaf-d1eb-4b2c-afee-a58f3f63458d</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+          <entityField>CLASSIFICATIONVALUE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>2a82ed1e-05bf-408a-82e0-4de6195dad49</name>
@@ -103,6 +104,8 @@
       <linkedColumns>
         <element>NAME</element>
       </linkedColumns>
+      <defaultGroupFields />
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>222c9da2-928c-4a93-a7a5-074e1c61a25c</name>
@@ -126,7 +129,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>3aedcc38-0313-43d7-9c84-67f03e28038a</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+          <entityField>CLASSIFICATIONVALUE</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>d134034c-e391-4df3-9205-465d8a390996</name>
diff --git a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
index 6cdd2403b231c98ca046452948c2a4cb246e7e87..5b29deefbee8b04a8e679b25b99f4ec3e47866df 100644
--- a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
+++ b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
@@ -14,6 +14,8 @@
       <hideContentSearch v="true" />
       <iconField></iconField>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
       <hideHeader v="false" />
       <columns>
         <neonTableColumn>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index d3bab7e2d2d08a1fa8838298ce96a92c53f060c0..0d9e7c9051b8045e5203369c54659ef9dd9c564a 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -11,6 +11,8 @@
     <tableViewTemplate>
       <name>Organisations</name>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 4b49bf017ef8e844fe502401ba56b0a5820d7f0c..df9be823dfc7638ea6bb6f126911731ad6b90784 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -55,6 +55,11 @@
       <entityField>#ENTITY</entityField>
       <view>OrganisationAttributeRestriction_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>a806bf0f-6214-4aad-872b-74e6f7fd1ee5</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsibleList_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
       <entityField>Documents</entityField>
diff --git a/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
index 22d274421a23d815278b17e4c67669b001611d04..2648fff358054098d3c837b50e09de889fb596c7 100644
--- a/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
+++ b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
@@ -14,6 +14,8 @@
       <hideContentSearch v="true" />
       <iconField></iconField>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
       <hideHeader v="true" />
       <title>Duplicates</title>
       <columns>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index b57cbbcf2f6b70b41115f6f620381b76b2778fa6..b3ee90540321ac60fbcac02169f6db1862ecfc9f 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -103,7 +103,7 @@
         </entityFieldLink>
         <entityFieldLink>
           <name>7699811a-42f2-48d4-833d-1425db5ba5d0</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+          <entityField>CLASSIFICATIONVALUE</entityField>
         </entityFieldLink>
       </fields>
     </scoreCardViewTemplate>
diff --git a/neonView/OrganisationReport_view/OrganisationReport_view.aod b/neonView/OrganisationReport_view/OrganisationReport_view.aod
index f8d29baac53e2de71d63e21d5eaa3f82976b710b..0c10fa2a0be68aabbdb477fce16f1adda9c1b55f 100644
--- a/neonView/OrganisationReport_view/OrganisationReport_view.aod
+++ b/neonView/OrganisationReport_view/OrganisationReport_view.aod
@@ -11,6 +11,7 @@
     <reportViewTemplate>
       <name>Report</name>
       <reportData>ORGANISATION_REPORT_DATA</reportData>
+      <favoriteActionGroup1>orgReportDispatch</favoriteActionGroup1>
       <entityField>#ENTITY</entityField>
     </reportViewTemplate>
   </children>
diff --git a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
index e32b8d2864701ed8303b9a07e29945f489a393ad..ffca2d78c9c23630df69eec76e2f882cd943872e 100644
--- a/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
+++ b/neonView/PermissionCalendarFilter_view/PermissionCalendarFilter_view.aod
@@ -40,10 +40,10 @@
     <treeTableViewTemplate>
       <name>PermissionCalendarTreeTable</name>
       <favoriteActionGroup1>AddActions</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
       <defaultGroupFields>
         <element>PERMISSION</element>
       </defaultGroupFields>
-      <entityField>#ENTITY</entityField>
       <isCreatable v="false" />
       <isEditable v="true" />
       <columns>
diff --git a/neonView/PermissionMetaDataFilter_view/PermissionMetaDataFilter_view.aod b/neonView/PermissionMetaDataFilter_view/PermissionMetaDataFilter_view.aod
index 2d45766d2389e16518347c649ea2d2576d91ddc2..9644e50cf2d1d009ffd09a0981d86df7ac8493e7 100644
--- a/neonView/PermissionMetaDataFilter_view/PermissionMetaDataFilter_view.aod
+++ b/neonView/PermissionMetaDataFilter_view/PermissionMetaDataFilter_view.aod
@@ -34,30 +34,5 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <linkedColumns>
-        <element>TITLE</element>
-      </linkedColumns>
-      <columns>
-        <neonTreeTableColumn>
-          <name>d1b2e22a-d498-4210-98af-e23af4373a0c</name>
-          <entityField>#ICON</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>55d733cc-e7dc-411b-abf6-7fdd25ee1985</name>
-          <entityField>UID</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>00ed2afa-028d-4342-9398-66264b566521</name>
-          <entityField>TITLE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>dd5ed711-0ed0-4d2a-9569-0b97cb2cb731</name>
-          <entityField>DESCRIPTION</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
index 6dd2bd1678311ebb3eb3fa9e640485aeb5dad868..7e1ea7f0faabad4a01b7a16f121d93a8de2ff4eb 100644
--- a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
+++ b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
@@ -46,39 +46,5 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTreeTableColumn>
-          <name>703cc584-ce6a-4c8c-8978-82c9860224ae</name>
-          <entityField>#ICON</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>bc7559c2-e9d5-42e9-8b61-a09046acf440</name>
-          <entityField>ENTITY</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>28a0ec9d-25b2-4fac-864d-e7938ccf6786</name>
-          <entityField>ACTION_VIEW</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>0d03d52c-2771-4f9c-a1a9-f6de6b36b810</name>
-          <entityField>ACTION_CREATE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>981ff8df-b75c-49cd-b3f4-62bba6e5965b</name>
-          <entityField>ACTION_READ</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>3e9dfbd8-db73-480d-8a50-12cd18638d4f</name>
-          <entityField>ACTION_UPDATE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>f0f6aace-aeae-42bd-be95-8b05f2ff087a</name>
-          <entityField>ACTION_DELETE</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/PersonDetail_view/PersonDetail_view.aod b/neonView/PersonDetail_view/PersonDetail_view.aod
index c4073f2110de59b0cb6e07f78c52995dcfed3994..bf877ec44c102df4803f41d11075dacecf76123c 100644
--- a/neonView/PersonDetail_view/PersonDetail_view.aod
+++ b/neonView/PersonDetail_view/PersonDetail_view.aod
@@ -25,10 +25,6 @@
           <name>39ca0ab2-b2d5-4d56-9ded-f8df1ae4dd0a</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>86e3b7c4-44ee-4fd4-83f1-2842a0eabda7</name>
-          <entityField>ORGNAME</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index f59ffc93a3820bf72035b5c719272c599d506113..7e88568ac761047866b5e5bfc6167662e731a85b 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -44,6 +44,16 @@
       <entityField>#ENTITY</entityField>
       <view>PersonAttributeRestriction_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>1f6cf193-61c3-4681-bafd-c7f9c906cdf6</name>
+      <entityField>Districts</entityField>
+      <view>DistrictList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>19a5f9ed-228d-4352-9e82-e7aa690648e9</name>
+      <entityField>DistrictResponsibles</entityField>
+      <view>DistrictResponsibleList_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
       <entityField>Documents</entityField>
diff --git a/neonView/PersonMultiEditQuickEntry_view/PersonMultiEditQuickEntry_view.aod b/neonView/PersonMultiEditQuickEntry_view/PersonMultiEditQuickEntry_view.aod
index f93d76ce5086d44c557cab0f4346d224fe5de424..5b15646ad0ca10ce8dcbdfdc9b3dbf1b240aafc0 100644
--- a/neonView/PersonMultiEditQuickEntry_view/PersonMultiEditQuickEntry_view.aod
+++ b/neonView/PersonMultiEditQuickEntry_view/PersonMultiEditQuickEntry_view.aod
@@ -11,7 +11,7 @@
     <genericMultipleViewTemplate>
       <name>GenericMultiple</name>
       <entityField>#ENTITY</entityField>
-      <title>Weitere Kontakte</title>
+      <title>more contacts</title>
       <devices>
         <element>MOBILE</element>
         <element>TABLET</element>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 5a2312e1f735abdb644f2145dbaa24f5edb0b514..63a4b1e6d2a04258afe7327e8eb90dd93d3f6617 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -4,9 +4,9 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
     <tableViewTemplate>
@@ -60,5 +60,52 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>tree</name>
+      <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>b18db709-56e9-4f7e-89a2-f0e2b81c75d0</name>
+          <entityField>PICTURE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>7d8d985a-dfec-452c-8b6c-a55bfe5ede54</name>
+          <entityField>SALUTATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>92be2c7c-99c8-4e05-8f0a-e18d7a2daf3e</name>
+          <entityField>TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>1b427ee7-e139-48a0-a28a-fc6df7dcd973</name>
+          <entityField>FIRSTNAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>d783cfe2-b9de-4ffc-88b3-01d6f9fdecbe</name>
+          <entityField>LASTNAME</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>e2bb18db-6b2b-49d2-a02a-de671cab56a7</name>
+          <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9b8fee81-dc82-42c3-9b8e-6327567f6e51</name>
+          <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>3eda2fc2-6f6d-4b88-a25b-565f854f69db</name>
+          <entityField>DEPARTMENT</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9013309d-9823-43b7-940e-0b1dce0e7588</name>
+          <entityField>CONTACTROLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>ece44de8-f5c0-4cdd-a9d9-4d7c004a1367</name>
+          <entityField>POSITION</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 6cafb03d52f973c897caca580ccb0ea0176a76ff..768f479d12d49821655426ff6908c69d9824cc27 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -25,10 +25,6 @@
           <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
           <entityField>MINSTOCK</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
-          <entityField>ORGANISATION_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
           <entityField>PRODUCTCODE</entityField>
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index bf1fad13d59c383237b85a5751735e30afaa7778..bb516112119a7134549491a865cba256ce618926 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -16,6 +16,12 @@
       <subtitleField>PRODUCT_ID</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <favoriteViewTemplate>
+      <name>Favorites</name>
+      <objectType>PRODUCTPRICE_OBJECTTYPE</objectType>
+      <rowId>PRODUCTPRICEID</rowId>
+      <entityField>#ENTITY</entityField>
+    </favoriteViewTemplate>
     <genericViewTemplate>
       <name>PriceInfo</name>
       <showDrawer v="true" />
diff --git a/neonView/RoleFilter_view/RoleFilter_view.aod b/neonView/RoleFilter_view/RoleFilter_view.aod
index 724b573a3a35ae1ab216c5d1f6a6a525fd3808a1..612096e53f13856ffecdd786ed760b697a96d532 100644
--- a/neonView/RoleFilter_view/RoleFilter_view.aod
+++ b/neonView/RoleFilter_view/RoleFilter_view.aod
@@ -44,40 +44,11 @@
           <name>7b269530-309a-4599-a392-f6e2651ccb65</name>
           <entityField>ROLEDESCRIPTION</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>ca78de72-e6f2-432a-b7ea-bf6ab74f1c84</name>
+          <entityField>IS_ASSIGNABLE</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <linkedColumns>
-        <element>ROLETITLE</element>
-      </linkedColumns>
-      <columns>
-        <neonTreeTableColumn>
-          <name>d6624366-6f57-4c81-b2ef-4776297b94a7</name>
-          <entityField>#ICON</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>27d8023d-2867-4e3b-8586-33e2e91086b9</name>
-          <entityField>ROLENAME</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>9698900e-d897-4bdd-a3ef-5eb5857b5052</name>
-          <entityField>ROLETITLE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>9dd955e3-e4dd-4d3b-aedd-1261ab77f947</name>
-          <entityField>ROLETYPE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>9f64b198-dc4a-46ba-80fa-9e8e6f15298b</name>
-          <entityField>USERCOUNT</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>46a68706-86d0-43c4-8d66-2f1d8ccf94b6</name>
-          <entityField>ROLEDESCRIPTION</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod b/neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..86524aca75abcc6f73c19fd30aee8cc986ead6b1
--- /dev/null
+++ b/neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>SalesprojectAnalysesPhases_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <dynamicSingleDataChartViewTemplate>
+      <name>PhaseFunnelChart</name>
+      <chartType>FUNNEL</chartType>
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT</element>
+      </defaultGroupFields>
+      <columns>
+        <neonDynamicSingleDataChartColumn>
+          <name>b9df936d-3079-41d2-a73d-4090b189eaa4</name>
+          <entityField>COUNT</entityField>
+          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+        </neonDynamicSingleDataChartColumn>
+      </columns>
+    </dynamicSingleDataChartViewTemplate>
+    <dynamicSingleDataChartViewTemplate>
+      <name>PhasePieChart</name>
+      <chartType>PIE</chartType>
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT</element>
+      </defaultGroupFields>
+      <columns>
+        <neonDynamicSingleDataChartColumn>
+          <name>b9df936d-3079-41d2-a73d-4090b189eaa4</name>
+          <entityField>COUNT</entityField>
+          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+        </neonDynamicSingleDataChartColumn>
+      </columns>
+    </dynamicSingleDataChartViewTemplate>
+    <dynamicSingleDataChartViewTemplate>
+      <name>PhasePyramidChart</name>
+      <chartType>PYRAMID</chartType>
+      <shareParent v="true" />
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>#EXTENSION.Phase_filterExtention.Phase_filterExtention#TEXT</element>
+      </defaultGroupFields>
+      <columns>
+        <neonDynamicSingleDataChartColumn>
+          <name>b9df936d-3079-41d2-a73d-4090b189eaa4</name>
+          <entityField>COUNT</entityField>
+          <aggregateEntityField>COUNT_aggregate</aggregateEntityField>
+        </neonDynamicSingleDataChartColumn>
+      </columns>
+    </dynamicSingleDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod b/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1228d3cc49bdac80030aec42937bcdb4fc9c643a
--- /dev/null
+++ b/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>SalesprojectAnalyses_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>SalesprojectPhases</name>
+      <title>Salesproject phases</title>
+      <description>Shows how many sales projects are in the various sales phases</description>
+      <fragment>Salesproject/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJQSEFTRSIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJOZWdvdGlhdGlvbiIsImtleSI6IlNBTFBST0pQSEFTRU5FR08iLCJjb250ZW50dHlwZSI6IlRFWFQifV19&amp;axes=COUNT&amp;grouping=%23EXTENSION.Phase_filterExtention.Phase_filterExtention%23TEXT</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
+      <icon>VAADIN:FUNNEL</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>sales</name>
+          <title>Sales</title>
+        </neonDashletCategory>
+        <neonDashletCategory>
+          <name>charts</name>
+          <title>Charts</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>807efd75-92f1-4e9b-83fa-05894a17eaec</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectAnalysesPhases_view</view>
+    </neonViewReference>
+    <treeTableViewTemplate>
+      <name>Treetable</name>
+      <entityField>#ENTITY</entityField>
+      <linkedColumns>
+        <element>PROJECTCODE</element>
+        <element>PROJECTTITLE</element>
+      </linkedColumns>
+      <columns>
+        <neonTreeTableColumn>
+          <name>3440687e-1e9a-4c34-87f6-e1541e165d9d</name>
+          <entityField>IMAGE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>873e3b1d-a80c-40a0-83f4-3aec77bcc199</name>
+          <entityField>PROJECTCODE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>35bd61d9-a2b6-4b72-a622-e96599fdc302</name>
+          <entityField>PROJECTTITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9c67056d-8d19-4f4c-9404-57bebc5aa021</name>
+          <entityField>CONTACT_ID</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>0ddf35d7-9690-47f3-8cad-ab2a1fbbac4f</name>
+          <entityField>STARTDATE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>8a0e6555-84dc-4272-b982-7674e38ef7ff</name>
+          <entityField>ENDDATE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>9f159348-ac27-40e5-a159-a35ca1b229c5</name>
+          <entityField>PHASE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>e80ae8ab-5910-430d-b743-89b4fb8a1849</name>
+          <entityField>STATUS</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod b/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dfb2ef2e310f8697d97db79098d64d03f61f8b7f
--- /dev/null
+++ b/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>SalesprojectConversionRate_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>ConvertionRates</name>
+      <title>Salesproject Convertion Rates</title>
+      <description>Shows the different conversion rates of the sales project phases</description>
+      <fragment>SalesprojectConversionRate/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiIjRVhURU5TSU9OLkRBVEVfU1RBUlQuREFURV9TVEFSVCNEQVRFIiwib3BlcmF0b3IiOiJUSU1FRlJBTUVfRVFVQUwiLCJ2YWx1ZSI6IkRpZXNlcyBKYWhyIiwia2V5IjoiUkVMPUFESlVTVEVEO1VOSVQ9WUVBUiIsImNvbnRlbnR0eXBlIjoiREFURSJ9XX0%3D&amp;axes=conversionRate&amp;grouping=AB_KEYWORD_ENTRYID_KEYID%2C%23EXTENSION.Month.Month%23NUMBER</fragment>
+      <singleton v="true" />
+      <storeRoles>
+        <element>PROJECT_FieldStaff</element>
+        <element>PROJECT_OfficeStaff</element>
+      </storeRoles>
+      <icon>VAADIN:BAR_CHART_V</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>sales</name>
+          <title>Sales</title>
+        </neonDashletCategory>
+        <neonDashletCategory>
+          <name>charts</name>
+          <title>Charts</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <dynamicMultiDataChartViewTemplate>
+      <name>dynamicChart</name>
+      <chartType>BAR</chartType>
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>#EXTENSION.Month.Month#NUMBER</element>
+        <element>AB_KEYWORD_ENTRYID_KEYID</element>
+      </defaultGroupFields>
+      <columns>
+        <neonDynamicMultiDataChartColumn>
+          <name>ab9652f1-4606-4a07-8a54-9defd7d31990</name>
+          <entityField>conversionRate</entityField>
+          <aggregateEntityField>conversionRate_aggregate</aggregateEntityField>
+        </neonDynamicMultiDataChartColumn>
+      </columns>
+    </dynamicMultiDataChartViewTemplate>
+    <treeTableViewTemplate>
+      <name>TreeTable</name>
+      <entityField>#ENTITY</entityField>
+      <defaultGroupFields>
+        <element>#EXTENSION.Month.Month#NUMBER</element>
+        <element>AB_KEYWORD_ENTRYID_KEYID</element>
+      </defaultGroupFields>
+      <columns>
+        <neonTreeTableColumn>
+          <name>75ab4e6c-ebae-404d-925b-d1f697ef7717</name>
+          <entityField>AB_KEYWORD_ENTRYID_TITLE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>b8c437a5-220a-4a2e-b9a6-0f8f52f23460</name>
+          <entityField>conversionRate</entityField>
+          <aggregateEntityField>conversionRate_aggregate</aggregateEntityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 2713e11d767a15467c952dfae1354d775b7a2fdc..c055908d5269a0ba8e895e831523b86782eda5a0 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -85,7 +85,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>88e6bebb-e83d-43ec-82f1-cc778fac458e</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+          <entityField>CLASSIFICATIONVALUE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
@@ -107,12 +107,12 @@
     </tableViewTemplate>
     <treeTableViewTemplate>
       <name>Treetable</name>
-      <defaultGroupFields />
       <entityField>#ENTITY</entityField>
       <linkedColumns>
         <element>PROJECTCODE</element>
         <element>PROJECTTITLE</element>
       </linkedColumns>
+      <defaultGroupFields />
       <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
@@ -133,7 +133,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>6d9d1365-985a-4357-8ecc-16ddcc201ea8</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+          <entityField>CLASSIFICATIONVALUE</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>745d6192-4817-49e6-8cb2-8470c9c25f4d</name>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
index a43785597b8812ea61a288ac3271315ec425e741..178eb3816ff68e66731ce8faa605c31de9295f53 100644
--- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -21,7 +21,7 @@
       <columns>
         <neonTableColumn>
           <name>4c261b96-17d3-424e-8297-3ff46d780516</name>
-          <entityField>VALUE</entityField>
+          <entityField>MILESTONEVALUE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>c055c340-0f7b-4c91-a0a6-22e20511d2a9</name>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
deleted file mode 100644
index 8489daf21cd02f33a96ef29fa7ecaa7b4e75f304..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SalesprojectPhases_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <dashletConfigurations>
-    <neonDashletConfiguration>
-      <name>SalesprojectPhases</name>
-      <title>Salesproject phases</title>
-      <description>Shows how many sales projects are in the various sales phases</description>
-      <fragment>SalesprojectAnalyses/full</fragment>
-      <singleton v="true" />
-      <storeRoles>
-        <element>PROJECT_FieldStaff</element>
-        <element>PROJECT_OfficeStaff</element>
-      </storeRoles>
-      <icon>VAADIN:FUNNEL</icon>
-      <categories>
-        <neonDashletCategory>
-          <name>sales</name>
-          <title>Sales</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>charts</name>
-          <title>Charts</title>
-        </neonDashletCategory>
-      </categories>
-    </neonDashletConfiguration>
-  </dashletConfigurations>
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <singleDataChartViewTemplate>
-      <name>PhaseFunnelChart</name>
-      <chartType>FUNNEL</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <parentField></parentField>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-    <singleDataChartViewTemplate>
-      <name>PhasePieChart</name>
-      <chartType>PIE</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <parentField></parentField>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-    <singleDataChartViewTemplate>
-      <name>PhasePyramidChart</name>
-      <chartType>PYRAMID</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 97bfa5d73f75c2285f288f5dfe828d02446e39e8..fcabc60c03fecf7634d1b6317d0fba64e5e7b11c 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -37,10 +37,6 @@
       <drawerCaption>Details</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
-          <entityField>RELATION_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>b3e902de-072f-4a41-8562-f4d30ad9a564</name>
           <entityField>STATUS</entityField>
@@ -106,14 +102,14 @@
           <name>79490331-6be4-422f-9450-da0db56f0654</name>
           <entityField>InactiveTime</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>49513dd7-f19a-450b-9fcf-d320e2f72c42</name>
-          <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
           <entityField>RemainingTime</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>22c0b0ad-02e8-4743-9062-d1130bdb482d</name>
+          <entityField>CLASSIFICATIONVALUE</entityField>
+        </entityFieldLink>
       </fields>
     </scoreCardViewTemplate>
   </children>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 6bac5280054d1d3eb7fc0bd1da08593013fc6f23..ca41ad24d87b50d8d5ab56b98bc517506176fc93 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -12,7 +12,6 @@
     <tableViewTemplate>
       <name>Entries</name>
       <iconField>#ICON</iconField>
-      <titleField>SOURCE</titleField>
       <subtitleField>ENTRYDATE</subtitleField>
       <descriptionField>INFO</descriptionField>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index f233e247a8ea243775ec164648f5d61952f791fd..6dc1c376ae6f99ba2a9c57624194e4b709e1365a 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -37,7 +37,6 @@
   <children>
     <timelineViewTemplate>
       <name>TicketsTimeline</name>
-      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <dateField>TASK_MATURITY_DATE</dateField>
       <titleField>TASK_SUBJECT_DETAILS</titleField>
       <descriptionField>TASK_DESCRIPTION</descriptionField>
@@ -54,6 +53,7 @@
       <linkedColumns>
         <element>TASK_SUBJECT</element>
       </linkedColumns>
+      <fixedFilterFields />
       <title></title>
       <columns>
         <neonTableColumn>
@@ -100,6 +100,8 @@
       <linkedColumns>
         <element>TASK_SUBJECT</element>
       </linkedColumns>
+      <defaultGroupFields />
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>32792588-0db9-4a67-a9e8-e1ba0c78f109</name>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index d56fbc0ca0b5edfc59b07f8a84cb7ee26af64943..c05c5db874a747d5fb6c8e5803fafd6a5aea9c8a 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -14,8 +14,8 @@
       <name>Timetrackings</name>
       <iconField>#IMAGE</iconField>
       <titleField>CONTACT_ID</titleField>
-      <subtitleField>MINUTES</subtitleField>
-      <descriptionField>DATE</descriptionField>
+      <subtitleField>TRACKINGMINUTES</subtitleField>
+      <descriptionField>TRACKINGDATE</descriptionField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
diff --git a/neonView/VisitPlanEmployeeWeekEdit_view/VisitPlanEmployeeWeekEdit_view.aod b/neonView/VisitPlanEmployeeWeekEdit_view/VisitPlanEmployeeWeekEdit_view.aod
index d11ac479a593f7dea6bd16945f2c04f469f68113..f4bb8a7d21fd3c6fb354e0a481161cc9ea5b7d59 100644
--- a/neonView/VisitPlanEmployeeWeekEdit_view/VisitPlanEmployeeWeekEdit_view.aod
+++ b/neonView/VisitPlanEmployeeWeekEdit_view/VisitPlanEmployeeWeekEdit_view.aod
@@ -16,10 +16,6 @@
       <entityField>#ENTITY</entityField>
       <isEditable v="true" />
       <fields>
-        <entityFieldLink>
-          <name>a066671d-5efb-4123-afe6-a4a420342b17</name>
-          <entityField>PERSON_ID</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>fb5eb7db-38f3-46d7-8694-8c11a05a3d74</name>
           <entityField>WEEK</entityField>
@@ -32,6 +28,10 @@
           <name>6e656a20-41a5-4fe7-9b4a-ba2e3629ade1</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>0c0f5a7d-296c-46ee-9ecb-baefe3a96621</name>
+          <entityField>CONTACT_ID</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/VisitPlanEmployeeWeekFilter_view/VisitPlanEmployeeWeekFilter_view.aod b/neonView/VisitPlanEmployeeWeekFilter_view/VisitPlanEmployeeWeekFilter_view.aod
index 4eab72067414457b5e31a3b9ce0358d9b3d43a48..6de254467a3bcc67474914322890efc32e456afb 100644
--- a/neonView/VisitPlanEmployeeWeekFilter_view/VisitPlanEmployeeWeekFilter_view.aod
+++ b/neonView/VisitPlanEmployeeWeekFilter_view/VisitPlanEmployeeWeekFilter_view.aod
@@ -12,6 +12,8 @@
     <tableViewTemplate>
       <name>Table</name>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <fixedFilterFields />
       <columns>
         <neonTableColumn>
           <name>a3f48ebd-9472-4388-8525-8351bdc90715</name>
@@ -25,10 +27,6 @@
           <name>41e665d5-0bcf-4e33-8080-809d839da15d</name>
           <entityField>YEAR</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>92095268-0400-462d-9a6c-227d9f6966d4</name>
-          <entityField>PERSON_ID</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>a5b55587-841d-42d5-b4b7-eff55f6f6858</name>
           <entityField>entriescount</entityField>
@@ -54,6 +52,9 @@
     <treeTableViewTemplate>
       <name>Treetable</name>
       <entityField>#ENTITY</entityField>
+      <linkedColumns />
+      <defaultGroupFields />
+      <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
           <name>555cdb41-0bad-40e8-afad-f389ff0a9910</name>
@@ -67,10 +68,6 @@
           <name>6a11aa05-3879-46f2-9944-2006d9caf928</name>
           <entityField>YEAR</entityField>
         </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>bb232878-5316-4b8f-9c0e-02833e588544</name>
-          <entityField>PERSON_ID</entityField>
-        </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>8db139d9-7dd7-4ea2-9c73-1c0accec2ef5</name>
           <entityField>entriescount</entityField>
diff --git a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
index 7e053c7391add6378ede3a38de3bba9cfb51a644..ec7824e9dea6a39448816cd25514e31cd7b79504 100644
--- a/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
+++ b/neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
@@ -14,22 +14,15 @@
     <cardViewTemplate>
       <name>Card</name>
       <iconField>icon</iconField>
-      <titleField>PERSON_ID</titleField>
+      <titleField>WEEK</titleField>
       <entityField>#ENTITY</entityField>
       <isEditable v="false" />
+      <informationField>YEAR</informationField>
     </cardViewTemplate>
     <genericViewTemplate>
       <name>Generic</name>
       <entityField>#ENTITY</entityField>
       <fields>
-        <entityFieldLink>
-          <name>5dcc40c3-a5e9-4030-a0bd-50282c361c0e</name>
-          <entityField>WEEK</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>e75e5ce2-9702-4885-a12d-64afe780b728</name>
-          <entityField>YEAR</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>9e6bca10-ce10-4f90-a5e5-f70c680edb25</name>
           <entityField>INFO</entityField>
@@ -38,6 +31,7 @@
     </genericViewTemplate>
     <scoreCardViewTemplate>
       <name>Score_Card</name>
+      <fieldActions />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
diff --git a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
index 950d8706d14ac77e9e0f45694cd50f8b4abb9fc1..4a216530f8c322ab9d408cf5e305e0423d473f33 100644
--- a/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
+++ b/neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod
@@ -17,8 +17,8 @@
       <isEditable v="true" />
       <fields>
         <entityFieldLink>
-          <name>6cb39117-71cf-432b-afe7-b3446921d89e</name>
-          <entityField>ORGANISATION_ID</entityField>
+          <name>8c3a2df7-3928-43d4-baa9-686747ed020c</name>
+          <entityField>ORGANISATION_CONTACT_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>7584baf6-340c-419b-ad16-03c75b96aa39</name>
diff --git a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
index d7dcd500c7cd98ba11fb59219587d07c538a05fc..4233a41959165dbc19972cf740ef8fab1fdbece6 100644
--- a/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
+++ b/neonView/VisitPlanEntryFilter_view/VisitPlanEntryFilter_view.aod
@@ -54,7 +54,7 @@
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>646193df-c713-4b40-85cc-0fbe6f8cb316</name>
-          <entityField>ORGANISATION_ID</entityField>
+          <entityField>ORGANISATION_CONTACT_ID</entityField>
         </neonTreeTableColumn>
         <neonTreeTableColumn>
           <name>bcaf81b5-0e84-47e0-91aa-b62cec49ed17</name>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index a44cefc227883f0d42806ec23c3538da867cb9b4..3e9db3204aca942b5356a3023b17716a739754cf 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -19,18 +19,18 @@
       <value></value>
     </entry>
     <entry>
-      <key>auswärts</key>
+      <key>OutOfOffice</key>
       <value></value>
     </entry>
     <entry>
-      <key>Urlaub</key>
+      <key>Vacation</key>
       <value></value>
     </entry>
   </calendarCategoriesEvent>
   <recordContainerCachingAlias>RecordContainerCache</recordContainerCachingAlias>
   <clientSearchOptimizedForSpeed v="true" />
   <clientSearchExcludeForIgnorecase v="true" />
-  <neonClientPermissionsEnabled v="true" />
+  <neonClientPermissionsEnabled v="false" />
   <clientFeedbackMailaddress />
   <blobHandlingMethod>DATABASE</blobHandlingMethod>
   <databaseAuditGetOldValueLobs v="false" />
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index b3b2b927cbb84804190b0474f677228f7671704d..9f832ead826c346818381f5a22e25aca20eacb78 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -1,3 +1,4 @@
+import("system.entities");
 import("system.vars");
 import("system.util");
 import("system.datetime");
@@ -24,6 +25,31 @@ import("Context_lib");
  */
 function ActivityUtils() {}
 
+
+/**
+ * Determines object types (=context ids) by loading them from the Context_entity.ActivityLinkable provider.
+  * 
+ * @return {Set}    <br/>Set that contains the context ids as string elements
+ * @example
+ * var linkableTypes = ActivityUtils.getLinkableObjectTypes();
+ * linkableTypes.has("Organisation");//true
+ * linkableTypes.has("Actvity");//false
+ */
+ActivityUtils.getLinkableObjectTypes = function()
+{
+    var entityConfig = entities.createConfigForLoadingRows().entity("Context_entity")
+        .fields(["UID"])//UID contains the technical name
+        .provider("ActivityLinkable");
+    var availableActivityObjectTypes = entities.getRows(entityConfig);
+    var res = new Set();
+    for (var i = 0, l = availableActivityObjectTypes.length; i < l; i++)
+    {
+        if (availableActivityObjectTypes[i]["UID"])
+            res.add(availableActivityObjectTypes[i]["UID"]);
+    }
+    return res;
+};
+
 /**
  * Create a new activity within the database-scope.
  * This funciton will insert a complete new activity into the database.
diff --git a/process/Address_lib/documentation.adoc b/process/Address_lib/documentation.adoc
index 427c00615788d2a093d580b9ce17380fdc933451..08a8841eb5207366ee9654a11101f18fddc76da9 100644
--- a/process/Address_lib/documentation.adoc
+++ b/process/Address_lib/documentation.adoc
@@ -8,7 +8,7 @@ This is a library for working with big amounts of the combination of the followi
 
 as well as related data like the standard communication data.
 
-This is mainly done via the `AddressObject` which uses database access for loading the data and 
+This is mainly done via the `AddrObject` which uses database access for loading the data and 
 placeholder-definitions for preparing and formatting the data.
 
 == FAQ
@@ -18,7 +18,7 @@ How to get the correct formatted standard address for a single contact, dependin
   This can be easily done via the following code-snippet where the variable `contactId` is 
   the `CONTACT.CONTACTID` of the address where you want to load the data: 
 
-  new AddressObject(contactId).getFormattedAddress();
+  new AddrObject(contactId).getFormattedAddress();
 
 
 How to get the correct formatted standard address for several contacts, depending on their country?::
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index d70501cef8425a1503b22892f6d8f34341c4c947..e67a69bc2dba3cec08b1a22095ef42899a33709f 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -25,7 +25,7 @@ function AttributeSearchNameCoder(){}
  * 
  * @param {String} pUid                 <p/> attribute uid of the attribute that has to be encoded
  * @param {String} pAttributeType       <p/> attribute type of the attribute that has to be encoded 
- *                                      <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ *                                      <br/> while you may able to specify any string, only values of AttributeTypes.*** are useful
  *                                      
  * @return {String}                     <p/> an encoded string of the given parametervalues 
  *                                      <br/> this is basically a serialized object which is base64 encoded
@@ -98,7 +98,7 @@ AttributeFilterExtensionMaker.getFilterFields = function(pObjectType)
         var attributeType = row["ATTRIBUTE_TYPE"];
         var contentType = AttributeTypeUtil.getContentType(attributeType);
         
-        if (attributeType.trim() == $AttributeTypes.VOID.toString())
+        if (attributeType.trim() == AttributeTypes.VOID())
         {
             contentType = "BOOLEAN";
         }
@@ -153,8 +153,8 @@ AttributeFilterExtensionMaker.getFilterValues = function(pFilter)
 
     var attributeId = name.id;
     var attrType = name.type;
-    if (attrType == $AttributeTypes.VOID.toString())
-        attrType = $AttributeTypes.BOOLEAN.toString();
+    if (attrType == AttributeTypes.VOID())
+        attrType = AttributeTypes.BOOLEAN();
     var res = AttributeUtil.getPossibleListValues(attributeId, attrType, true);
     if (res == null)
         res = [];
@@ -200,7 +200,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
     var attributeId = name.id;
     var attributeType = name.type;
     
-    if (attributeType == $AttributeTypes.VOID.toString() || (attributeType == $AttributeTypes.BOOLEAN.toString() && (pOperatorName == "IS NOT NULL" || pOperatorName == "IS NULL")))
+    if (attributeType == AttributeTypes.VOID() || (attributeType == AttributeTypes.BOOLEAN() && (pOperatorName == "IS NOT NULL" || pOperatorName == "IS NULL")))
     {
         resSql = newSelect("count(*)")
             .from("AB_ATTRIBUTERELATION")
@@ -219,7 +219,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
         var dbField = AttributeTypeUtil.getDatabaseField(name.type);
 
         var condition = pCondition;
-        if (attributeType == $AttributeTypes.BOOLEAN.toString())
+        if (attributeType == AttributeTypes.BOOLEAN())
             condition = newWhere(["AB_ATTRIBUTERELATION", dbField], SqlUtils.escapeVars(pRawValue), pOperatorName == "=" ? SqlBuilder.EQUAL() : SqlBuilder.NOT_EQUAL());
         else
         {
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index b7b8f699980ce3f83df7a4426019d916ab9c70fe..938efc90998d5f52bcbc92c00ff68697d17137d6 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,4 +1,4 @@
-import("system.logging");
+import("Util_lib");
 import("Employee_lib");
 import("KeywordData_lib");
 import("Context_lib");
@@ -72,7 +72,7 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
                         .from("AB_ATTRIBUTE")
                         .join("AB_ATTRIBUTEUSAGE", "AB_ATTRIBUTEID = AB_ATTRIBUTE_ID")
                         .where("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
-                        .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
+                        .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
                         .and("ATTRIBUTE_ACTIVE = 1");
 
     if (pAttributeCount)
@@ -96,7 +96,7 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
     }
 
     if (!pIncludeGroups)
-        attrSelect.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, SqlBuilder.NOT_EQUAL());
+        attrSelect.and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.GROUP(), SqlBuilder.NOT_EQUAL());
     
     var attributes = attrSelect.table();
     
@@ -110,7 +110,7 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
         }, parentIds);
         attributes = attributes.filter(function (attribute)
         {
-            return attribute[2].trim() != $AttributeTypes.GROUP || this[attribute[0]];
+            return attribute[2].trim() != AttributeTypes.GROUP() || this[attribute[0]];
         }, parentIds);
     }
     
@@ -149,12 +149,12 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
     var attributeId = pAttributeId;
     var attrType = pAttributeType.trim();
     var onlyActives = !pIncludeInactives;
-    if (attrType == $AttributeTypes.COMBO.toString())
+    if (attrType == AttributeTypes.COMBO())
     {
         var valuesSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME")
                                 .from("AB_ATTRIBUTE")
                                 .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
-                                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE);
+                                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE());
                                 
         if (onlyActives)
             valuesSelect.and("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1");
@@ -168,14 +168,14 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
         }
         return valueList;
     }
-    else if (attrType == $AttributeTypes.BOOLEAN.toString())
+    else if (attrType == AttributeTypes.BOOLEAN())
     {
         return [
             ["1", translate.text("Yes")],
             ["0", translate.text("No")]
             ];
     }
-    else if (attrType == $AttributeTypes.KEYWORD.toString())
+    else if (attrType == AttributeTypes.KEYWORD())
     {
         var attrKeyword = newSelect("DROPDOWNDEFINITION")
                                 .from("AB_ATTRIBUTE")
@@ -185,7 +185,7 @@ AttributeUtil.getPossibleListValues = function (pAttributeId, pAttributeType, pI
         var keywords = KeywordData.getSimpleData(attrKeyword, null, onlyActives);
         return keywords;
     }
-    else if (attrType == $AttributeTypes.OBJECTSELECTION)
+    else if (attrType == AttributeTypes.OBJECTSELECTION())
     {
         var [module, filter] = newSelect("DROPDOWNDEFINITION, DROPDOWNFILTER")
                                     .from("AB_ATTRIBUTE")
@@ -393,8 +393,8 @@ AttributeUtil.hasAttributes = function (pObjectType)
                 .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
                 .where("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
                 .and("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
-                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
-                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, SqlBuilder.NOT_EQUAL())
+                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
+                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.GROUP(), SqlBuilder.NOT_EQUAL())
                 .cell() != "0"; //TODO: is there a way exists could be used?
 }
 
@@ -462,7 +462,7 @@ AttributeRelationUtils.getAttributeSqlBuilder = function (pFields, pObjectRowId,
     return newSelect(pFields)
                 .from("AB_ATTRIBUTERELATION")
                 .join("AB_ATTRIBUTE", "AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
-                .leftJoin("AB_ATTRIBUTE COMBOVAL", $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID")
+                .leftJoin("AB_ATTRIBUTE COMBOVAL", AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID")
                 .whereIfSet("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId)
                 .andIfSet("AB_ATTRIBUTERELATION.OBJECT_TYPE", pObjectType);
 }
@@ -542,7 +542,7 @@ AttributeRelationUtils.selectAttributeValue = function (pAttributeId, pValueMap,
     var value = pValueMap[field];
     if(value == undefined)
         return "";
-    if (pGetViewValue && type[0] == $AttributeTypes.COMBO)
+    if (pGetViewValue && type[0] == AttributeTypes.COMBO())
     {
         value = newSelect("ATTRIBUTE_NAME")
                     .from("AB_ATTRIBUTE")
@@ -597,8 +597,8 @@ AttributeRelationUtils.presetMandatoryAttributes = function (pObjectType, pConsu
                                     .from("AB_ATTRIBUTEUSAGE")
                                     .join("AB_ATTRIBUTE", "AB_ATTRIBUTE_ID = AB_ATTRIBUTEID")
                                     .where("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
-                                    .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
-                                    .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, SqlBuilder.NOT_EQUAL())
+                                    .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
+                                    .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.GROUP(), SqlBuilder.NOT_EQUAL())
                                     .and("ATTRIBUTE_ACTIVE = 1")
                                     .and("MIN_COUNT > 0");
                                     
@@ -814,107 +814,129 @@ AttributeRelationUtils.countAttributeRelations = function (pRowId, pObjectType,
  * 
  * optional:
  * getViewValue = function that gets the display value for a given value
- * isGroup = if true, the attribute can have children
  * getDropDownDefinitions = function that returns an array of possible values
  *          for DROPDOWNDEFINITION
  * singleSelection = if true, the maximal usage count is always 1
  * 
  * The display name is controlled by the keyword 'AttributeType'
  */
-function $AttributeTypes () {}
-
-$AttributeTypes.TEXT = { 
-    toString : function () {return "TEXT";},
-    contentType : "TEXT", 
-    databaseField : "CHAR_VALUE"
-};
-$AttributeTypes.DATE = {
-    toString : function () {return "DATE";},
-    contentType : "DATE", 
-    databaseField : "DATE_VALUE",
-    getViewValue : function (pValue)
-        {
-            return datetime.toDate(pValue, translate.text("dd.MM.yyyy"));
-        }
-};
-$AttributeTypes.NUMBER = {
-    toString : function () {return  "NUMBER";},
-    contentType : "NUMBER", 
-    databaseField : "NUMBER_VALUE"
-};
-$AttributeTypes.BOOLEAN = {
-    toString : function () {return "BOOLEAN";},
-    contentType : "BOOLEAN", 
-    databaseField : "INT_VALUE",
-    singleSelection : true,
-    getViewValue : function (pValue)
+function AttributeTypes () {}
+
+AttributeTypes.TEXT = function () {return "TEXT";}
+AttributeTypes.DATE = function () {return "DATE";}
+AttributeTypes.NUMBER = function () {return "NUMBER";}
+AttributeTypes.BOOLEAN = function () {return "BOOLEAN";}
+AttributeTypes.COMBO = function () {return "COMBO";}
+AttributeTypes.COMBOVALUE = function () {return "COMBOVALUE";}
+AttributeTypes.GROUP = function () {return "GROUP";} 
+AttributeTypes.KEYWORD = function () {return "KEYWORD";}
+AttributeTypes.VOID = function () {return "VOID";}
+AttributeTypes.MEMO = function () {return "MEMO";}
+AttributeTypes.OBJECTSELECTION = function () {return "OBJECTSELECTION";}
+AttributeTypes.THEME = function () {return "THEME";}
+
+Object.assign(AttributeTypes.TEXT, {
+    toString: function () {return this();},
+    contentType: "TEXT",
+    databaseField: "CHAR_VALUE"
+});
+Object.assign(AttributeTypes.DATE, {
+    toString: function () {return this();},
+    contentType: "DATE", 
+    databaseField: "DATE_VALUE",
+    getViewValue: function (pValue)
+    {
+        return datetime.toDate(pValue, translate.text("dd.MM.yyyy"));
+    }
+});
+Object.assign(AttributeTypes.NUMBER, {
+    toString: function () {return this();},
+    contentType: "NUMBER", 
+    databaseField: "NUMBER_VALUE"
+});
+Object.assign(AttributeTypes.BOOLEAN, {
+    toString: function () {return this();},
+    contentType: "BOOLEAN", 
+    databaseField: "INT_VALUE",
+    singleSelection: true,
+    getViewValue: function (pValue)
         {
             return pValue == "1" ? translate.text("Yes") : translate.text("No");
         }
-};
-$AttributeTypes.COMBO = {
-    toString : function () {return "COMBO";},
-    contentType : "UNKNOWN",
-    databaseField : "ID_VALUE",
-    isGroup : true,
-    possibleChildren : ["COMBOVALUE"],
+});
+Object.assign(AttributeTypes.COMBO, {
+    toString: function () {return this();},
+    contentType: "UNKNOWN",
+    databaseField: "ID_VALUE",
+    possibleChildren: [AttributeTypes.COMBOVALUE()],
     //in most cases the view value of this attribute type is loaded via a direct sql join for less queries and better performance
-    getViewValue : function (pValue)
+    getViewValue: function (pValue)
         {
             var viewValue = newSelect("AB_ATTRIBUTE.ATTRIBUTE_NAME")
                 .from("AB_ATTRIBUTE")
                 .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", pValue)
-                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
+                .and("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE())
                 .cell();
             return viewValue ? translate.text(viewValue) : viewValue;
         }
-};
-$AttributeTypes.COMBOVALUE = {
-    toString : function () {return "COMBOVALUE";},
-    contentType : null, 
-    databaseField : null
-};
-$AttributeTypes.GROUP = {
-    toString : function () {return "GROUP";},
-    contentType : null, 
-    databaseField : null,
-    isGroup : true,
-    possibleChildren : ["GROUP", "TEXT", "NUMBER", "COMBO", "VOID", "THEME", "KEYWORD", "OBJECTSELECTION", "MEMO", "DATE", "BOOLEAN"]
-};
-$AttributeTypes.KEYWORD = {
-    toString : function () {return "KEYWORD";},
-    contentType : "UNKNOWN", 
-    databaseField : "ID_VALUE", 
-    getViewValue : function (pValue, pKeyword)
+});
+Object.assign(AttributeTypes.COMBOVALUE, {
+    toString: function () {return this();},
+    contentType: null, 
+    databaseField: null
+});
+Object.assign(AttributeTypes.GROUP, {
+    toString: function () {return this();},
+    contentType: null, 
+    databaseField: null,
+    possibleChildren: [
+        AttributeTypes.GROUP(), 
+        AttributeTypes.TEXT(), 
+        AttributeTypes.NUMBER(), 
+        AttributeTypes.COMBO(), 
+        AttributeTypes.VOID(), 
+        AttributeTypes.THEME(), 
+        AttributeTypes.KEYWORD(), 
+        AttributeTypes.OBJECTSELECTION(), 
+        AttributeTypes.MEMO(), 
+        AttributeTypes.DATE(), 
+        AttributeTypes.BOOLEAN()
+    ]
+});
+Object.assign(AttributeTypes.KEYWORD, {
+    toString: function () {return this();},
+    contentType: "UNKNOWN", 
+    databaseField: "ID_VALUE", 
+    getViewValue: function (pValue, pKeyword)
         {
             return KeywordUtils.getViewValue(pKeyword, pValue);
         },
-    getDropDownDefinitions : function ()
+    dropDownDefinitionTitle: "Keyword",
+    getDropDownDefinitions: function ()
         {
             return KeywordUtils.getContainerNames().map(function (e)
             {
                 return [e, e];//currently the first column is ID, second view value - which is the same because there is no ID for keyword-containers
             });
         }
-};
-$AttributeTypes.VOID = {
-    toString : function () {return "VOID";},
-    contentType : null,
-    databaseField : null,
-    isGroup : true,
-    possibleChildren : ["VOID"],
-    singleSelection : true
-};
-$AttributeTypes.MEMO = { 
-    toString : function () {return "MEMO";},
-    contentType : "LONG_TEXT", 
-    databaseField : "CHAR_VALUE"
-};
-$AttributeTypes.OBJECTSELECTION = {
-    toString : function () {return "OBJECTSELECTION";},
-    contentType : "UNKNOWN",
-    databaseField : "ID_VALUE",
-    getViewValue : function (pValue, pModule)
+});
+Object.assign(AttributeTypes.VOID, {
+    toString: function () {return this();},
+    contentType: null,
+    databaseField: null,
+    possibleChildren: [AttributeTypes.VOID()],
+    singleSelection: true
+});
+Object.assign(AttributeTypes.MEMO, {
+    toString: function () {return this();},
+    contentType: "LONG_TEXT", 
+    databaseField: "CHAR_VALUE"
+});
+Object.assign(AttributeTypes.OBJECTSELECTION, {
+    toString: function () {return this();},
+    contentType: "UNKNOWN",
+    databaseField: "ID_VALUE",
+    getViewValue: function (pValue, pModule)
         {
             if (pValue)
             {
@@ -931,52 +953,55 @@ $AttributeTypes.OBJECTSELECTION = {
             }
             return pValue;
         },
-    getDropDownDefinitions : function ()
+    dropDownDefinitionTitle: "Module",
+    getDropDownDefinitions: function ()
         {
             // TODO: use loadEntity from context_entity
             var dropDownList = [];
             project.getDataModels(project.DATAMODEL_KIND_ENTITY).forEach(
                 function (entity)
                 {
-                    if (entity[1] && $AttributeTypes.OBJECTSELECTION._selectableEntities[entity[0]])
+                    if (entity[1] && AttributeTypes.OBJECTSELECTION._selectableEntities.has(entity[0]))
                         dropDownList.push([entity[0], translate.text(entity[1])]);
                 }
             );
             return dropDownList;
         },
     /** @private */
-    _selectableEntities : {
-        "ObjectRelationType_entity" : true,
-        "DocumentTemplate_entity" : true,
-        "SupportTicket_entity" : true,
-        "Organisation_entity" : true,
-        "Salesproject_entity" : true,
-        "Productprice_entity" : true,
-        "SerialLetter_entity" : true,
-        "AnyContact_entity" : true,
-        "Salutation_entity" : true,
-        "Attribute_entity" : true,
-        "Activity_entity" : true,
-        "Contract_entity" : true,
-        "Campaign_entity" : true,
-        "BulkMail_entity" : true,
-        "Employee_entity" : true,
-        "Language_entity" : true,
-        "Product_entity" : true,
-        "Person_entity" : true,
-        "Offer_entity" : true,
-        "Order_entity" : true,
-        "Task_entity" : true,
-        "Role_entity" : true
-    }
-};
-$AttributeTypes.THEME = {
-    toString : function () {return "THEME";},
-    contentType : "LONG_TEXT",
-    databaseField : "CHAR_VALUE",
-    isGroup : true,
-    possibleChildren : ["THEME"]
-};
+    _selectableEntities: new Set([
+        "ObjectRelationType_entity",
+        "DocumentTemplate_entity",
+        "SupportTicket_entity",
+        "Organisation_entity",
+        "Salesproject_entity",
+        "Productprice_entity",
+        "SerialLetter_entity",
+        "AnyContact_entity",
+        "Salutation_entity",
+        "Attribute_entity",
+        "Activity_entity",
+        "Contract_entity",
+        "Campaign_entity",
+        "BulkMail_entity",
+        "Employee_entity",
+        "Language_entity",
+        "Product_entity",
+        "Person_entity",
+        "Offer_entity",
+        "Order_entity",
+        "Task_entity",
+        "Role_entity"
+    ])
+});
+Object.assign(AttributeTypes.THEME, {
+    toString: function () {return this();},
+    contentType: "LONG_TEXT",
+    databaseField: "CHAR_VALUE",
+    possibleChildren: [AttributeTypes.THEME()]
+});
+
+//reference for compatibility with old name
+var $AttributeTypes = AttributeTypes;
 
 function AttributeTypeUtil () {}
 
@@ -1005,7 +1030,7 @@ AttributeTypeUtil.getContentType = function (pAttributeType)
  */
 AttributeTypeUtil.isGroupType = function (pAttributeType)
 {
-    return AttributeTypeUtil._getProperty(pAttributeType, "isGroup", false);
+    return !Utils.isNullOrEmpty(AttributeTypeUtil.getPossibleChildren(pAttributeType));
 }
 
 /**
@@ -1056,6 +1081,21 @@ AttributeTypeUtil.isSingleSelection = function (pAttributeType)
     return AttributeTypeUtil._getProperty(pAttributeType, "singleSelection", false);
 }
 
+/**
+ * Returns the title of the "dropDownDefinition"
+ * 
+ * @param {String} pAttributeType               <p>
+ *                                              The attribute type (use the values<br>
+ *                                              of the AttributeTypes object, e. g.<br>
+ *                                              AttributeTypes.TEXT)<br>
+ * @return {String}                           <p>
+ *                                              .<br>
+ */
+AttributeTypeUtil.getDropDownDefinitionTitle = function (pAttributeType)
+{
+    return AttributeTypeUtil._getProperty(pAttributeType, "dropDownDefinitionTitle", "");
+}
+
 /**
  * Compare the given pAttributeType with the attribute type string
  * "OBJECTSELECTION".
@@ -1069,7 +1109,7 @@ AttributeTypeUtil.isSingleSelection = function (pAttributeType)
  */
 AttributeTypeUtil.useLookup = function (pAttributeType)
 {
-    return pAttributeType.trim() == $AttributeTypes.OBJECTSELECTION.toString();
+    return pAttributeType.trim() == AttributeTypes.OBJECTSELECTION();
 }
 
 /**
@@ -1085,7 +1125,7 @@ AttributeTypeUtil.useLookup = function (pAttributeType)
 AttributeTypeUtil.getGroupTypes = function (pChildType)
 {
     var groupTypes = [];
-    for (let type in $AttributeTypes)
+    for (let type in AttributeTypes)
     {
         if (AttributeTypeUtil.isGroupType(type) && (!pChildType || (!AttributeTypeUtil.getPossibleChildren(type) || AttributeTypeUtil.getPossibleChildren(type).indexOf(pChildType) !== -1)) )
             groupTypes.push(type);
@@ -1106,7 +1146,7 @@ AttributeTypeUtil.getGroupTypes = function (pChildType)
  * @return                                  <p>
  *                                          Returns the property or null, when pAttributeType<br>
  *                                          isn't filled or the given attribute type isn't in<br>
- *                                          $AttributeTypes. Otherwise the pDefaultValue,<br>
+ *                                          AttributeTypes. Otherwise the pDefaultValue,<br>
  *                                          will be returned, case if it isn't undefined or null.<br>
  */
 AttributeTypeUtil._getProperty = function (pAttributeType, pPropertyName, pDefaultValue)
@@ -1115,9 +1155,9 @@ AttributeTypeUtil._getProperty = function (pAttributeType, pPropertyName, pDefau
         return null;
     
     pAttributeType = pAttributeType.trim();
-    if (pAttributeType in $AttributeTypes)
-        if (pPropertyName in $AttributeTypes[pAttributeType])
-            return $AttributeTypes[pAttributeType][pPropertyName];
+    if (pAttributeType in AttributeTypes)
+        if (pPropertyName in AttributeTypes[pAttributeType])
+            return AttributeTypes[pAttributeType][pPropertyName];
         else
             return pDefaultValue === undefined ? null : pDefaultValue;
         
@@ -1141,8 +1181,8 @@ AttributeTypeUtil._getProperty = function (pAttributeType, pPropertyName, pDefau
  */
 AttributeTypeUtil.getAttributeViewValue = function (pAttributeType, pValue, pKeyword)
 {
-    if (pAttributeType in $AttributeTypes && $AttributeTypes[pAttributeType].getViewValue)
-        return $AttributeTypes[pAttributeType].getViewValue(pValue, pKeyword);
+    if (pAttributeType in AttributeTypes && AttributeTypes[pAttributeType].getViewValue)
+        return AttributeTypes[pAttributeType].getViewValue(pValue, pKeyword);
     return pValue;
 }
 
@@ -1153,9 +1193,9 @@ AttributeTypeUtil._initTypeColumnData = function ()
 {
     var columns = [];
     var typeColumnMap = {};
-    for (let type in $AttributeTypes)
+    for (let type in AttributeTypes)
     {
-        type = $AttributeTypes[type];
+        type = AttributeTypes[type];
         if (type.databaseField)
         {
             var typeKey = type.toString();
@@ -1237,7 +1277,7 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
                                     .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
                                     .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)])
                             .from("AB_ATTRIBUTE")
-                            .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
+                            .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
                             .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId)
                             .table();
 
@@ -1300,7 +1340,7 @@ AttributeUsageUtil.updateChildrenUsages = function (pAttributeId, pOldObjectType
     function _addUpdateIds (pAttributeId)
     {
         sqlSelect.clearWhere()
-                 .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
+                 .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
                  .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
 
         var attributes = sqlSelect.table();
@@ -1340,7 +1380,7 @@ AttributeUsageUtil.deleteChildrenUsages = function (pAttributeId, pObjectType)
     function _addDeleteIds (pAttributeId)
     {
         attributeSelect.clearWhere()
-                       .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, SqlBuilder.NOT_EQUAL())
+                       .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.COMBOVALUE(), SqlBuilder.NOT_EQUAL())
                        .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeId);
         var attributes = attributeSelect.table();
         
@@ -1571,7 +1611,7 @@ AttributeRelationQuery.prototype.getAttributes = function ()
         
         if (this._includeDisplayValue)
         {
-            if (row[0].trim() == $AttributeTypes.COMBO)
+            if (row[0].trim() == AttributeTypes.COMBO())
                 attrObj.displayValue = translate.text(row[3]);
             else
                 attrObj.displayValue = AttributeTypeUtil.getAttributeViewValue(row[0].trim(), attrObj.value, row[1]);
@@ -1624,7 +1664,8 @@ AttributeRelationQuery.prototype.getSingleAttributeValue = function ()
 AttributeRelationQuery.prototype.getAttributeCount = function ()
 {
     return parseInt(AttributeRelationUtils.getAttributeSqlBuilder("count(*)", this._rowId, this._objectType)
-        .andIfSet("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", this._attributeIds, SqlBuilder.IN())
+        .and(newWhereIfSet( "AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", this._attributeIds, SqlBuilder.IN())
+            .orIfSet("AB_ATTRIBUTERELATION.ID_VALUE", this._attributeIds, SqlBuilder.IN()))
         .cell() || 0);
 }
 
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 0715bd9e1ce5c6fcab1e43ae18fcbafd85e1572f..92940b61ef2b4badfb3a3188dd049ed3415ef80e 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
 import("system.translate");
 import("ActivityTask_lib");
 import("system.util");
@@ -154,15 +155,22 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
 /**
  * Opens a context to select a bulk mail to add recipients to.<br>
  * 
- * @param {String[]} pContactIds            <p>
- *                                          Recipients that should be added.<br>
+ * @param {String} pContext             the context of the contacts (Person or Organisation)
+ * @param {String[]} pContactIds        Recipients that should be added.<br>
+ * @param {String|Object} pFilter       the filter for the contacts that should be used if no contact is selected
  */
-BulkMailUtils.openAddRecipientView = function (pContactIds)
+BulkMailUtils.openAddRecipientView = function (pContext, pContactIds, pFilter)
 {
-    var params = {
-        "ContactIds_param" : pContactIds
-    };
-    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    if (!Utils.isString(pContactIds))
+        pContactIds = JSON.stringify(pContactIds);
+    if (!Utils.isString(pFilter))
+        pFilter = JSON.stringify(pFilter);
+    
+    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, {
+        "ObjectType_param": pContext,
+        "ContactIds_param": pContactIds,
+        "ContactFilter_param": pFilter
+    });
 }
 
 /**
@@ -195,25 +203,23 @@ BulkMailUtils.removeCommRestrictionRecipients = function (pBulkMailId)
  */
 BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds)
 {
-    var columns = [
-        "BULKMAILRECIPIENTID",
-        "BULKMAIL_ID",
-        "CONTACT_ID",
-        "STATUS",
-        "EMAIL_ADDRESS"
-    ];
-    
-    if(pContactIds.length > 0)
+    if (pContactIds.length > 0)
     {
         var contactData = newSelect(["CONTACTID", "(" + CommUtil.getStandardSubSqlMail(newWhere("COMMUNICATION.CONTACT_ID = CONTACTID")) + ")"])
             .from("CONTACT")
             .where("CONTACT.CONTACTID", pContactIds, SqlBuilder.IN())
             .table();
         
-        var inserts = contactData.map(function(pContact)
+        var sqlBuilder = new SqlBuilder();
+        
+        var inserts = contactData.map(function([contactId, standardMail])
         {
-			//TODO: get columntype for better performance outside loop
-            return ["BULKMAILRECIPIENT", columns, null, [util.getNewUUID(), pBulkMailId, pContact[0], $KeywordRegistry.bulkMailRecipientStatus$pending(), pContact[1]]];
+            return sqlBuilder.buildInsertStatement({
+                "BULKMAIL_ID": pBulkMailId,
+                "CONTACT_ID": contactId,
+                "STATUS": $KeywordRegistry.bulkMailRecipientStatus$pending(),
+                "EMAIL_ADDRESS": standardMail
+            }, "BULKMAILRECIPIENT", "BULKMAILRECIPIENTID");
         });
         
         db.inserts(inserts);
@@ -393,38 +399,6 @@ BulkMailUtils.copy = function(pBulkMailId)
     };
     neon.openContext("BulkMail", null, null, neon.OPERATINGSTATE_NEW, params);
 }
-/**
- * Adds contacts or organistaions to a bulk mail by contactIds.<br>
- * 
- * @param {String} pContactIds              <p>
- *                                      The contact ids as JSON array.<br>
- */
-BulkMailUtils.addParticipantsByRowIds = function(pContactIds)
-{
-    var params = {
-        "ContactIds_param" : pContactIds
-    };
-    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-}
-
-/**
- * Adds contacts or organistaions to a bulk mail by condition (filter).<br>
- * 
- * @param {String} pCondition           <p>
- *                                      Contact ids.
- * @param {String} pSourceTableName     <p>
- *                                      The source table.<br>
- */
-BulkMailUtils.addParticipantsByCondition = function(pCondition, pSourceTableName)
-{
-    var params = {
-        "ContactIds_param" : pCondition,
-        "comingFrom_param" : pSourceTableName}
-    neon.openContext("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-}
-
-
-
 
 function SerialLetterUtils () {}
 
@@ -452,18 +426,24 @@ SerialLetterUtils.addRecipients = function (pSerialLetterId, pContactIds)
 }
 
 /**
- * Opens a context to select a serial letter<br>
- * to add recipients to.<br>
+ * Opens a context to select a serial letter to add recipients to.<br>
  * 
- * @param {String[]} pContactIds            <p>
- *                                          Recipients that should be added.<br>
+ * @param {String} pContext             the context of the contacts (Person or Organisation)
+ * @param {String[]} pContactIds        Recipients that should be added.<br>
+ * @param {String|Object} pFilter       the filter for the contacts that should be used if no contact is selected
  */
-SerialLetterUtils.openAddRecipientView = function (pContactIds)
+SerialLetterUtils.openAddRecipientView = function (pContext, pContactIds, pFilter)
 {
-    var params = {
-        "ContactIds_param" : pContactIds
-    };
-    neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+    if (!Utils.isString(pContactIds))
+        pContactIds = JSON.stringify(pContactIds);
+    if (!Utils.isString(pFilter))
+        pFilter = JSON.stringify(pFilter);
+    
+    neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, {
+        "ObjectType_param": pContext,
+        "ContactIds_param": pContactIds,
+        "ContactFilter_param": pFilter
+    });
 }
 
 /**
@@ -613,4 +593,28 @@ SerialLetterUtils.addParticipantsByCondition = function(pCondition, pSourceTable
         "ContactIds_param" : pCondition,
         "comingFrom_param" : pSourceTableName}
     neon.openContext("SerialLetterAddRecipients", "SerialLetterAddRecipientsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
-}
\ No newline at end of file
+}
+
+/**
+ * Filters the given contactIds if they can be added as new recipients.
+ * Checks if a contact is already a recipient or if there is a advertising ban.
+ * 
+ * @param {String} pSerialLetterId id of the seroal letter the contacts should be added to
+ * @param {String[]} pContactIds contacts to filter
+ * @return {String[]} contacts that can be added as recipients
+ */
+SerialLetterUtils.filterNewRecipients = function (pSerialLetterId, pContactIds)
+{
+    return newSelect("CONTACTID")
+                .from("CONTACT")
+                .whereIfSet("CONTACT.CONTACTID", pContactIds, SqlBuilder.IN())
+                // only add contacts that aren't already recipients
+                .and(null, newSelect("LETTERRECIPIENTID")
+                                    .from("LETTERRECIPIENT")
+                                    .where("LETTERRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
+                                    .and("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
+                        , SqlBuilder.NOT_EXISTS())
+                // check if there's a commrestriction
+                .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail(), true))  
+                .arrayColumn();
+}
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 2791c6b51fac53391ecb97ae14276ac935bb7305..7c893948d7f1a576518e469721ae1dbec4a50ec2 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -203,13 +203,14 @@ CampaignUtils.getParticipantLogInsertColumnNames = function()
  */
 CampaignUtils.openSetCampaignStepViewByRowIds = function(pParticipantIds, pCampaignId, pCampaignStepId)
 {
-    var params = {};
-    params["campaignParticipantsRowIds_param"] = pParticipantIds;
-    params["currentCampaignId_param"] = pCampaignId;
-    params["currentCampaignStepId_param"] = pCampaignStepId;
-    params["isUpdate_param"] = true;
+    var params = {
+        "campaignParticipantsRowIds_param":pParticipantIds,
+        "currentCampaignId_param":pCampaignId,
+        "currentCampaignStepId_param":pCampaignStepId,
+        "isUpdate_param":true
+    };
     
-    neon.openContext("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
 }
 
 /**
@@ -231,7 +232,7 @@ CampaignUtils.openSetCampaignStepViewByCondition = function(pCondition, pCampaig
     params["currentCampaignStepId_param"] = pCampaignStepId;
     params["isUpdate_param"] = true;
     
-    neon.openContext("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+    neon.openContext("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
 }
 
 /**
@@ -503,14 +504,13 @@ CampaignUtils.GetParticipantsAlreadyAddedCountByCondition = function(pWhereCondi
 CampaignUtils.GetContactIdsNotInCampaignByRowIds = function(pCampaignId, pParticipantRowIds)
 {   
     return newSelect("CONTACT.CONTACTID")
-        .from("CONTACT")
-        .where("CONTACT.CONTACTID", pParticipantRowIds, SqlBuilder.IN())
-        .and("CONTACT.CONTACTID", 
-            newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
-            .from("CAMPAIGNPARTICIPANT")
-            .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId)
-            , SqlBuilder.NOT_IN())
-        .arrayColumn();
+                .from("CONTACT")
+                .where("CONTACT.CONTACTID", pParticipantRowIds, SqlBuilder.IN())
+                .and("CONTACT.CONTACTID", 
+                    newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
+                        .from("CAMPAIGNPARTICIPANT")
+                        .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId), SqlBuilder.NOT_IN())
+                .arrayColumn();
 }
 
 /**
@@ -520,32 +520,37 @@ CampaignUtils.GetContactIdsNotInCampaignByRowIds = function(pCampaignId, pPartic
  * @param {String} pCampaignId                      <p>
  *                                                  The id of the campaign.<br>
  * @param {String} pCondition (optional)            <p>
- *                                                  An condition which could used to<br>
- *                                                  limit the search result.<br>
- * @param {Boolean} pRightJoinContacts              <p>
- *                                                  Case if its true, a prefix will used<br>
- *                                                  to do a right join.<br>
+ *                                                  An condition which is used to limit the search contact results.<br>
+  * @param {String} [pOrigin=Organisation]          <br/>
+ *                                                  id from which context we are coming from, e.g. "Person"
  * @return {String[]}                               <p>
  *                                                  The contact ids they arent in the campaign.<br>                                                                                                                                                    
  */
-CampaignUtils.GetContactIdsNotInCampaignByCondition = function(pCampaignId, pCondition, pRightJoinContacts)
+CampaignUtils.GetContactIdsNotInCampaignByCondition = function(pCampaignId, pCondition, pOrigin)
 {
-    let query = newSelect("CONTACT.CONTACTID").from("PERSON");
-    
-    if (pRightJoinContacts == "true")
-        query.rightJoin("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID");
-    else
-        query.join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID");
+    var origin = pOrigin || "Organisation";
+    //subselect for excluding entries that are already in the campaign
+    var subselect = newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
+        .from("CAMPAIGNPARTICIPANT")
+        .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId);
     
+    var query = newSelect("CONTACT.CONTACTID")
+                    .from("CONTACT");
+
+    if (origin == "Person")
+       query.leftJoin("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID");
+
     query.join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
         .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
-        .where("CONTACT.CONTACTID", 
-            newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
-            .from("CAMPAIGNPARTICIPANT")
-            .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", pCampaignId)
+        .where("CONTACT.CONTACTID",  
+            subselect
             , SqlBuilder.NOT_IN()
         );
-    
+            
+     if (origin == "Organisation")
+         query.and("CONTACT.PERSON_ID is null");
+
+    //pCondition is always a contact related condition string and not a campaignparticipant related condition
     if(pCondition != "")
         query.and(pCondition);
 
@@ -561,14 +566,11 @@ CampaignUtils.GetContactIdsNotInCampaignByCondition = function(pCampaignId, pCon
  * @param {String} pCondition                       <p>
  *                                                  The condition which shall be used, to<br>
  *                                                  limit the search result.<br>
- * @param {Boolean} [pRightJoinContacts=false]      <p>
- *                                                  Currently not used.<br>
- *                                                  <p>
  * @return {String[]}                               <p>
  *                                                  The contact ids which are in the given<br>
  *                                                  campaign.<br>                                                                                                  
  */
-CampaignUtils.GetContactIdsInCampaignByCondition = function(pCampaignId, pCondition, pRightJoinContacts)
+CampaignUtils.GetContactIdsInCampaignByCondition = function(pCampaignId, pCondition)
 {
     let query = newSelect("CONTACT.CONTACTID").from("CONTACT");
     
@@ -649,7 +651,7 @@ CampaignUtils.copyCampaignSteps = function(pSourceCampaignId, pTargetCampaignId)
 {
     var InputMapping = {
         "CAMPAIGNSTEP": {
-            condition: newWhereIfSet("CAMPAIGN.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString(SqlBuilder.NORESULT_CONDITION(), true),
+            condition: newWhereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", pSourceCampaignId).orderBy("SORTING").toString(SqlBuilder.NORESULT_CONDITION(), true),
             ValueMapping: {
                 "CAMPAIGN_ID" : pTargetCampaignId
             }
diff --git a/process/ClassificationFilter_lib/process.js b/process/ClassificationFilter_lib/process.js
index ed71bb867c3a4386c81698a739ca1b7fba9442af..e2200e6e6e8ad55b95fa5fbfdf8cf38c71884677 100644
--- a/process/ClassificationFilter_lib/process.js
+++ b/process/ClassificationFilter_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("Context_lib");
 import("Classification_lib");
 import("Entity_lib");
@@ -21,7 +20,7 @@ function ClassificationTypeFilterUtils() {}
 /**
  * fetches classificationtypes and transforms them into filter fields
  * 
- * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ * @param {String} pObjectType       <p/> contextId of the context whoes classification types are used for providing the filter fields
  *                                      
  * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
  *                                   <br/> The object within the array contains the following properties:
@@ -151,7 +150,7 @@ ClassificationTypeFilterUtils.getTranslationSql = function()
 
 /**
  * Procides static methods for en- or decoding classification group filter names
- * AttributeFilter names are shared over several processes and contain therefore various information
+ * ClassifcationGroupFilter names are shared over several processes and contain therefore various information
  * The infomration needs to be encoded to be able to transfer it over the different processes
  * 
  * @class
@@ -162,9 +161,10 @@ function ClassificationGroupFilterNameCoder(){}
 /**
  * encodes several parameters into one string that can be used as classification group filter-name
  * 
- * @param {String} pUid                 <p/> attribute uid of the attribute that has to be encoded
- * @param {String} pAttributeType       <p/> attribute type of the attribute that has to be encoded 
- *                                      <br/> while you may able to specify any string, only values of $AttributeTypes.*** are useful
+ * @param {String} pClassificationGroupId           <p/> uid-value of a classification group
+ * @param {String} pRepresentingSqlExpression       <p/> sql expressions that represents one classification group result, for example an sql 
+ *                                                  expression that returns the Value "B" for the classificationvalue "CBA" when the fielter field 
+ *                                                  for the second level classification group is generated
  *                                      
  * @return {String}                     <p/> an encoded string of the given parametervalues 
  *                                      <br/> this is basically a serialized object which is base64 encoded
@@ -177,17 +177,18 @@ ClassificationGroupFilterNameCoder.encode = function (pClassificationGroupId, pR
         representingSqlExpression: pRepresentingSqlExpression
     };
     res = JSON.stringify(res);
-    res = util.encodeBase64String(res);
+    res = util.encodeBase64String(res);//encode base64 to ensure that there a no problematic characters in the filterfield name
     return res;
 };
 
 /**
- * decodes a string that was encoded with AttributeSearchNameCoder.encode
+ * decodes a string that was encoded with ClassificationGroupFilterNameCoder.encode
  * 
  * 
  * @param {String} pEncodedString       <p/> string that shall be decoded; the origin of the name has to be a filter-object
  *                                      
- * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with AttributeSearchNameCoder.encode
+ * @return {Object}                     <p/> an object that contains all keys and values that have been encoded with 
+ *                                      ClassificationGroupFilterNameCoder.encode
  * @static 
  */
 ClassificationGroupFilterNameCoder.decode = function (pEncodedString)
@@ -210,7 +211,7 @@ function ClassificationGroupFilterUtils() {}
 /**
  * fetches classificationgroups and transforms them into filter fields
  * 
- * @param {String} pObjectType       <p/> contextId of the context whoes attributes are used for providing the filter fields
+ * @param {String} pObjectType       <p/> contextId of the context whoes classification groups are used for providing the filter fields
  *                                      
  * @return {String}                  <p/> field-definitions (array of objects) that are ready to use for a filterExtensionSet in a stringified form
  *                                   <br/> The object within the array contains the following properties:
@@ -233,7 +234,6 @@ ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
         .provider("SpecificObjectTypeGroups")
         .addParameter("ObjectType_param", pObjectType);
     var classificationGroups = entities.getRows(config);
-    logging.log("classificationGroups>>" + JSON.stringify(classificationGroups));
     classificationGroups = ArrayUtils.sortArrayOfObjects(classificationGroups, "#CONTENTTITLE", true, false);
 
     classificationGroups.forEach(function(classificationGroup, idx){
@@ -241,7 +241,7 @@ ClassificationGroupFilterUtils.getFilterFields = function(pObjectType)
         var classificationGroupTitle = classificationGroup["#CONTENTTITLE"];
         
         var representingSqlExpression = sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1);
-        var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, sqlHelper.substring("CLASSIFICATIONVALUE", idx+1, 1));
+        var name = ClassificationGroupFilterNameCoder.encode(classificationGroupId, representingSqlExpression);
         res.push({
             name: name,
             title: classificationGroupTitle,
@@ -300,7 +300,11 @@ ClassificationGroupFilterUtils.makeFilterValues = function()
 /**
  * Builds a Sql-condition that may be used in a filter extension set and allows to filter for classificationtypes within a db-table
  * 
+ * @param {String} pObjectType          <p/> contextId of the objects thats records 
+ * @param {String} pFilterName          <p/> name of the filter that was prior encoded and contains various information
  * @param {String} pCondition           <p/> a SQL-condition like it is given in the "$local.condition"-variable in filter extension sets
+ * @param {String} pRawValue            <p/> the raw input value that the user has entered for a filter operation
+ * @param {String} pOperatorName        <p/> the operator of the condition (equals, smaller, greater, etc.) as a resolved name; e.g. "IS NOT NULL"
  * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
  * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
  * @param {String} pColumnPlaceholder   <p/> name of the placeholder where the columnname should be like it is given in the 
@@ -340,4 +344,80 @@ ClassificationGroupFilterUtils.makeFilterConditionSql = function()
         uidInfo.table, uidInfo.column, columnPlaceholder);
     
     return res;
+};
+
+/**
+ * Builds a group-by-sql-statement for a classification group filter extension set. This allows to group for classificationgroups within a db-table.<br/>
+ * Use the stringified result of this in groupQueryProcess (see the example). <br/>
+ * Note that in some cases you need to write your own process (for example: Organisations, since there is the special case that you need the 
+ * ORGANISATION and CONTACT table). This function is useful for the default-cases.
+ *
+* @return {SqlBuilder}     <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a 
+ *                              filterExtenionSet
+ *
+ * @see ClassificationGroupFilterUtils.getDefaultGroupQuery for more details
+ * @static 
+ * @example
+ * import("ClassificationFilter_lib");
+ * import("system.result");
+ * 
+ * var res = ClassificationGroupFilterUtils.makeDefaultGroupQuery().toString();
+ * result.string(res);
+ * 
+ */
+ClassificationGroupFilterUtils.makeDefaultGroupQuery = function()
+{
+    var isCount = vars.get("$local.count");             // TRUE if the count of the records is needed
+    var columns = vars.get("$local.columnlist");        // The column, expected from the querry, see the filterFieldsProcess
+    var condition = vars.get("$local.condition");       // The Condition that's beeing used, includes the grouphirachy
+    var groupedColumns = vars.get("$local.groupedlist") // The coloumns, used for grouping
+    var order = vars.get("$local.order");               // The order of the result
+    var name = vars.get("$local.name");
+    var uidColumn = vars.get("$sys.uidcolumn");
+    uidColumn = EntityUtils.parseUidColumn(uidColumn);
+    var table = uidColumn.table;
+    var column = uidColumn.column;
+    var context = ContextUtils.getCurrentContextId();
+    return ClassificationGroupFilterUtils.getDefaultGroupQuery(table, column, context, isCount, columns, condition, groupedColumns, order, name);
+};
+
+/**
+ * returns a group-by-sql-statement depending on the given params for a classification group filter extension set
+ * This allows to group for classificationgroups within a db-table
+ * 
+ * @param {String} pIdTableName         <p/> name of the db-table where the data shall be filtered
+ * @param {String} pIdColumnName        <p/> name of the primarykey-column of the table that was given via pIdTablename
+ * @param {String} pObjectType          <p/> contextId of the objects thats records 
+ * @param {Boolean} pIsCount            <p/> true, if the count of the records is requested
+ * @param {Array} pColumns              <p/> an array that contains all the columns that should be returned by the statement
+ * @param {String} pCondition           <p/> a SQL-condition that's beeing used for filtering the records, includes the group hirachy
+ * @param {Array} pGroupedColumns       <p/> an array that contains all the grouping columns (these are specified in the filterValuesProcess)
+ *                                           that should be returned by the statement
+ * @param {String} pOrder               <p/> the order-by clause definition for the statement that is requested
+ * @param {String} pName                <p/> name of the group field (this is the name as specified in the filterValuesProcess)
+ *
+ * @return {SqlBuilder}     <p/>Statement as SqlBuilder-object that respresents the query that can be passed to the groupQueryProcess of a 
+ *                              filterExtenionSet
+ * @static 
+ */
+ClassificationGroupFilterUtils.getDefaultGroupQuery = function(pIdTableName, pIdColumnName, pObjectType, pIsCount, pColumns, pCondition
+    , pGroupedColumns, pOrder, pName)
+{
+    var stmt = newSelect(pIsCount ? pGroupedColumns : pColumns)
+                .from(pIdTableName)
+                .leftJoin("CLASSIFICATIONSTORAGE", newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID = " + pIdTableName + "." + pIdColumnName)
+                .and("CLASSIFICATIONSTORAGE.OBJECT_TYPE", pObjectType));
+
+    if (pCondition)
+    {
+        var condition = pCondition.trim();
+        if (condition)
+            stmt.where(condition);
+    }
+    
+    if (pOrder)
+        stmt.orderBy(pOrder);
+
+    stmt.groupBy(pGroupedColumns);
+    return stmt;
 };
\ No newline at end of file
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index baa8bf080832abad6dba02de9b24c8675fcaa059..756e30fa5384e32bccb6c7e32ebe001c6987c9eb 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -350,10 +350,8 @@ ClassificationUtils.getGradingFromObject = function(pGradingObject, pGroupId, pS
  * Inserts a empty classification data set into Classificationstorage, since every dataset of a classifiable module has to have an entry 
  * because the updateClassifications_serverProcess is only updating instead of inserting.<br>
  * 
- * @param {String or Array} pUid                          <p>
- *                                                          The unique uid('s) of the inserted record
- * @param {String} pObjectType                            <p>
- *                                                          The object type
+ * @param {String|Array} pUids         <p/>The unique uid('s) of the inserted record, string for one element, array for several elements
+ * @param {String} pObjectType         <p>contextId for the passed uids that shall be initialized
  */
 ClassificationUtils.insertEmptyClassification = function(pUids, pObjectType)
 {
@@ -371,7 +369,7 @@ ClassificationUtils.insertEmptyClassification = function(pUids, pObjectType)
             "OBJECT_ROWID",
             "OBJECT_TYPE"
             ];
-    var types = db.getColumnTypes("CLASSIFICATIONSTORAGE", columns);
+    var types = db.getColumnTypes("CLASSIFICATIONSTORAGE", columns);//load once for better performance
     var inserts = [];
     var values;
     for (var i = 0; i < pUids.length; i++) 
@@ -442,6 +440,18 @@ ClassificationUtils.decode = function (pEncodedString)
     return res
 };
 
+/**
+ * gets the translated Info text for the ClassificationtypePreview
+ *  
+ * @return {String}                     <p/> the translated InfoText
+ * @static 
+ */
+ClassificationUtils.getTranslatedInfo = function ()
+{
+return translate.text("Keep in Mind that changes to the Value with the greatest score directly affect the Classification Gradings of the Classification!");
+};
+
+
 /*this is right now (2020-08-15) the only way to get something like a constant with 
  - a prober name
  - autocomplete support within the ADITO Designer
@@ -455,4 +465,4 @@ $ClassificationRecordCategories.CLASSIFICATION_GROUP_EXISTS =            functio
 $ClassificationRecordCategories.CLASSIFICATION_GROUP_DOESNT_EXIST =      function(){return "ClassificationGroupDoesntExist"};
 
 function $ClassificationPlaceholder(){}
-$ClassificationPlaceholder.TOPSECRETPLACEHOLDER =                       function(){return "T0PS3CR3TPL4CEH0LD3R"};
\ No newline at end of file
+$ClassificationPlaceholder.TOPSECRETPLACEHOLDER =                        function(){return "T0PS3CR3TPL4CEH0LD3R"};
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 6db83d4d02c819c68bfc22f29827ae9f2b0a670c..627ec11b149a9b0ef93163901dda95b23f7f98b9 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -67,12 +67,18 @@ function ContactUtils() {}
  * does not validate if pRelationIdField exists or is a valid or harmful value
  * 
  * @param {String} pContactIdField fieldname for the CONTACTID-condition as TABLEALIAS.COLUMNALIAS; e.g. TASK.EDITOR_CONTACT_ID
+ * @param {Boolean} [pIncludeOrganisation=true] false if the organisation shall not be included in the result string
  * @return {String} a subsql (without bracets) that can be played within an SQL
  */
-ContactUtils.getResolvingDisplaySubSql = function(pContactIdField)
+ContactUtils.getResolvingDisplaySubSql = function(pContactIdField, pIncludeOrganisation)
 {
     var contact = Contact.createWithColumnPreset();
-    var renderer = new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.IncludeOrganisation);
+    var rendererOptions;
+    if (pIncludeOrganisation === false)
+        rendererOptions = ContactTitleRenderer.OPTIONS.NoOption;
+    else
+        rendererOptions = ContactTitleRenderer.OPTIONS.IncludeOrganisation;
+    var renderer = new ContactTitleRenderer(contact, rendererOptions);
     var selectExpression = renderer.asSql();
 
     //TODO: verify if there is a better solution for the usage of this as a displayValueExpression --> automatic use of #TITLE | waiting vor implementation
@@ -342,10 +348,11 @@ ContactUtils.getOrgContactId = function(pOrgId)
  * get the name of the person or organisation
  * 
  * @param {String} pContactId the contact id where pers-name or orgname shall be loaded
+ * @param {Boolean} [pIncludeOrganisation=true] false if the organisation shall not be included in the result string
  * 
  * @return {String} the name or ""
  */
-ContactUtils.getFullTitleByContactId = function(pContactId)
+ContactUtils.getFullTitleByContactId = function(pContactId, pIncludeOrganisation)
 {
     var data = newSelect("ORGANISATION.NAME, PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME")
         .from("CONTACT")
@@ -358,7 +365,12 @@ ContactUtils.getFullTitleByContactId = function(pContactId)
         return "";
     var contact = new Contact();
     [contact.organisationName, contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname] = data;
-    var renderer = new ContactTitleRenderer(contact);
+    var rendererOptions;
+    if (pIncludeOrganisation === false)
+        rendererOptions = ContactTitleRenderer.OPTIONS.NoOption;
+    else
+        rendererOptions = ContactTitleRenderer.OPTIONS.IncludeOrganisation;
+    var renderer = new ContactTitleRenderer(contact, rendererOptions);
     return renderer.asString();
 }
 
@@ -367,10 +379,11 @@ ContactUtils.getFullTitleByContactId = function(pContactId)
  * do not use this for a mass of data (e.g. in a loop) since this will be slow due to select-time
  * 
  * @param {String} pPersonId the id of the person where the data shall be loaded
+ * @param {Boolean} [pIncludeOrganisation=true] false if the organisation shall not be included in the result string
  * 
  * @return {String} the name or ""
  */
-ContactUtils.getTitleByPersonId = function(pPersonId)
+ContactUtils.getTitleByPersonId = function(pPersonId, pIncludeOrganisation)
 {
     var data = newSelect("PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME")
         .from("PERSON")
@@ -381,7 +394,12 @@ ContactUtils.getTitleByPersonId = function(pPersonId)
         return "";
     var contact = new Contact();
     [contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname] = data;
-    var renderer = new ContactTitleRenderer(contact);
+    var rendererOptions;
+    if (pIncludeOrganisation === false)
+        rendererOptions = ContactTitleRenderer.OPTIONS.NoOption;
+    else
+        rendererOptions = ContactTitleRenderer.OPTIONS.IncludeOrganisation;
+    var renderer = new ContactTitleRenderer(contact, rendererOptions);
     return renderer.asString();
 }
 
@@ -644,6 +662,7 @@ function ContactTitleRenderer(pContact, pOptions)
         var res = maskingUtil.concat([this.contact.salutation, this.contact.title, this.contact.firstname, this.contact.middlename, this.contact.lastname].filter(function (e){
             return e != "";
         }), " ");
+        //binary AND check for possibility to check serveral options
         if (this._options & ContactTitleRenderer.OPTIONS.IncludeOrganisation && this.contact.organisationName)
             res = maskingUtil.concat([res, this.contact.organisationName], " | ");
         return res;
@@ -652,7 +671,7 @@ function ContactTitleRenderer(pContact, pOptions)
     //function that renders the contact into a text  (e.g. for a displayValue)
     this._asStringFn = function (){
         var res = StringUtils.concat(" ", [this.contact.salutation, this.contact.title, this.contact.firstname, this.contact.middlename, this.contact.lastname]);
-
+        //binary AND check for possibility to check serveral options
         if (this._options & ContactTitleRenderer.OPTIONS.IncludeOrganisation && this.contact.organisationName)
             res = StringUtils.concat(" | ", [res, this.contact.organisationName]);
         return res;
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 2c8d2229d6ed3b2beba6e7db64b2d2d48c4eea31..f65180f1d1dc110334162d896727449ea4a30ede 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -147,6 +147,8 @@ ContextUtils.getContextConsumer = function(pContextId)
             return "Leadimport";
         case ContextUtils.getContextName("Task"):
             return "Tasks";
+        case ContextUtils.getContextName("SupportTicket"):
+            return "SupportTickets";
         case ContextUtils.getContextName("Activity"):
             return "Activities";
         default:
@@ -580,9 +582,9 @@ ContextUtils.getSelectMap  = function()
                         .setActiveStates([$KeywordRegistry.campaignState$planning(), $KeywordRegistry.campaignState$approved()])
             ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
             ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT")
-                        .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID")
+                        .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID left join TASKLINK on TASKLINK.TASK_ID = TASK.TASKID")
                         .setCondition(newWhere("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket()))
-                        .setContactIdField("TASK.REQUESTOR_CONTACT_ID")
+                        .setContactIdField("TASKLINK.OBJECT_ROWID")
                         .setStateField("TASK.STATUS")
                         .setActiveStates([
                             $KeywordRegistry.taskStatus$new(),
@@ -660,7 +662,7 @@ ContextUtils.getContactId = function(pContextId, pRowId)
  * nur 360
  * 
  */
-ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy)
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy, pUidsForFiltering)
 {
     var selectMap = ContextUtils.getSelectMap();
     var ownContextSelector = selectMap[pContextId];
@@ -687,7 +689,8 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
 
     var contextDataSelect = newSelect( columns.join(", ") )
                                 .from(ownContextSelector.getFullFromClause())
-                                .where(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId, SqlBuilder.IN());
+                                .where(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId, SqlBuilder.IN())
+                                .andIfSet(ownContextSelector.getFullIdField(), pUidsForFiltering, SqlBuilder.IN());
     
     if (pActive != undefined)
     {
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 3ed75b17066a1758095953c9c200d6a584e2ae58..da986784dd28531ee4e18bfb071b17937fc31e4f 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -564,7 +564,7 @@ DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLoc
 {
     neon.openContext("DSGVOReport", "DSGVOReport_view", [], neon.OPERATINGSTATE_VIEW, {
         "param.ReportName_param": pReportName,
-        "param.ContactID_param": pContactId,
+        "param.ContactId_param": pContactId,
         "param.DSGVOInfo_param": JSON.stringify(pDSGVOInfo)
     });
 }
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 55607d8232273c52ebfbf13251514312e939d79c..7e057f268d3f41e78fb61588c65560fabaa9dac1 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -13,6 +13,8 @@ import("system.db");
 import("system.entities");
 import("Sql_lib");
 import("system.indexsearch");
+import("Communication_lib");
+import("Attribute_lib");
 
 /**
  * Methods for duplicate scanning.
@@ -48,22 +50,17 @@ DuplicateScannerUtils.loadFilters = function(pFilterName, pTargetEntity)
  *
  * @param {String} pDuplicateId Id of the duplicate to delete
  */
-DuplicateScannerUtils.DeleteCachedDuplicate = function(pDuplicateId)
+DuplicateScannerUtils.deleteCachedDuplicate = function(pDuplicateId)
 {
-
-
-    var query = newSelect("count(ID), CLUSTERID")
+    var [countDuplicatesInClusterWithoutParameterId, clusterId] = newSelect("count(ID), CLUSTERID")
                     .from("DUPLICATECLUSTERS")
                     .where("DUPLICATECLUSTERS.CLUSTERID", newSelect("CLUSTERID")
                                                             .from("DUPLICATECLUSTERS")
                                                             .where("DUPLICATECLUSTERS.DUPLICATEID", pDuplicateId).build(),
                                                         SqlBuilder.IN())
                     .and("DUPLICATECLUSTERS.DUPLICATEID", pDuplicateId, SqlBuilder.NOT_EQUAL())
-                    .groupBy("CLUSTERID");
-
-    var countAndClusterId = query.arrayRow();
-    let countDuplicatesInClusterWithoutParameterId = countAndClusterId[0];
-    let clusterId = countAndClusterId[1];
+                    .groupBy("CLUSTERID")
+                    .arrayRow();
 
     //If only one duplicate would be remaining,
     //the whole cluster has to be deleted because there are no more duplicates.
@@ -71,19 +68,15 @@ DuplicateScannerUtils.DeleteCachedDuplicate = function(pDuplicateId)
     //therefore check for smaller/equals 1
     if(countDuplicatesInClusterWithoutParameterId <= 1)
     {
-        let deleteStatements = [];
-        deleteStatements.push(["DUPLICATECLUSTERS", newWhere("DUPLICATECLUSTERS.CLUSTERID", clusterId).build()]);
-        deleteStatements.push(["UNRELATEDDUPLICATES", newWhere("UNRELATEDDUPLICATES.CLUSTERID", clusterId).build()]);
-
-        db.deletes(deleteStatements);
+        newWhere("DUPLICATECLUSTERS.CLUSTERID", clusterId).deleteData();
+        newWhere("UNRELATEDDUPLICATES.CLUSTERID", clusterId).deleteData();
     }
     else
     {
-        newWhereIfSet("DUPLICATECLUSTERS.DUPLICATEID", pDuplicateId)
-            .deleteData(true, "DUPLICATECLUSTERS");
+        newWhereIfSet("DUPLICATECLUSTERS.DUPLICATEID", pDuplicateId).deleteData();
 
         //Delete all records where this duplicateId is mentioned
-        DuplicateScannerUtils.DeleteAllUnrelatedDuplicateRelations(pDuplicateId);
+        DuplicateScannerUtils.deleteAllUnrelatedDuplicateRelations(pDuplicateId);
     }
 }
 
@@ -94,10 +87,9 @@ DuplicateScannerUtils.DeleteCachedDuplicate = function(pDuplicateId)
  * @param {String} pTargetEntity Entity which has been configured
  * @return Count of deleted rows
  */
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity = function(pTargetEntity)
+DuplicateScannerUtils.deleteClustersByTargetEntity = function(pTargetEntity)
 {
-    return newWhereIfSet("DUPLICATECLUSTERS.TARGET_ENTITY", pTargetEntity)
-                .deleteData(true, "DUPLICATECLUSTERS");
+    return newWhereIfSet("DUPLICATECLUSTERS.TARGET_ENTITY", pTargetEntity).deleteData();
 }
 
 /*
@@ -109,34 +101,25 @@ DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity = function(pTargetEn
  *
  * @param {String} pTargetEntity Name of Entity whose duplicates should be updated
  */
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations = function(pTargetEntity)
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations = function(pTargetEntity)
 {
     /*
      * Update all records with the current valid clusterId where the same duplicateId combination exists
      */
-    let INDEX_NEW_CLUSTERID = 0;
-    let INDEX_OLD_CLUSTERID = 1;
-
-    let query = newSelect("dc1.CLUSTERID, ud.CLUSTERID")
+    let clusterIdChanges = newSelect("dc1.CLUSTERID, ud.CLUSTERID")
                     .from("UNRELATEDDUPLICATES", "ud")
                     .join("DUPLICATECLUSTERS", "dc1.DUPLICATEID = ud.SOURCEDUPLICATEID", "dc1")
                     .join("DUPLICATECLUSTERS", "dc2.DUPLICATEID = ud.UNRELATEDDUPLICATEID", "dc2")
-                    .where(["DUPLICATECLUSTERS", "TARGET_ENTITY", "dc1"], pTargetEntity);
-
-    let newIdOldIdRay = query.table();
-    let updateStatements = [];
+                    .where(["DUPLICATECLUSTERS", "TARGET_ENTITY", "dc1"], pTargetEntity)
+                    .table();
 
-    //Build update statements to set new clusterIds
-    for (let i = 0; i < newIdOldIdRay.length; i++)
+    let updateStatements = clusterIdChanges.map(function ([newClusterId, oldClusterId])
     {
-        let newClusterId = newIdOldIdRay[i][INDEX_NEW_CLUSTERID];
-        let oldClusterId = newIdOldIdRay[i][INDEX_OLD_CLUSTERID];
-        let updateColumns = ["CLUSTERID"];
-
-        let updateStatement = ["UNRELATEDDUPLICATES", updateColumns, null, [newClusterId], newWhere("UNRELATEDDUPLICATES.CLUSTERID", oldClusterId).build()];
-
-        updateStatements.push(updateStatement);
-    }
+        return newWhere("UNRELATEDDUPLICATES.CLUSTERID", oldClusterId).buildUpdateStatement({
+            "CLUSTERID": newClusterId
+        }, "UNRELATEDDUPLICATES");
+    });
+    
     db.updates(updateStatements);
 
     /*
@@ -144,26 +127,26 @@ DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations = function(pTargetEntit
      * All records with a nonexistend clusterid can now be deleted because they haven't been detected as a duplicate any more.
      */
     newWhere("UNRELATEDDUPLICATES.CLUSTERID", newSelect("dc1.CLUSTERID").from("DUPLICATECLUSTERS", "dc1"), SqlBuilder.NOT_IN())
-        .deleteData(true, "UNRELATEDDUPLICATES");
+        .deleteData();
 }
 
 /*
  * Creates a relation between two duplicates which means they are unrelated.
  * They will not appear in each others duplicate tab any more.
- * To remove this relation use DuplicateScannerUtils.DeleteUnrelatedDuplicateRelation
+ * To remove this relation use DuplicateScannerUtils.deleteUnrelatedDuplicateRelation
  *
  * @param {String} pSourceContactId Id of first duplicate
  * @param {String} pUnrelatedContactId Id of second duplicate
  * @param {String} pClusterId Id of the cluster in which the duplicates are aggregated
  * @returns {String} Number of Records inserted
  */
-DuplicateScannerUtils.CreateUnrelatedDuplicateRelation = function(pSourceContactId, pUnrelatedContactId, pClusterId)
+DuplicateScannerUtils.createUnrelatedDuplicateRelation = function(pSourceContactId, pUnrelatedContactId, pClusterId)
 {
-    let newUid = util.getNewUUID();
-    let columns = ["ID", "SOURCEDUPLICATEID", "UNRELATEDDUPLICATEID", "CLUSTERID"];
-    let values = [newUid, pSourceContactId, pUnrelatedContactId, pClusterId];
-
-    return db.insertData("UNRELATEDDUPLICATES", columns, null, values);
+    return new SqlBuilder().insertFields({
+        "UNRELATEDDUPLICATEID": pUnrelatedContactId,
+        "SOURCEDUPLICATEID": pSourceContactId,
+        "CLUSTERID": pClusterId
+    }, "UNRELATEDDUPLICATES", "ID");
 }
 
 /*
@@ -172,7 +155,7 @@ DuplicateScannerUtils.CreateUnrelatedDuplicateRelation = function(pSourceContact
  *  @param {String} pDuplicateId whose cluster id should be searched
  *  @returns {String} Cluster id
  */
-DuplicateScannerUtils.GetClusterId = function(pDuplicateId)
+DuplicateScannerUtils.getClusterId = function(pDuplicateId)
 {
     return newSelect("CLUSTERID")
                 .from("DUPLICATECLUSTERS")
@@ -187,11 +170,11 @@ DuplicateScannerUtils.GetClusterId = function(pDuplicateId)
  *  @param {String} pUnrelatedDuplicateId Id of the source duplicate
  *  @returns {String} Number of records deleted
  */
-DuplicateScannerUtils.DeleteUnrelatedDuplicateRelation = function(pSourceDuplicateId, pUnrelatedDuplicateId)
+DuplicateScannerUtils.deleteUnrelatedDuplicateRelation = function(pSourceDuplicateId, pUnrelatedDuplicateId)
 {
     return newWhere("UNRELATEDDUPLICATES.SOURCEDUPLICATEID", pSourceDuplicateId)
                 .and("UNRELATEDDUPLICATES.UNRELATEDDUPLICATEID", pUnrelatedDuplicateId)
-                .deleteData(true, "UNRELATEDDUPLICATES");
+                .deleteData();
 }
 
 /*
@@ -200,9 +183,9 @@ DuplicateScannerUtils.DeleteUnrelatedDuplicateRelation = function(pSourceDuplica
  *  @param {String} pDuplicateId Duplicate id whose "unrelated" relations are to delete
  *  @returns {String} Number of records deleted
  */
-DuplicateScannerUtils.DeleteAllUnrelatedDuplicateRelations = function(pDuplicateId)
+DuplicateScannerUtils.deleteAllUnrelatedDuplicateRelations = function(pDuplicateId)
 {
-    DuplicateScannerUtils.DeleteUnrelatedDuplicateRelation(pDuplicateId, pDuplicateId);
+    DuplicateScannerUtils.deleteUnrelatedDuplicateRelation(pDuplicateId, pDuplicateId);
 }
 
 /*
@@ -211,7 +194,7 @@ DuplicateScannerUtils.DeleteAllUnrelatedDuplicateRelations = function(pDuplicate
  *  @param {String} pDuplicateId
  *  @returns {String[]} Array of duplicate ids
  */
-DuplicateScannerUtils.GetCachedDuplicatesForDuplicateId = function(pDuplicateId)
+DuplicateScannerUtils.getCachedDuplicatesForDuplicateId = function(pDuplicateId)
 {
     return newSelect("DUPLICATEID")
                 .from("DUPLICATECLUSTERS")
@@ -237,7 +220,7 @@ DuplicateScannerUtils.GetCachedDuplicatesForDuplicateId = function(pDuplicateId)
  * @param {String} pClusterId The clusters id
  * @return {String[]} Array of duplicate ids excluding those marked as unrelated
  */
-DuplicateScannerUtils.GetCachedDuplicatesForClusterId = function(pClusterId)
+DuplicateScannerUtils.getCachedDuplicatesForClusterId = function(pClusterId)
 {
     return newSelect("DUPLICATEID")
                 .from("DUPLICATECLUSTERS")
@@ -249,13 +232,13 @@ DuplicateScannerUtils.GetCachedDuplicatesForClusterId = function(pClusterId)
 
 /*
  * Recreates the cached duplicate clusters based on the configured pattern. <br />
- * The old clusters have to be deleted manually beforehand or by using "DeleteDuplicateClustersByTargetEntity".<br />
- * If there have already been ignored relations between duplicate records, it's advised to call "RefreshUnrelatedDuplicateRelations" after the recreation of the duplicates cache.<br />
+ * The old clusters have to be deleted manually beforehand or by using "deleteClustersByTargetEntity".<br />
+ * If there have already been ignored relations between duplicate records, it's advised to call "refreshUnrelatedDuplicateRelations" after the recreation of the duplicates cache.<br />
  * Please check the documentation of the params on how to get the infos required.<br />
  * <br />
  * If the usage of an external webservice has been activated, the search will be executed beforehand and the results will then be given to the pFormatValuesConsumeWebserviceCallback via parameter.<br />
  * To access the values it is advised to run thru the parameter like an array and access its value by key which is the index field name. The entity<br />
- * field names can be converted using DuplicateScannerUtils.TranslateEntityToIndexFields. For further infos see the example section below.<br />
+ * field names can be converted using DuplicateScannerUtils.translateEntityToIndexFields. For further infos see the example section below.<br />
  * <br />
  * Attention!<br />
  * If it is configured to use the external webservice callback the values have to be in the same format as they are in the parameter of the callback.<br />
@@ -269,7 +252,7 @@ DuplicateScannerUtils.GetCachedDuplicatesForClusterId = function(pClusterId)
  * @example
  * var filterName = "PersonDuplicates";
  * var targetEntity = "Person_entity";
- * var recordBlockSize = DuplicateScannerUtils.GetBlockSize();
+ * var recordBlockSize = DuplicateScannerUtils.getBlockSize();
  *
  * let formatToJsonAndCallWsCallback = function(pPossibleDuplicatesRay)
  * {
@@ -292,15 +275,15 @@ DuplicateScannerUtils.GetCachedDuplicatesForClusterId = function(pClusterId)
  *
  * DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
  *
- * DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, pRecordsBlockSize, formatToJsonAndCallWsCallback);
+ * DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, pRecordsBlockSize, formatToJsonAndCallWsCallback);
  *
  * DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
  */
-DuplicateScannerUtils.RebuildDuplicatesCache = function(pFilterName, pTargetEntity,
+DuplicateScannerUtils.rebuildDuplicatesCache = function(pFilterName, pTargetEntity,
     pRecordsBlockSize, pFormatValuesConsumeWebserviceCallback)
 {
     let useExternalWebservice = _DuplicateScannerUtils._isUseExternalWebservice(pFilterName, pTargetEntity);
-    let resultFields = DuplicateScannerUtils.LoadResultFields(filterName, targetEntity);
+    let resultFields = DuplicateScannerUtils.getResultFields(filterName, targetEntity);
 
     let indexPattern = _DuplicateScannerUtils._loadIndexPattern(pFilterName, pTargetEntity);
     let entityFieldConfigs = _DuplicateScannerUtils._loadEntityFieldConfigsFromPattern(indexPattern);
@@ -312,13 +295,13 @@ DuplicateScannerUtils.RebuildDuplicatesCache = function(pFilterName, pTargetEnti
 
     entityFields.push(entityIdField);
     
-    let targetRecords = DuplicateScannerUtils.LoadEntityRecords(pTargetEntity, entityFields, 0, pRecordsBlockSize);
+    let targetRecords = DuplicateScannerUtils.getEntityRecords(pTargetEntity, entityFields, 0, pRecordsBlockSize);
 
     let currentRecordIndex = pRecordsBlockSize;
     while(targetRecords.length > 0)
     {
         
-        foundDuplicateIds = DuplicateScannerUtils.ScanRecords(pTargetEntity, targetRecords,
+        foundDuplicateIds = DuplicateScannerUtils.scanRecords(pTargetEntity, targetRecords,
             entityFieldConfigs, resultFields, useExternalWebservice,
             pFormatValuesConsumeWebserviceCallback, alreadyIdentifiedIds, indexPattern, entityIdField);
         
@@ -329,14 +312,14 @@ DuplicateScannerUtils.RebuildDuplicatesCache = function(pFilterName, pTargetEnti
         {
             break;
         }
-        targetRecords = DuplicateScannerUtils.LoadEntityRecords(pTargetEntity, entityFields,
+        targetRecords = DuplicateScannerUtils.getEntityRecords(pTargetEntity, entityFields,
             currentRecordIndex, pRecordsBlockSize);
 
         currentRecordIndex += pRecordsBlockSize;
     }
 }
 
-DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
+DuplicateScannerUtils.scanRecords = function(pTargetEntity, pTargetRecordsData,
     pEntityFieldConfigs, pResultFields, pUseExternalWebservice, pFormatValuesConsumeWebserviceCallback, pAlreadyIdentifiedIds, pIndexPattern, pEntityIdField)
 {
     let foundDuplicateIds = [];
@@ -351,7 +334,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
     var duplicatesToInsertQueries = [];
     for (let b = 0; b < pTargetRecordsData.length; b++)
     {
-        let entityFieldValuesRay = DuplicateScannerUtils.BuildEntityFieldConfigValueRays(pEntityFieldConfigs, pTargetRecordsData[b]);
+        let entityFieldValuesRay = DuplicateScannerUtils.buildEntityFieldConfigs(pEntityFieldConfigs, pTargetRecordsData[b]);
 
         //The first field in this Array must always be the configured id field. This is ensured using onValidation-logic
         let idValue = pTargetRecordsData[b][pEntityIdField];
@@ -398,7 +381,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
  * @param {String} pTargetEntity Entity which has been configured
  * @returns {String} A clusterid if a matching cluster has been found, otherwise ""
  */
-DuplicateScannerUtils.CacheNewScanResults = function(pNewRecordId, pDuplicateIds, pTargetEntity)
+DuplicateScannerUtils.cacheNewScanResults = function(pNewRecordId, pDuplicateIds, pTargetEntity)
 {
     let duplicateIds = [];
     //Run thru every duplicate result and read out the id. 
@@ -409,7 +392,7 @@ DuplicateScannerUtils.CacheNewScanResults = function(pNewRecordId, pDuplicateIds
         duplicateIds.push(duplicateContactId);
     }
     
-    let clusterId = DuplicateScannerUtils.GetClusterWithIdenticalDuplicates(duplicateIds);
+    let clusterId = DuplicateScannerUtils.getClusterWithIdenticalDuplicates(duplicateIds);
     
     //If no cluster has beend found, create a new one with all found duplicateIds, 
     //otherwise add the id to the existing cluster
@@ -434,7 +417,7 @@ DuplicateScannerUtils.CacheNewScanResults = function(pNewRecordId, pDuplicateIds
  * @param {String[]} pDuplicateIds Duplicate ids which should be in the same cluster
  * @returns {String} Id of the cluster which contains all given duplicate ids or ""
  */
-DuplicateScannerUtils.GetClusterWithIdenticalDuplicates = function(pDuplicateIds)
+DuplicateScannerUtils.getClusterWithIdenticalDuplicates = function(pDuplicateIds)
 {
     let RESULT_NO_CLUSTER_FOUND = "";
 
@@ -473,7 +456,7 @@ DuplicateScannerUtils.GetClusterWithIdenticalDuplicates = function(pDuplicateIds
         return foundClusterId;
 }
 
-DuplicateScannerUtils.LoadEntityRecords = function(pTargetEntity, pEntityFields, pStartRow, pCountRecordsToLoad)
+DuplicateScannerUtils.getEntityRecords = function(pTargetEntity, pEntityFields, pStartRow, pCountRecordsToLoad)
 {
     let getRowsConfig = entities.createConfigForLoadingRows()
     .entity(pTargetEntity)
@@ -489,7 +472,7 @@ DuplicateScannerUtils.LoadEntityRecords = function(pTargetEntity, pEntityFields,
  *  @param {String} pTargetEntity Entity which has been configured
  *  @returns {String[]} Resultfields as array
  */
-DuplicateScannerUtils.LoadResultFields = function(pFilterName, pTargetEntity)
+DuplicateScannerUtils.getResultFields = function(pFilterName, pTargetEntity)
 {
     return newSelect("dsrfc.ENTITY_FIELD_NAME")
                 .from("DUPLICATESCANNERRESULTFIELDCONFIG dsrfc")
@@ -507,11 +490,11 @@ DuplicateScannerUtils.LoadResultFields = function(pFilterName, pTargetEntity)
  *<br />
  * If the usage of an external webservice has been activated, the result will then be given to the pFormatValuesConsumeWebserviceCallback via parameter.<br />
  * To access the values it is advised to run thru the parameter like an array and access its value by key which is the index field name. The entity
- * field names can be converted using DuplicateScannerUtils.TranslateEntityToIndexFields
+ * field names can be converted using DuplicateScannerUtils.translateEntityToIndexFields
  * <br />
  * <br />
  * Attention!<br />
- * If it's a single ScanForDuplicates call it doesn't matter what the callback returns because after the callback, no more modifications follow before
+ * If it's a single scanForDuplicates call it doesn't matter what the callback returns because after the callback, no more modifications follow before
  * returning the data.<br />
  * If it's inside the RebuildCache the values have to be in the same format as the parameter
  *
@@ -570,17 +553,16 @@ DuplicateScannerUtils.LoadResultFields = function(pFilterName, pTargetEntity)
  * DuplicateScannerUtils.ScanForDuplicates(filterName, targetEntity, valuesToCheck,
  * formatToJsonAndCallWsCallback);
  */
-DuplicateScannerUtils.ScanForDuplicates = function(pFilterName, pTargetEntity, pValuesToCheck,
-    pFormatValuesConsumeWebserviceCallback)
+DuplicateScannerUtils.scanForDuplicates = function(pFilterName, pTargetEntity, pValuesToCheck, pFormatValuesConsumeWebserviceCallback)
 {
     let useExternalWebservice = _DuplicateScannerUtils._isUseExternalWebservice(pFilterName, pTargetEntity);
-    let resultFields = DuplicateScannerUtils.LoadResultFields(pFilterName, pTargetEntity);
+    let resultFields = DuplicateScannerUtils.getResultFields(pFilterName, pTargetEntity);
     
     let indexPattern = _DuplicateScannerUtils._loadIndexPattern(pFilterName, pTargetEntity);
     let entityFieldConfigs = _DuplicateScannerUtils._loadEntityFieldConfigsFromPattern(indexPattern);  
     let entityIdField = _DuplicateScannerUtils._loadEntityIdField(pFilterName, pTargetEntity);
     
-    let entityFieldConfigValuesRay = DuplicateScannerUtils.BuildEntityFieldConfigValueRays(entityFieldConfigs, pValuesToCheck);
+    let entityFieldConfigValuesRay = DuplicateScannerUtils.buildEntityFieldConfigs(entityFieldConfigs, pValuesToCheck);
    
    //The first field in this Array must always be the configured id field.
     let idValue = pValuesToCheck[entityIdField];
@@ -600,10 +582,10 @@ DuplicateScannerUtils.ScanForDuplicates = function(pFilterName, pTargetEntity, p
  *
  *  @example
  *  let entityResultFields = ["LASTNAME"];
- *  let entityIndexFields = DuplicateScannerUtils.TranslateEntityToIndexFields("Person_entity", entityResultFields);
+ *  let entityIndexFields = DuplicateScannerUtils.translateEntityToIndexFields("Person_entity", entityResultFields);
  *
  */
-DuplicateScannerUtils.TranslateEntityToIndexFields = function(pEntityName, pEntityFields)
+DuplicateScannerUtils.translateEntityToIndexFields = function(pEntityName, pEntityFields)
 {
     let entityIndexFields = {};
     for (let i = 0; i < pEntityFields.length; i++)
@@ -633,14 +615,10 @@ DuplicateScannerUtils.TranslateEntityToIndexFields = function(pEntityName, pEnti
  *
  *  @param {String} pSourceContactId The contact to be integrated into another
  *  @param {String} pTargetContactId The contact in which the source gets integrated
- *  @returns {String}
+ *  @returns {Boolean} if the merge was sucessful
  */
-DuplicateScannerUtils.MergePerson = function(pSourceContactId, pTargetContactId)
+DuplicateScannerUtils.mergePerson = function(pSourceContactId, pTargetContactId)
 {
-    var updateStatementsCurrentAlias = [];
-    var updateStatementsSystemAlias = [];
-    var deleteStatements = [];
-
     var sourcePersonId = newSelect("PERSON_ID")
         .from("CONTACT")
         .where("CONTACT.CONTACTID", pSourceContactId)
@@ -649,34 +627,32 @@ DuplicateScannerUtils.MergePerson = function(pSourceContactId, pTargetContactId)
         .from("CONTACT")
         .where("CONTACT.CONTACTID", pTargetContactId)
         .cell();
-        
-    var tableInfosCurrentAlias = _DuplicateScannerUtils._getMergeUpdateTableInfosCurrentAlias();
-    var tableInfosSystemAlias = _DuplicateScannerUtils._getMergeUpdateTableInfosSystemAlias();
-
-    updateStatementsCurrentAlias.push(_DuplicateScannerUtils._buildUpdateResetStandardCommunications(pSourceContactId));
-    updateStatementsCurrentAlias = updateStatementsCurrentAlias.concat(_DuplicateScannerUtils._buildUpdateContactIdStatements(tableInfosCurrentAlias, pSourceContactId, pTargetContactId));
-    updateStatementsCurrentAlias = updateStatementsCurrentAlias.concat(_DuplicateScannerUtils._buildUpdateAttachParticipantsToNewContactQuery("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", pSourceContactId, pTargetContactId));
-
-    updateStatementsSystemAlias = updateStatementsSystemAlias.concat(_DuplicateScannerUtils._buildUpdateContactIdStatements(tableInfosSystemAlias, pSourceContactId, pTargetContactId, SqlUtils.getSystemAlias()));
-
-    deleteStatements = deleteStatements.concat(_DuplicateScannerUtils._buildDeleteRemoveObsoleteParticipantsRecordsQuery("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", pSourceContactId, pTargetContactId));
     
+    var isLinkedDataUpdated = _DuplicateScannerUtils._migrateLinkedContactData(pSourceContactId, pTargetContactId);
+    var isParticipantsUpdated = _DuplicateScannerUtils._migrateParticipantsToNewContact("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", 
+        pSourceContactId, pTargetContactId);
+    
+    var deleteStatements = [];
     if (sourcePersonId != targetPersonId)
-        deleteStatements.push(["PERSON", newWhere("PERSON.PERSONID", sourcePersonId).build()]);
+        deleteStatements.push(newWhere("PERSON.PERSONID", sourcePersonId).buildDeleteStatement());
     
-    deleteStatements.push(["CONTACT", newWhere("CONTACT.CONTACTID", pSourceContactId).build()]);
+    deleteStatements.push(newWhere("CONTACT.CONTACTID", pSourceContactId).buildDeleteStatement());
     deleteStatements = deleteStatements.concat(_DuplicateScannerUtils._buildDeleteCachedUnrelatedDuplicateQuery(pSourceContactId));
-
-    var affectedRowsCurrentAlias = db.updates(updateStatementsCurrentAlias);
-    var affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, SqlUtils.getSystemAlias());
+    
+    //update binary 
+    var metaData = db.getBinaryMetadata("CONTACT", "DOCUMENT", pSourceContactId, true, SqlUtils.getBinariesAlias());
+    metaData.forEach(function (binaryMetaData) 
+    {
+        db.updateBinaryAssignment(binaryMetaData.id, "CONTACT", "DOCUMENT", pTargetContactId, SqlUtils.getBinariesAlias());
+    });
     var deletedRows = db.deletes(deleteStatements)
 
-    DuplicateScannerUtils.DeleteCachedDuplicate(pSourceContactId);
+    DuplicateScannerUtils.deleteCachedDuplicate(pSourceContactId);
 
-    return (affectedRowsCurrentAlias > 0 && deletedRows > 0);
+    return isLinkedDataUpdated || isParticipantsUpdated || deletedRows > 0;
 }
 
-DuplicateScannerUtils.CreateMergeSuccessActivity = function(pSourceContactId, pTargetContactId, pCurrentContactId, pContext)
+DuplicateScannerUtils.createMergeSuccessActivity = function(pSourceContactId, pTargetContactId, pCurrentContactId, pContext)
 {
     var activityDataForInsert = {
         subject: translate.withArguments("A %0 record has been merged", [pContext]),
@@ -690,37 +666,33 @@ DuplicateScannerUtils.CreateMergeSuccessActivity = function(pSourceContactId, pT
     return ActivityUtils.insertNewActivity(activityDataForInsert, activityLinks, null, db.getCurrentAlias());
 }
 
-DuplicateScannerUtils.MergeOrganisation = function(pSourceContactId, pTargetContactId)
+DuplicateScannerUtils.mergeOrganisation = function(pSourceContactId, pTargetContactId)
 {
-    let updateStatementsCurrentAlias = [];
-    let updateStatementsSystemAlias = [];
-    let deleteStatements = [];
-
     var sourceOrganisationId = newSelect("ORGANISATION_ID")
-                                    .from("CONTACT")
-                                    .where("CONTACT.CONTACTID", pSourceContactId)
-                                    .cell();
-
-    var tableInfosCurrentAlias = _DuplicateScannerUtils._getMergeUpdateTableInfosCurrentAlias();
-    var tableInfosSystemAlias = _DuplicateScannerUtils._getMergeUpdateTableInfosSystemAlias();
-
-	updateStatementsCurrentAlias = updateStatementsCurrentAlias.concat(_DuplicateScannerUtils._buildUpdateResetStandardCommunications(pSourceContactId));
-    updateStatementsCurrentAlias = updateStatementsCurrentAlias.concat(_DuplicateScannerUtils._buildUpdateContactIdStatements(tableInfosCurrentAlias, pSourceContactId, pTargetContactId));
-    updateStatementsCurrentAlias = updateStatementsCurrentAlias.concat(_DuplicateScannerUtils._buildUpdateAttachParticipantsToNewContactQuery("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", pSourceContactId, pTargetContactId));
-
-    updateStatementsSystemAlias = updateStatementsSystemAlias.concat(_DuplicateScannerUtils._buildUpdateContactIdStatements(tableInfosSystemAlias, pSourceContactId, pTargetContactId));
-
-    deleteStatements = deleteStatements.concat(_DuplicateScannerUtils._buildDeleteRemoveObsoleteParticipantsRecordsQuery("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", pSourceContactId, pTargetContactId));
+        .from("CONTACT")
+        .where("CONTACT.CONTACTID", pSourceContactId)
+        .cell();
+        
+    _DuplicateScannerUtils._migrateLinkedContactData(pSourceContactId, pTargetContactId);
+    _DuplicateScannerUtils._migrateParticipantsToNewContact("CAMPAIGNPARTICIPANT", "CONTACT_ID", "CAMPAIGN_ID", 
+        pSourceContactId, pTargetContactId);
+    
+    var deleteStatements = [];
+    deleteStatements.push(newWhere("CONTACT.CONTACTID", pSourceContactId).buildDeleteStatement());
     deleteStatements = deleteStatements.concat(_DuplicateScannerUtils._buildDeleteOrganisationAndContactQuery(sourceOrganisationId, pSourceContactId));
     deleteStatements = deleteStatements.concat(_DuplicateScannerUtils._buildDeleteCachedUnrelatedDuplicateQuery(pSourceContactId));
+    
+    //update binary 
+    var metaData = db.getBinaryMetadata("CONTACT", "DOCUMENT", pSourceContactId, true, SqlUtils.getBinariesAlias());
+    metaData.forEach(function (binaryMetaData) 
+    {
+        db.updateBinaryAssignment(binaryMetaData.id, "CONTACT", "DOCUMENT", pTargetContactId, SqlUtils.getBinariesAlias());
+    });
+    var deletedRows = db.deletes(deleteStatements)
 
-    let affectedRowsCurrentAlias = db.updates(updateStatementsCurrentAlias);
-    let affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, SqlUtils.getSystemAlias());
-    let deletedRows = db.deletes(deleteStatements)
-
-    DuplicateScannerUtils.DeleteCachedDuplicate(pSourceContactId);
+    DuplicateScannerUtils.deleteCachedDuplicate(pSourceContactId);
 
-    return (affectedRowsCurrentAlias > 0 && deletedRows >= 2);
+    return deletedRows >= 2;
 }
 
 /*
@@ -739,7 +711,7 @@ DuplicateScannerUtils.MergeOrganisation = function(pSourceContactId, pTargetCont
  *
  * => ["{entityfield: FIRSTNAME}", "PETER"]]
  */
-DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateFieldsConfig, pTargetRecordData)
+DuplicateScannerUtils.buildEntityFieldConfigs = function(pDuplicateFieldsConfig, pTargetRecordData)
 {
     let INDEX_CONFIG_ENTITY_FIELD = 0;
     let entityFieldConfigValuesRay = [];
@@ -756,16 +728,16 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
         if(entityFieldValue == null)
             entityFieldValue = "";
         else
-            entityFieldValue = entityFieldValue.toLowerCase().replace(/[():\.\/!]/gi, "").trim();
+            entityFieldValue = indexsearch.escapeString(entityFieldValue).trim();
         
         let exclude = fieldConfig.exclude;
-        if ( exclude )
+        if (exclude)
         {   
-            for(let i = 0; i < exclude.length; i++)
-            {    
+            exclude.forEach(function (excludeValue)
+            {
                 entityFieldValue = " " + entityFieldValue + " ";
-                entityFieldValue = entityFieldValue.replace(new RegExp( " " + exclude[i] + " ", "gi"), "");
-            }    
+                entityFieldValue = entityFieldValue.replace(new RegExp( " " + excludeValue + " ", "gi"), "");
+            });  
         }
         
         let valuelength = fieldConfig.length; 
@@ -782,12 +754,12 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
     return entityFieldConfigValuesRay.length > 0 ? entityFieldConfigValuesRay : [["", ""]];
 }
 
-DuplicateScannerUtils.GetBlockSize = function()
+DuplicateScannerUtils.getBlockSize = function()
 {
     return project.getPreferenceValue("custom.duplicates.dataBlockSize", "5000");
 }
 
-DuplicateScannerUtils.GetEntityFieldsFromConfig = function(pFilterName, pTargetEntity)
+DuplicateScannerUtils.getEntityFieldsFromConfig = function(pFilterName, pTargetEntity)
 {
     let indexPattern = _DuplicateScannerUtils._loadIndexPattern(pFilterName, pTargetEntity);
     if(indexPattern == null || indexPattern == "")
@@ -827,7 +799,7 @@ DuplicateScannerUtils.getEntityFieldObjectFromConfig = function (pFilterName, pT
     };
 }
 
-DuplicateScannerUtils.GetUnrelatedRelationsForDuplicate = function(pDuplicateId)
+DuplicateScannerUtils.getUnrelatedRelationsForDuplicate = function(pDuplicateId)
 {
     let unrelatedIds = [];
     let duplicateIds = newSelect("SOURCEDUPLICATEID, UNRELATEDDUPLICATEID")
@@ -868,11 +840,6 @@ _DuplicateScannerUtils._loadEntityFieldsFromFieldConfigs = function(pEntityField
     return fieldNames;
 }
 
-_DuplicateScannerUtils._buildUpdateResetStandardCommunications = function(pSourceContactId)
-{
-    return newWhere("COMMUNICATION.CONTACT_ID", pSourceContactId).buildUpdateStatement({"ISSTANDARD" : "0"});
-}
-
 /*
  * Gets the Pattern for the scanner
  * A pattern usually contains placeholders in the style of "{entityFieldName]"
@@ -926,9 +893,10 @@ _DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator,
     let row = "";
     row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
     switch (operator){
-        case 'NOT_EQUAL':
-            row = row + ', "exclude":' + JSON.parse(value);
-        case 'ISNOTNULL':
+        case "NOT_EQUAL":
+        case "CONTAINSNOT":
+            row = row + ', "exclude":' + value;
+        case "ISNOTNULL":
             row = row + ', "empty":' + false;
     }
     row = row + '})';
@@ -966,7 +934,7 @@ _DuplicateScannerUtils._loadEntityIdField = function(pFilterName, pTargetEntity)
 }
 
 /*
- * @see DuplicateScannerUtils.ScanForDuplicates for the documentation
+ * @see DuplicateScannerUtils.scanForDuplicates for the documentation
  */
 _DuplicateScannerUtils._scanForDuplicates = function(pTargetEntity, pEntityFieldConfigValuesRay,
 pResultFields, pRecordIdValueToIgnore, pFormatValuesConsumeWebserviceCallback, pUseExternalWebservice, pIndexPattern)
@@ -1017,13 +985,13 @@ _DuplicateScannerUtils._isUseExternalWebservice = function(pFilterName, pTargetE
  * @param {String} pTargetEntity Entity which has been configured
  * @param {String} pIndexPatternWithValues The pattern used to search. Has to contain the values already.
  * @param {String} pIdFilter The filter pattern used to exclude the current record from the result.
- * @param {String} pResultFields The result field config. Use "DuplicateScannerUtils.LoadResultFields"
+ * @param {String} pResultFields The result field config. Use "DuplicateScannerUtils.getResultFields"
  * @param {String} pResultSetRows todo
  * @returns {[["key", "value"]] || null} Array of Key-Value-Pairs based on the configured pResultFields, if no pattern exists null
  */
 _DuplicateScannerUtils._callIndexSearch = function(pTargetEntity, pIndexPatternWithValues, pIdFilter, pResultFields, pResultSetRows)
 {
-    logging.log(pIndexPatternWithValues)
+    //logging.log(pIndexPatternWithValues)
     //The indexPattern can't be null because it is required to run the search.
     if(pIndexPatternWithValues == null || pIndexPatternWithValues == "")
         return null;
@@ -1047,7 +1015,7 @@ _DuplicateScannerUtils._callIndexSearch = function(pTargetEntity, pIndexPatternW
  * (indexsearch.FIELD_ID, indexsearch.FIELD_TITLE, indexsearch.FIELD_TYPE, indexsearch.FIELD_DESCRIPTION)
  *
  * @param {IndexQuery} pIndexQuery An indexquery created with "indexsearch.createIndexQuery()"
- * @param {String[]} pResultFields The result field config. Use "DuplicateScannerUtils.LoadResultFields"
+ * @param {String[]} pResultFields The result field config. Use "DuplicateScannerUtils.getResultFields"
  * @returns {IndexQuery} IndexQuery with the resultfields set
  */
 _DuplicateScannerUtils._setResultFields = function(pIndexQuery, pResultFields)
@@ -1102,7 +1070,7 @@ _DuplicateScannerUtils._createInsertDuplicatesClusterQuery = function (pDuplicat
     let duplicatesToInsertQueries = [];
     let cols = ["ID", "CLUSTERID", "DUPLICATEID", "TARGET_ENTITY"];
 
-    if(pClusterId == undefined || pClusterId == null || pClusterId == "")
+    if (!pClusterId)
         pClusterId = util.getNewUUID();
             
     for (let i = 0; i < pDuplicatesRay.length; i++)
@@ -1130,32 +1098,24 @@ _DuplicateScannerUtils._deleteDuplicateClusters = function ()
  * This is because otherwise there would now be in total two "participants" in the same "group" as opposed to one before.
  * Also if they already are in the same "group" those records shouldn't be updated because it would lead to the same outcome.
  *
- * Mandatory: All records ignored for the time being have to be deleted aswell! See #_DuplicateScannerUtils._buildRemoveObsoleteParticipantsRecordsDeleteQuery
- * @returns {String[]} Query to update records
+ * @returns {Boolean} If records have been updated
  */
-_DuplicateScannerUtils._buildUpdateAttachParticipantsToNewContactQuery = function (pTableName, pContactIdColumn, pAssignableIdColumn, pSourceContactId, pTargetContactId, updateStatements)
+_DuplicateScannerUtils._migrateParticipantsToNewContact = function (pTableName, pContactIdColumn, pAssignableIdColumn, pSourceContactId, pTargetContactId)
 {
-    var selectAssignableIdsOfTargetContactQuery = newSelect(pAssignableIdColumn)
-                                                        .from(pTableName)
-                                                        .where([pTableName, pContactIdColumn], pTargetContactId);
-
-    let updateCondition = newWhere([pTableName, pAssignableIdColumn], selectAssignableIdsOfTargetContactQuery, SqlBuilder.NOT_IN())
-                                .and([pTableName, pContactIdColumn], pSourceContactId)
-
-    return [[pTableName, [pContactIdColumn], null, [pTargetContactId], updateCondition.build()]];
-}
-
-
-_DuplicateScannerUtils._buildDeleteRemoveObsoleteParticipantsRecordsQuery = function (pTableName, pContactIdColumn, pAssignableIdColumn, pSourceContactId, pTargetContactId, updateStatements)
-{
-    var selectAssignableIdsOfTargetContactQuery = newSelect(pAssignableIdColumn)
-                                                        .from(pTableName)
-                                                        .where([pTableName, pContactIdColumn], pTargetContactId);
-
-    let deleteCondition = newWhere([pTableName, pAssignableIdColumn], selectAssignableIdsOfTargetContactQuery, SqlBuilder.IN())
-                                .and([pTableName, pAssignableIdColumn], pSourceContactId)
-
-    return [[pTableName, deleteCondition.build()]];
+    var excludedIds = newSelect(pAssignableIdColumn)
+        .from(pTableName)
+        .where([pTableName, pContactIdColumn], pTargetContactId)
+        .arrayColumn();
+
+    var updateCount = newWhereIfSet([pTableName, pAssignableIdColumn], excludedIds, SqlBuilder.NOT_IN())
+        .and([pTableName, pContactIdColumn], pSourceContactId)
+        .updateFields(new Map().set(pContactIdColumn, pTargetContactId), pTableName);
+        
+    var deleteCount = newWhere([pTableName, pContactIdColumn], pSourceContactId)
+        .tableName(pTableName)
+        .deleteData();
+    
+    return updateCount > 0 || deleteCount > 0;
 }
 
 _DuplicateScannerUtils._buildDeleteOrganisationAndContactQuery = function(pSourceOrganisationId, pSourceContactId)
@@ -1191,71 +1151,133 @@ _DuplicateScannerUtils._getIgnoreSourceRecordPattern = function(pRecordIdValueTo
     return null;
 }
 
-_DuplicateScannerUtils._buildUpdateContactIdStatements = function(pTableInfos, pSourceContactId, pTargetContactId, pAlias)
+_DuplicateScannerUtils._migrateLinkedContactData = function (pSourceContactId, pTargetContactId)
 {
-    return pTableInfos.map(function ([tableName, columnName, additionalCondition])
+    var updateStatements = new Map();
+    var currentAlias = db.getCurrentAlias();
+    
+    var setStandardsStatements = [];
+    var [standardPhone, standardMail, standardAddressId] = newSelect([
+            "(" + CommUtil.getStandardSubSqlPhone() + ")", 
+            "(" + CommUtil.getStandardSubSqlMail() + ")",
+            "CONTACT.ADDRESS_ID"
+        ])
+        .from("CONTACT")
+        .where("CONTACT.CONTACTID", pTargetContactId)
+        .arrayRow();
+    
+    //if the targetContact already has a standard phone comm, set the comm from the sourceContact as not standard
+    if (standardPhone)
+    {
+        setStandardsStatements.push(
+            newWhere("COMMUNICATION.CONTACT_ID", pSourceContactId)
+                .and("COMMUNICATION.MEDIUM_ID", CommUtil.getMediumIdsByCategory("PHONE"), SqlBuilder.IN())
+                .buildUpdateStatement({"ISSTANDARD" : "0"})
+        );
+    }
+    if (standardMail)
+    {
+        setStandardsStatements.push(
+            newWhere("COMMUNICATION.CONTACT_ID", pSourceContactId)
+                .and("COMMUNICATION.MEDIUM_ID", CommUtil.getMediumIdsByCategory("EMAIL"), SqlBuilder.IN())
+                .buildUpdateStatement({"ISSTANDARD" : "0"})
+        );
+    }
+    //set the standardaddress of the sourceContact as standard of the targetContact if it doesn't have one set yet
+    if(!standardAddressId) 
+    {
+        var sourceStandard = newSelect("CONTACT.ADDRESS_ID")
+            .from("CONTACT")
+            .where("CONTACT.CONTACTID", pSourceContactId)
+            .cell();
+        setStandardsStatements.push(newWhere("CONTACT.CONTACTID", pTargetContactId).buildUpdateStatement({"ADDRESS_ID": sourceStandard}));
+    }
+    
+    updateStatements.set(currentAlias, setStandardsStatements);
+    
+    _DuplicateScannerUtils._getLinkedTableInfos(pTargetContactId).forEach(function ([tableName, columnName, additionalCondition, dbAlias])
     {
+        if (!dbAlias)
+            dbAlias = currentAlias;
+        
+        if (!updateStatements.has(dbAlias))
+            updateStatements.set(dbAlias, []);
+        var statements = updateStatements.get(dbAlias);
+        
         var updateValues = {};
         updateValues[columnName] = pTargetContactId;
-        return newWhere([tableName, columnName], pSourceContactId, undefined, undefined, pAlias)
-            .andIfSet(additionalCondition)
-            .buildUpdateStatement(updateValues, tableName)
+        
+        var updateCondition = new SqlBuilder(dbAlias).where([tableName, columnName], pSourceContactId).andIfSet(additionalCondition);
+        
+        //push must be used here to keep the reference
+        statements.push(updateCondition.buildUpdateStatement(updateValues, tableName));
     });
-}
+    
+    var totalChanges = 0;
+    
+    updateStatements.forEach(function (statements, alias)
+    {
+        totalChanges += db.updates(statements, alias);
+    });
+    
+    totalChanges += newWhere("COMMUNICATION.CONTACT_ID", pSourceContactId).deleteData(); //delete leftover communications from the source contact
+    totalChanges += new AttributeRelationQuery(pSourceContactId).deleteAllAttributes(); //delete leftover attributes
 
-/*
- * Contains all Tables and their fields which may contain the contact id to be replaced for the data alias
- *
- * @returns {String[[]]} Array in the format [TableName, ContactIdColumnName, AdditionalCondition]
- */
-_DuplicateScannerUtils._getMergeUpdateTableInfosCurrentAlias = function()
-{
-    return [
-        ["AB_APPOINTMENTLINK", "OBJECT_ROWID", ""],
-        ["AB_CTILOG", "CONTACT_ID", ""],
-        ["AB_OBJECTRELATION", "AB_OBJECTRELATIONID", ""],
-        ["AB_OBJECTRELATION", "OBJECT1_ROWID", ""],
-        ["AB_OBJECTRELATION", "OBJECT2_ROWID", ""],
-        ["AB_LOGHISTORY", "TABLENAMEID", ""],
-        ["ADDRESS", "CONTACT_ID", ""],
-        ["BULKMAILRECIPIENT", "CONTACT_ID", ""],
-        ["BULKMAIL", "TESTING_CONTACT_ID", ""],
-        ["CAMPAIGN", "EMPLOYEE_CONTACT_ID", ""],
-        ["CAMPAIGNSTEP", "EMPLOYEE_CONTACT_ID", ""],
-        ["COMMRESTRICTION", "CONTACT_ID", ""],
-        ["COMMRESTRICTION", "EMPLOYEE_INVOLVED", ""],
-        ["COMMUNICATION", "CONTACT_ID", ""],
-        ["COMPETITION", "CONTACT_ID", ""],
-        ["CONTRACT", "CONTACT_ID", ""],
-        ["LETTERRECIPIENT", "CONTACT_ID", ""],
-        ["OBJECTMEMBER", "CONTACT_ID", ""],
-        ["OFFER", "CONTACT_ID", ""],
-        ["PRODUCT", "CONTACT_ID", ""],
-        ["PRODUCTPRICE", "CONTACT_ID", ""],
-        ["SALESORDER", "CONTACT_ID", ""],
-        ["SALESPROJECT", "CONTACT_ID", ""],
-        ["TASK", "REQUESTOR_CONTACT_ID", ""],
-        ["TASK", "EDITOR_CONTACT_ID", ""],
-        ["TASKLINK", "OBJECT_ROWID", ""],
-        ["ACTIVITY", "RESPONSIBLE", ""],
-        ["DSGVO", "CONTACT_ID", ""],
-        ["DSGVOINFO", "CONTACT_ID", ""],
-        ["TIMETRACKING", "CONTACT_ID", ""],
-        ["ACTIVITYLINK", "OBJECT_ROWID", ""],
-        ["AB_ATTRIBUTERELATION", "OBJECT_ROWID", ""]
-    ];
+    return totalChanges > 0;
 }
 
 /*
- * Contains all Tables and their fields which may contain the contact id to be replaced for the system alias
+ * Contains all Tables and their fields which may contain the contact id to be replaced for the data alias
  *
- * @returns {String[[]]} Array in the format [TableName, ContactIdColumnName, AdditionalCondition]
+ * @returns {String[[]]} Array in the format [TableName, ContactIdColumnName, AdditionalCondition, alias]
  */
-_DuplicateScannerUtils._getMergeUpdateTableInfosSystemAlias = function()
+_DuplicateScannerUtils._getLinkedTableInfos = function(pTargetContactId)
 {
-    return [
-        ["ASYS_CALENDARLINK", "DBID", ""],
-        ["ASYS_BINARIES", "ROW_ID", "TABLENAME = 'CONTACT'"]
+    //don't use communications that the target already has
+    var targetComms = newSelect("COMMUNICATION.ADDR") 
+        .from("COMMUNICATION")
+        .where("COMMUNICATION.CONTACT_ID", pTargetContactId)
+        .arrayColumn();
+        
+    var communicationDedupCondition = targetComms.length > 0
+        ? newWhere("COMMUNICATION.ADDR", targetComms, SqlBuilder.NOT_IN())
+        : "";
+    
+    return[
+        ["AB_APPOINTMENTLINK", "OBJECT_ROWID"],
+        ["AB_CTILOG", "CONTACT_ID"],
+        ["AB_OBJECTRELATION", "AB_OBJECTRELATIONID"],
+        ["AB_OBJECTRELATION", "OBJECT1_ROWID"],
+        ["AB_OBJECTRELATION", "OBJECT2_ROWID"],
+        ["AB_LOGHISTORY", "TABLENAMEID"],
+        ["ADDRESS", "CONTACT_ID"],
+        ["BULKMAILRECIPIENT", "CONTACT_ID"],
+        ["BULKMAIL", "TESTING_CONTACT_ID"],
+        ["CAMPAIGN", "EMPLOYEE_CONTACT_ID"],
+        ["CAMPAIGNSTEP", "EMPLOYEE_CONTACT_ID"],
+        ["COMMRESTRICTION", "CONTACT_ID"],
+        ["COMMRESTRICTION", "EMPLOYEE_INVOLVED"],
+        ["COMMUNICATION", "CONTACT_ID", communicationDedupCondition],
+        ["COMPETITION", "CONTACT_ID"],
+        ["CONTRACT", "CONTACT_ID"],
+        ["LETTERRECIPIENT", "CONTACT_ID"],
+        ["OBJECTMEMBER", "CONTACT_ID"],
+        ["OFFER", "CONTACT_ID"],
+        ["PRODUCT", "CONTACT_ID"],
+        ["PRODUCTPRICE", "CONTACT_ID"],
+        ["SALESORDER", "CONTACT_ID"],
+        ["SALESPROJECT", "CONTACT_ID"],
+        ["TASK", "REQUESTOR_CONTACT_ID"],
+        ["TASK", "EDITOR_CONTACT_ID"],
+        ["TASKLINK", "OBJECT_ROWID"],
+        ["ACTIVITY", "RESPONSIBLE"],
+        ["DSGVO", "CONTACT_ID"],
+        ["DSGVOINFO", "CONTACT_ID"],
+        ["TIMETRACKING", "CONTACT_ID"],
+        ["ACTIVITYLINK", "OBJECT_ROWID"],
+        ["AB_ATTRIBUTERELATION", "OBJECT_ROWID"],
+
+        ["ASYS_CALENDARLINK", "DBID", "", SqlUtils.getSystemAlias()]
     ];
 }
 
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 34ae40ebfa34a87d89f1a84131521b9220e36b06..bffbe633e28bdc6119fdea0898094c96809e493e 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -1,3 +1,4 @@
+import("system.question");
 import("Sql_lib");
 import("MimeType_lib");
 import("Document_lib");
@@ -10,7 +11,8 @@ import("Communication_lib");
 import("DocumentTemplate_lib");
 import("system.neon");
 import("system.mail");
-import("Bulkmail_lib")
+import("Bulkmail_lib");
+import("system.tools");
 
 function EmailWritingUtils () {}
 
@@ -68,6 +70,8 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
     return email.downloadEML(pEmailFilename);
 }
 
+
+
 /**
  * opens a view where a new mail can be sent. In the view the use CAN select a DocumentTemplate if needed
  * 
@@ -78,9 +82,10 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
  * @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation" )
  * @param {String} pEmailFilename optional file name of the email.
  * @param {String} [pAdditionalPlaceholders] additional placeholders for the email
- * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
+ * @param {Array[]} [pUpdateStatements] an array with update statements which will be executed after email is downloaded/sent.
+ * @param {String} pTypeClassification Documenttemplatetypeclassification
  */
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements, pTypeClassification)
 {
     var params = {
         "ContactId_param" : pToContactId,
@@ -89,7 +94,8 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
         "NotificationMsg_param" : pNotificationMsg,
         "EmailFilename" : pEmailFilename,
         "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
-        "OfferId_param" : pOfferId
+        "UpdateStatements_param" : JSON.stringify(pUpdateStatements),
+        "DocumentTemplateTypeClassification_param" : pTypeClassification
     };
     
     if (pToEmailAddress)
@@ -98,6 +104,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
     neon.openContext("Email", "EmailEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
 }
 
+
 EmailWritingUtils.getMailbridgeAddress = function ()
 {
     return "mailbridge@domain.local"; //TODO: not hardcoded
@@ -118,9 +125,16 @@ EmailWritingUtils.getMailbridgeAddress = function ()
  */
 EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
 {
-    var pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
-    .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
-            
+    var pRecpientEmail;
+    
+    if (pRecipient)
+    {
+        pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
+                                .where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();        
+    } else{
+        pRecpientEmail = null;
+    }
+    
     EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
 }
 
@@ -368,8 +382,19 @@ Email.prototype.send = function (pUser)
         
         if (this.sender)
             mail.setSender(mailId, this.sender);
-    
-        var sentMails = mail.sendMailAs(pUser || "mailbridge", mailId)
+        var mailbridgeTitle = "mailbridge";
+        var sentMails;
+        if(pUser)
+            sentMails = mail.sendMailAs(pUser, mailId)
+        else
+        {
+            let mailbridgeExists = tools.getUser(mailbridgeTitle);
+            
+            if(mailbridgeExists)
+                mail.sendMailAs(mailbridgeTitle, mailId)
+            else //check mailbridge user if this error gets thrown
+                question.showMessage(translate.withArguments("Mailbridge failed: user '%0' is unknown, contact an administrator.", [mailbridgeTitle]), question.ERROR, translate.text("Error"));
+        }
         // remove from cache
         mail.deleteMail(mailId)
         return sentMails > 0;
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 5a89f59926f91c80bc9e0adaa7f9845254eb5cf7..2c7e08724acada69ff850eb9eaf690b8fcbf7c58 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,7 +1,8 @@
+import("system.tools");
 import("system.vars");
 import("system.db");
+import("Attribute_lib");
 import("Sql_lib");
-import("system.tools");
 
 /**
  * Provides functions for employees and users.j
@@ -145,4 +146,42 @@ EmployeeUtils.isUser = function (pContactId)
 {
     var user = tools.getUserByAttribute(tools.CONTACTID, pContactId);
     return user != null;
+}
+
+/**
+ * Returns users department as corresponding attribute id.
+ * 
+ * @param {String} pContactId the contactId from the employee, from which you want the department back.
+ * @param {String} pDepartmentAsDisplayable the department as displayable value.
+ * @return {String} the department as corresponding attribute id or as displayable departmentname (e.g.: "Marketing", "Human Ressources").
+ */
+EmployeeUtils.getUsersDepartment = function(pContactId, pDepartmentAsDisplayable){
+    
+    var user = tools.getUsersByAttribute(tools.CONTACTID, [pContactId]);
+    var department = user[0][tools.PARAMS].department;
+    
+    if (pDepartmentAsDisplayable)
+    {
+       department = AttributeUtil.getSimpleAttributeName(department, true)
+    }
+    
+    return department;
+}
+
+/**
+ * Provides functions for employeesrole
+ * 
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function EmployeeRole () {}
+
+/**
+ * Provides the excludeed Roles of the Employee
+ * @return Array the Roles
+ */
+EmployeeRole.getExcludeRoles = function () 
+{
+    return ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
 }
\ No newline at end of file
diff --git a/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod b/process/Favorites_lib/Favorites_lib.aod
similarity index 75%
rename from process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
rename to process/Favorites_lib/Favorites_lib.aod
index 3162cdadf0282fcd2b3e418c1b3727179a745ff7..cae0fb68babcc9bc0d63f870308e1571808c527b 100644
--- a/process/FilterviewMenuAction_lib/FilterviewMenuAction_lib.aod
+++ b/process/Favorites_lib/Favorites_lib.aod
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
-  <name>FilterviewMenuAction_lib</name>
+  <name>Favorites_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <process>%aditoprj%/process/FilterviewMenuAction_lib/process.js</process>
+  <process>%aditoprj%/process/Favorites_lib/process.js</process>
   <variants>
     <element>LIBRARY</element>
   </variants>
diff --git a/process/Favorites_lib/process.js b/process/Favorites_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..04ae6f9b9e05ec23289c5eb0705427413573d741
--- /dev/null
+++ b/process/Favorites_lib/process.js
@@ -0,0 +1,58 @@
+import("system.translate");
+import("system.vars");
+import("system.favorite");
+import("system.tools");
+import("system.result");
+import("Sql_lib");
+
+function FavoritesUtil(){}
+
+FavoritesUtil.getUserFavoriteGroups = function()
+{
+    var allTypes = [];
+    var alias = favorite.getFavoritesAlias();
+
+    var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"], null, null, alias);
+
+    var groupNames = (new SqlBuilder(alias)).selectDistinct("ASYS_RECORDGROUP.TITLE")
+                            .from("ASYS_RECORDGROUP")
+                            .where(filterCond)
+                            .arrayColumn();
+    
+    for(var i = 0; i < groupNames.length; i++)
+    {
+        if(groupNames[i].equals("Default"))
+           allTypes.push([groupNames[i], translate.text(groupNames[i])]);
+        else
+           allTypes.push([groupNames[i], groupNames[i]]); 
+    }
+
+    return Array.from(allTypes);
+}
+
+
+
+FavoritesUtil.getRowIdsOfFavoriteGroup = function()
+{
+    var sysAlias = favorite.getFavoritesAlias();
+
+    var value = vars.get("$local.rawvalue");
+    var operator = vars.get("$local.operator") //noch zu implementieren
+
+    if(value && operator)
+    {
+        var filterCond = newWhere("ASYS_RECORDGROUP.TITLE", value, null, null, sysAlias); //Operators fehlen noch
+        filterCond.and(newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"], null, null, sysAlias));
+
+        var rowIds = new SqlBuilder(sysAlias).selectDistinct("ASYS_RECORD.ROW_ID")
+                                .from("ASYS_RECORD")
+                                .join("ASYS_RECORDGROUP", "ASYS_RECORD.RECORDGROUP_ID = ASYS_RECORDGROUP.ID")
+                                .where(filterCond)
+                                .arrayColumn();
+                                
+        return rowIds;
+    }
+    
+    return null;
+}
+    
\ No newline at end of file
diff --git a/process/FilterViewAction_lib/FilterViewAction_lib.aod b/process/FilterViewAction_lib/FilterViewAction_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..48c19eee90b9f6d0af7eef5c7d56053ce1cbb706
--- /dev/null
+++ b/process/FilterViewAction_lib/FilterViewAction_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>FilterViewAction_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/FilterViewAction_lib/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>LIBRARY</element>
+  </variants>
+</process>
diff --git a/process/FilterViewAction_lib/process.js b/process/FilterViewAction_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0fa04291d03107498b6eaf03adbe5aa17326186
--- /dev/null
+++ b/process/FilterViewAction_lib/process.js
@@ -0,0 +1,132 @@
+import("Util_lib");
+import("system.neon");
+import("Sql_lib");
+import("Context_lib");
+import("system.entities");
+
+/**
+ * Methods for the menu actions in the filterview.
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function FilterViewActionUtils() {}
+
+/**
+ * Loads all uids of the given context that can be found when the given filter is applied.
+ * 
+ * @param {String} pContext         the context
+ * @param {String|Object} pFilter   the filter to apply (content of "$sys.filter")
+ * @return {String[]} all uids that could be found
+ */
+FilterViewActionUtils.getUidsByEntityFilter = function (pContext, pFilter)
+{
+    if (Utils.isString(pFilter))
+        pFilter = JSON.parse(pFilter);
+    
+    //uids from Person and Organisation are loaded with simple sql queries because that's much faster than over the entity'
+    if (pContext == "Person" && "condition" in pFilter)
+    {
+        return new SqlBuilder()
+            .selectDistinct("CONTACT.CONTACTID")
+            .from("PERSON")
+            .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
+            .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+            .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+            .whereIfSet(pFilter.condition)
+            .arrayColumn();
+    }
+    if (pContext == "Organisation" && "condition" in pFilter)
+    {
+        return new SqlBuilder()
+            .selectDistinct("CONTACT.CONTACTID")
+            .from("PERSON")
+            .join("CONTACT", newWhere("ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID").and("CONTACT.PERSON_ID is null"))
+            .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+            .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
+            .whereIfSet(pFilter.condition)
+            .arrayColumn();
+    }
+    
+    //General solution to get the uids using entities.getRows
+    var loadRowsConfig = entities.createConfigForLoadingRows()
+        .entity(ContextUtils.getEntity(pContext))
+        .fields(["#UID"])
+        .filter(JSON.stringify(pFilter.filter || pFilter));
+        
+    return entities.getRows(loadRowsConfig).map(function (row)
+    {
+        return row["#UID"];
+    });
+}
+
+/**
+ * Loads uids depending on the given context, selection and filter. If there are uids in the given selection, these will be returned, otherwise
+ * the context and filter are used for getting the uids.
+ * 
+ * @param {String} pContext         the context
+ * @param {String[]} pSelection     selected uids ("$sys.selection")
+ * @param {String|Object} pFilter   the filter ("$sys.filter")
+ * @return {String[]} the uids that should be used
+ */
+FilterViewActionUtils.getUidsBySelectionOrFilter = function (pContext, pSelection, pFilter)
+{
+    if (Utils.isNullOrEmpty(pSelection) && pFilter)
+        return FilterViewActionUtils.getUidsByEntityFilter(pContext, pFilter);
+    return pSelection || [];
+}
+
+/**
+ * Generates an Array of all the contactIds using the filtercondition
+ * 
+ * @param {Condition} pCondition the condition of the filter
+ * 
+ * @return {Array} all the contactids limited by the filtercondition
+ */
+FilterViewActionUtils.contactIdsFilter = function (pCondition)
+{
+    let query = newSelect("distinct CONTACT.CONTACTID").from("CONTACT");
+    
+    query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+        .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .where(pCondition);
+
+    return query.arrayColumn();
+};
+
+/**
+ * Generates an Array of all the organisationContactIds using the filtercondition
+ * 
+ * @param {String} pCondition the condition of the filter
+ * 
+ * @return {Array} all the organisationContactIds (=contactIds of the organisations) limited by the filtercondition
+ */
+FilterViewActionUtils.organisationIdsFilter = function (pCondition)
+{
+    let query = newSelect("distinct CONTACT.CONTACTID").from("ORGANISATION")
+    
+    query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+        .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+        .where(pCondition)
+        .and("CONTACT.PERSON_ID is null");
+
+    return query.arrayColumn();
+};
+
+/**
+ * Retuns the componentstate using the rowcount.
+ * (used for the menu actions)
+ * 
+ * @param {pDataRowCount} pDataRowCount data row count (vars.get("$sys.datarowcount");)
+ * 
+ * @return {String} componentstate
+ */
+FilterViewActionUtils.getComponentStateByRowCount = function(pDataRowCount)
+{
+    if(pDataRowCount > 0)
+        return neon.COMPONENTSTATE_EDITABLE;
+    else
+        return neon.COMPONENTSTATE_DISABLED;
+};
\ No newline at end of file
diff --git a/process/FilterviewMenuAction_lib/process.js b/process/FilterviewMenuAction_lib/process.js
deleted file mode 100644
index 9dbcc8e25b9011540ed67392deab8b6d6488654d..0000000000000000000000000000000000000000
--- a/process/FilterviewMenuAction_lib/process.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import("system.neon");
-import("Sql_lib");
-/**
- * Methods for the menu actions in the filterview.
- * Do not create an instance of this!
- * 
- * @class
- */
-function FilterviewMenuActionUtils() {}
-
-/**
- * Generates an Array of all the contactIds using the filtercondition
- * 
- * @param {Condition} pCondition the condition of the filter
- * 
- * @return {Array} all the contactids limited by the filtercondition
- */
-FilterviewMenuActionUtils.contactIdsFilter = function (pCondition)
-{
-    let query = newSelect("distinct CONTACT.CONTACTID").from("CONTACT");
-    
-    query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
-        .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
-        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
-        .where(pCondition);
-
-    return query.arrayColumn();
-};
-
-/**
- * Generates an Array of all the organisationIds using the filtercondition
- * 
- * @param {String} pCondition the condition of the filter
- * 
- * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
- */
-FilterviewMenuActionUtils.organisationIdsFilter = function (pCondition)
-{
-    let query = newSelect("distinct ORGANISATION.ORGANISATIONID").from("ORGANISATION");
-    
-    query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
-        .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-        .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
-        .where(pCondition);
-
-    return query.arrayColumn();
-};
-
-/**
- * Retuns the componentstate using the rowcount.
- * (used for the menu actions)
- * 
- * @param {pDataRowCount} pDataRowCount data row count (vars.get("$sys.datarowcount");)
- * 
- * @return {String} componentstate
- */
-FilterviewMenuActionUtils.getComponentStateByRowCount = function(pDataRowCount)
-{
-    if(pDataRowCount > 0)
-        return neon.COMPONENTSTATE_EDITABLE;
-    else
-        return neon.COMPONENTSTATE_DISABLED;
-};
\ No newline at end of file
diff --git a/process/ImporterMappingFunctions_lib/process.js b/process/ImporterMappingFunctions_lib/process.js
index 27a4b5725fbfc5be68e9d42c5a498c3d132d8a25..1598b0c0d197065131f90b301d060411762ecb49 100644
--- a/process/ImporterMappingFunctions_lib/process.js
+++ b/process/ImporterMappingFunctions_lib/process.js
@@ -112,9 +112,9 @@ function iAttribute(pObject)
     var valueColumn = "";
     var attributes = attribute.split(".");   
     var columns = [ab_attributeId, attribute_parent_id, attribute_name, attribute_type, attribute_active];
-    var type = $AttributeTypes.GROUP.toString();
+    var type = AttributeTypes.GROUP();
 
-    if ($AttributeTypes[attributeType] == undefined) 
+    if (AttributeTypes[attributeType] == undefined) 
     {
         this.writeLog(this.LogLevels.Error, "iAttribute: " + attributeType + " isn't a valid attribute type.");
         return false;
@@ -122,12 +122,12 @@ function iAttribute(pObject)
 
     switch (attributeType) 
     {
-        case $AttributeTypes.COMBO.toString():
-            valueColumn = $AttributeTypes[attributeType].databaseField;
-            type = $AttributeTypes.COMBO.toString();
+        case AttributeTypes.COMBO():
+            valueColumn = AttributeTypes[attributeType].databaseField;
+            type = AttributeTypes.COMBO();
             break;
         default:
-            valueColumn = $AttributeTypes[attributeType].databaseField;
+            valueColumn = AttributeTypes[attributeType].databaseField;
     }
 
     if (funcBuffer == undefined) funcBuffer = {childs: {}};
@@ -184,19 +184,29 @@ function iAttribute(pObject)
         
         if (value && objectId) 
         {
-            id = newSelect(ab_attributeRelationId, alias).from(ab_attributeRelation).where(attrRel_ab_attribute_id, attributeId)
-                    .and(object_rowId, objectId).and(attrRel_object_type, objectType).cell();
-            
-            if (id == "" || id == null) 
+            var exisingAttrRelation = newSelect([ab_attributeRelationId, valueColumn], alias)
+                .from(ab_attributeRelation)
+                .where(attrRel_ab_attribute_id, attributeId)
+                .and(object_rowId, objectId)
+                .and(attrRel_object_type, objectType)
+                .arrayRow();
+             
+            if (exisingAttrRelation.length == 0)
             {
                 columns = [ab_attributeRelationId, attrRel_ab_attribute_id, attrRel_object_type, object_rowId, valueColumn];
                 values = [util.getNewUUID(), attributeId, objectType, objectId, value];
                 this.insertData(ab_attributeRelation, columns, null, values, alias);
-            } 
-            else if (this.Config.ImportCommand.indexOf("update") != -1)
+            }
+            else
             {
-                cond = ab_attributeRelationId + " = '" + id + "'";
-                this.updateData(ab_attributeRelation, [valueColumn], null, [value], cond, alias);
+                var existingValue;
+                [id, existingValue] = exisingAttrRelation;
+                //new value has to differ from the old (existing) value to prevent unneccesary updates
+                 if (this.Config.ImportCommand.indexOf("update") != -1 && value != null && value.toString() != existingValue)
+                {
+                    cond = ab_attributeRelationId + " = '" + id + "'";
+                    this.updateData(ab_attributeRelation, [valueColumn], null, [value], cond, alias);
+                }
             }
         }
     }    
@@ -358,23 +368,36 @@ function iComm(pObject) {
     var contact = this.InputRecord[pObject.ContactID];
     var standard = "0";
     
-    if(address == undefined) address = this.resolveSymbol(pObject, pObject.address);
-    if(medium == undefined) medium = this.resolveSymbol(pObject, pObject.medium);
+    if(address == undefined) address = this.resolveSymbol(pObject, pObject.Address);
+    if(medium == undefined) medium = this.resolveSymbol(pObject, pObject.Medium);
     if(contact == undefined) contact = this.resolveSymbol(pObject, pObject.ContactID);
     if(pObject.Standard) standard = "1";
     
     if(!address || !medium || !contact) return true;
     
-    var sql = "select " + this.getColumnCase("communicationid") + " from " + this.getTableCase("communication")
+    
+    var sql = "select " + this.getColumnCase("communicationid") + ", " + this.getColumnCase("addr") + " from " + this.getTableCase("communication")
         +" where " + this.getColumnCase("contact_id") + " = ? and " + this.getColumnCase("medium_id") + " = ? and "
-        + this.getColumnCase("isstandard") + " = ? and " + this.getColumnCase("addr") + " = ?"
-    var id = db.cell([sql, [[contact, SQLTYPES.CHAR], [medium, SQLTYPES.CHAR], //TODO: define types dynamically and not hardcoded
-        [standard, SQLTYPES.SMALLINT], [address, SQLTYPES.VARCHAR]]], this.Config.AliasTo);
-    if (id == "" || id == null) {
+        + this.getColumnCase("isstandard") + " = ?";
+    var existingData = db.array(db.ROW, [sql, [[contact, SQLTYPES.CHAR], [medium, SQLTYPES.CHAR], //TODO: define types dynamically and not hardcoded
+        [standard, SQLTYPES.SMALLINT]]], this.Config.AliasTo, 0, this.getConfiguredTimeout());
+        
+    if (existingData.length == 0)
+    {
         var columns = [this.getColumnCase("communicationid"), this.getColumnCase("addr"), 
-            this.getColumnCase("medium_id"), this.getColumnCase("contact_id"), this.getColumnCase("isstandard")];
+                this.getColumnCase("medium_id"), this.getColumnCase("contact_id"), this.getColumnCase("isstandard")];
         this.insertData(this.getTableCase("communication"), columns, null, [util.getNewUUID(), address, medium, contact, standard], this.Config.AliasTo);       
-    }    
+    }
+    else
+    {
+        var existingId = existingData[0];
+        var existingAddress = existingData[1];
+        if (address != existingAddress)
+        {
+            var cond = this.getColumnCase("communicationid") + " = '" + existingId + "'";
+            this.updateData(this.getTableCase("communication"), [this.getColumnCase("addr")], null, [address], cond, this.Config.AliasTo);
+        }
+    }
     return true;
 }
 
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index d1b033012d0f351cb92a7e2cb3e7154c12d2bcb3..a9e5a528933faecd47bc7480712b8a2114e3787b 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -1360,7 +1360,7 @@ function Importer(pConfig)
             if (tables[i] != "trace_xe_action_map" && tables[i] != "trace_xe_event_map")
             {
                 var cols = db.getColumns(tables[i], pAlias);
-                var types = db.getColumnTypes(tables[i], cols, pAlias);
+                var types = db.getColumnTypes(tables[i], cols, pAlias);//load once for better performance
                 dataTypes[ tables[i] ] = new Object();  // create sub-object to hold columns
                 for(var j=0; j < cols.length; j++) dataTypes[tables[i]][cols[j]] = types[j];
             }
diff --git a/process/IncomingCallExecutor_lib/process.js b/process/IncomingCallExecutor_lib/process.js
index 876bb084ac92bff28195ba4f3cb7dd53e986c430..9f6eb5534de86e24db2b5ecb56b9c0f4e42027c8 100644
--- a/process/IncomingCallExecutor_lib/process.js
+++ b/process/IncomingCallExecutor_lib/process.js
@@ -379,7 +379,7 @@ IncomingCallExecutor._getContactsFromNumber = function(pNumber, pContactIds)
         contactIds.
         */
         var patternConfig = indexsearch.createPatternConfig();
-        var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");
+        var searchTerm = indexsearch.createTerm(pNumber).setIndexField("phone");//phone contains right now the standard phone number
         patternConfig.plus(searchTerm);
         var pattern = indexsearch.buildPattern(patternConfig);
         var indexQuery = indexsearch.createIndexQuery().setPattern(pattern)
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index 4df4da2819ab541d1690481239bcfb4e96539c2b..369edee61bfbe69d51b524dd446a892fb06eea6d 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -1,6 +1,7 @@
 import("system.tools");
 import("system.logging");
 import("Sql_lib");
+import("Util_lib");
 import("system.datetime");
 
 /**
@@ -222,7 +223,7 @@ JditoFilterUtils.getSqlCondition = function (pFilter, pTable, pTableAlias, pColu
         for (let fieldName in pColumnOrFnMap)
         {
             var columnOrFn = pColumnOrFnMap[fieldName];
-            if (typeof columnOrFn === "function")
+            if (Utils.isFunction(columnOrFn))
                 filterTranslator.addSpecialFieldConditionFn(fieldName, columnOrFn);
             else
                 filterTranslator.addSqlFieldMapping(fieldName, columnOrFn);
@@ -269,7 +270,7 @@ FilterSqlTranslator.prototype.filter = function (pFilter)
 {
     if (pFilter)
     {
-        if (typeof pFilter !== "object")
+        if (!Utils.isObject(pFilter))
             throw new TypeError("FilterSqlTranslator: Wrong type for the filter, expected 'object' but got '" + (typeof pFilter) + "'");
         this._filter = pFilter.filter || pFilter;
     }
@@ -409,7 +410,7 @@ FilterSqlTranslator.prototype.getSqlCondition = function ()
                 sqlField = table + "." + pFilter.name;
             
             var generatedCondition = _getCondition(filterValue, pFilter.operator, sqlField);
-            if (generatedCondition instanceof SqlBuilder || typeof generatedCondition === "string")
+            if (generatedCondition instanceof SqlBuilder || Utils.isString(generatedCondition))
             {
                 if (pOperator == "AND")
                     this.andIfSet(generatedCondition);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b36a20300d7be1944e504670ad47bd02e705b235..aa1c2042a6007f78f2d2311d85b15f3e3e7db3c2 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -16,8 +16,6 @@
  * $KeywordRegistry.activityDirection()
  */
 function $KeywordRegistry(){}
-// this function can also be found as StringUtils.pad36() in Util_lib and is just here to avoid an import because this registry is heavily used.
-$KeywordRegistry._autoPad = function(pKey){return (pKey + "                                    ").slice(0, 36)}; 
 
 $KeywordRegistry.attributeType = function(){return "AttributeType";};
 $KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
@@ -132,6 +130,7 @@ $KeywordRegistry.salesprojectState$lost = function(){return "SALPROJSTATLOST";};
 
 $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
 $KeywordRegistry.salesprojectPhase$nqc = function(){return "SALPROJPHASENQC";};
+$KeywordRegistry.salesprojectPhase$nego = function(){return "SALPROJPHASENEGO";};
 
 $KeywordRegistry.taskPriority = function(){return "TaskPriority";};
 $KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE";};
@@ -276,22 +275,24 @@ $KeywordRegistry.workflowActivityType$intermediateCatchEvent = function(){return
 $KeywordRegistry.workflowActivityType$intermediateThrowEvent = function(){return "intermediateThrowEvent";};
 $KeywordRegistry.exportTemplateSeparator$tab = function(){return "TAB";};
 
-$KeywordRegistry.visitRecommendationPriority = function(){return $KeywordRegistry._autoPad("VisitRecommendationPriority");};
-$KeywordRegistry.visitRecommendationPriority$critical = function(){return $KeywordRegistry._autoPad("VISITPRIOCRITICAL");};
-$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return $KeywordRegistry._autoPad("VISITPRIOCVERYHIGH");};
-$KeywordRegistry.visitRecommendationPriority$high = function(){return $KeywordRegistry._autoPad("VISITPRIOHIGH");};
-$KeywordRegistry.visitRecommendationPriority$medium = function(){return $KeywordRegistry._autoPad("VISITPRIOMEDIUM");};
-$KeywordRegistry.visitRecommendationPriority$low = function(){return $KeywordRegistry._autoPad("VISITPRIOLOW");};
+$KeywordRegistry.visitRecommendationPriority = function(){return "VisitRecommendationPriority";};
+$KeywordRegistry.visitRecommendationPriority$critical = function(){return "VISITPRIOCRITICAL";};
+$KeywordRegistry.visitRecommendationPriority$veryHigh = function(){return "VISITPRIOCVERYHIGH";};
+$KeywordRegistry.visitRecommendationPriority$high = function(){return "VISITPRIOHIGH";};
+$KeywordRegistry.visitRecommendationPriority$medium = function(){return "VISITPRIOMEDIUM";};
+$KeywordRegistry.visitRecommendationPriority$low = function(){return "VISITPRIOLOW";};
 
-$KeywordRegistry.visitPlanEntryStatus = function(){return $KeywordRegistry._autoPad("VisitPlanEntryStatus");};
-$KeywordRegistry.visitPlanEntryStatus$planned = function(){return $KeywordRegistry._autoPad("VISITSTATUSPLANNED");};
-$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return $KeywordRegistry._autoPad("VISITSTATUSAPPPLANED");};
-$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return $KeywordRegistry._autoPad("VISITSTATUSREPORTCREATED");};
+$KeywordRegistry.visitPlanEntryStatus = function(){return "VisitPlanEntryStatus";};
+$KeywordRegistry.visitPlanEntryStatus$planned = function(){return "VISITSTATUSPLANNED";};
+$KeywordRegistry.visitPlanEntryStatus$Appointmentarranged = function(){return "VISITSTATUSAPPPLANED";};
+$KeywordRegistry.visitPlanEntryStatus$Visitreportcreated = function(){return "VISITSTATUSREPORTCREATED";};
 
-$KeywordRegistry.visitRecommendationPrioSource = function(){return $KeywordRegistry._autoPad("VisitRecommendationPrioSource");};
-$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return $KeywordRegistry._autoPad("VISITFREQUENCY");};
-$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $KeywordRegistry._autoPad("MANUAL");};
+$KeywordRegistry.visitRecommendationPrioSource = function(){return "VisitRecommendationPrioSource";};
+$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return "VISITFREQUENCY";};
+$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return "MANUAL";};
 
 $KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
 
-$KeywordRegistry.notificationState = function () { return "NotificationState";};
+$KeywordRegistry.notificationState = function(){ return "NotificationState";};
+$KeywordRegistry.notificationState$unseen = function(){return "UNSEEN";};
+$KeywordRegistry.notificationState$seen = function(){return "SEEN";};
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 9258ca92a7a1803f4abe5a162acc5859de100f29..a4201c301c22ba2d7b33777f894e829524a24d60 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -1,3 +1,4 @@
+import("Attribute_lib");
 import("ExportTemplate_lib");
 import("system.workflow");
 import("system.project");
@@ -152,9 +153,6 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
  */
 LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
 {
-    // set the mappings
-    LeadImportUtils.mapping = LeadImportUtils.getMapping(pImportDefID);
-    
     var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
     
     var orgid = "";
@@ -181,7 +179,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
         if (orgRet[3])//not a new organisation
         {
             LeadImportUtils.insertAttr(pDataFields, pDataTypes, pFieldDef, LeadValues, orgContactId, orgObjID, pUser, pDate);
-            LeadImportUtils.insertComm(pDataFields, pDataTypes, LeadValues, orgContactId, pUser, pDate);
+            LeadImportUtils.insertComm(pDataFields, pDataTypes, LeadValues, orgContactId, pUser, pDate, orgObjID);
         }
     }
     //------create person
@@ -195,7 +193,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
         persForDubCheck = persRet[2];
 
         LeadImportUtils.insertAttr(pDataFields, pDataTypes, pFieldDef, LeadValues, persContactId, persObjID , pUser, pDate);
-        LeadImportUtils.insertComm(pDataFields, pDataTypes, LeadValues, persContactId, pUser, pDate);
+        LeadImportUtils.insertComm(pDataFields, pDataTypes, LeadValues, persContactId, pUser, pDate, persObjID);
     }
     //------create activitys for organisation and person
     var activityData = 
@@ -328,13 +326,7 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
         {
             if (pFieldValues[ pFieldDef[i][0]] != undefined) 
             {
-                if (LeadImportUtils.mapping != undefined && 
-                    LeadImportUtils.mapping[pFieldDef[i][1]] != undefined && 
-                    LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]] != undefined) 
-                {
-                    // mapping is available and is set
-                    pFieldValues[pFieldDef[i][0]] = LeadImportUtils.mapping[pFieldDef[i][1]][pFieldValues[pFieldDef[i][0]]];
-                }
+                pFieldValues[pFieldDef[i][0]] = LeadImportUtils.getMappedOutputvalue(pFieldDef[i][1], pFieldValues[pFieldDef[i][0]]);
                     
                 dataValues[pFieldDef[i][1]] = pFieldValues[pFieldDef[i][0]];
             }
@@ -347,6 +339,26 @@ LeadImportUtils.setValues  = function(pFields, pFieldDef, pFieldValues)
     return dataValues;
 }
 
+/**
+ * Get the mapped outputvalue of the inputvalue.
+ * Thes are the mapping of the mapping-tab in the Leadimport
+ *
+ * @param {String} pField field
+ * @param {String} pInputValue import values
+ *
+ * @return {String} outputvalue
+ */
+LeadImportUtils.getMappedOutputvalue = function (pField, pInputValue) {
+    if (LeadImportUtils.mapping != undefined && 
+        LeadImportUtils.mapping[pField] != undefined && 
+        LeadImportUtils.mapping[pField][pInputValue] != undefined) 
+    {
+        // mapping is available and is set
+        return LeadImportUtils.mapping[pField][pInputValue];
+    }
+    return pInputValue;
+}
+
 /**
  * returns import fields
  *
@@ -468,10 +480,11 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
  * @param {String} contactId CONTACTID
  * @param {String} pUser the importuser
  * @param {String} pDate the importdate
+ * @param {String} pObjectID ID of the object
  * 
  * @return {void}
  */
-LeadImportUtils.insertComm = function(pDataFields, pDataTypes, pLeadValues, contactId, pUser, pDate)
+LeadImportUtils.insertComm = function(pDataFields, pDataTypes, pLeadValues, contactId, pUser, pDate, pObjectID)
 {
     var Fields = pDataFields["COMMUNICATION"];
     var commMedium = KeywordUtils.getEntryNamesAndIdsByContainer("CommunicationMedium");
@@ -485,12 +498,13 @@ LeadImportUtils.insertComm = function(pDataFields, pDataTypes, pLeadValues, cont
     for (let i = 0; i < commMedium.length; i++)
     {
         var medium = commMedium[i][0].trim(); //e. g. COMMMOBIL, COMMMAIL
+        let value = pLeadValues[pObjectID.charAt(0) + "_" + medium];
 
-        if (pLeadValues[medium] != undefined && pLeadValues[medium] != "")
+        if (value != undefined && value != "")
         {
             DataValues[ "MEDIUM_ID" ] = medium; //e. g. COMMMOBIL
-            DataValues[ "ADDR" ] = pLeadValues[medium];//e. g. +49 123 45678900
-            DataValues[ "ISSTANDARD" ] = 1;//insert only standard communication data
+            DataValues[ "ADDR" ] = value; //e. g. +49 123 45678900
+            DataValues[ "ISSTANDARD" ] = 1; //insert only standard communication data
             DataValues[ "COMMUNICATIONID" ] = "";
             LeadImportUtils.insertTable(pDataFields, pDataTypes, DataValues, "COMMUNICATION", pUser, pDate);
         }
@@ -525,7 +539,6 @@ LeadImportUtils.insertOrg = function(pDataFields, pDataTypes,  pFieldDef, pField
         ContactValues["STATUS"] = "CONTACTSTATACTIVE";
         ContactValues["ORGANISATION_ID"] = orgid;
         ContactValues["ADDRESS_ID"] = util.getNewUUID();
-        ContactValues["ISOLANGUAGE"] = "";
         var contactId =  LeadImportUtils.insertTable(pDataFields, pDataTypes, ContactValues, "CONTACT", pUser, pDate);
     
         //address
@@ -578,7 +591,8 @@ LeadImportUtils.insertOrg = function(pDataFields, pDataTypes,  pFieldDef, pField
  */
 LeadImportUtils.insertPers = function(pDataFields, pDataTypes,  pFieldDef, pFieldValues, pOrgId, pLeadValues, pUser, pDate)
 {
-    var isoLanguage = LeadImportUtils.checkISOLanguage(pLeadValues["ISOLANGUAGE"]);
+    var isoLanguage = pLeadValues["ISOLANGUAGE"] ? pLeadValues["ISOLANGUAGE"] : "deu";
+    
     //Person
     var PersValues = LeadImportUtils.setValues(pDataFields["PERSON"], pFieldDef, pFieldValues);
     PersValues["TITLE"] = ContactInfoUtils.getTitle(pLeadValues, isoLanguage);
@@ -595,23 +609,32 @@ LeadImportUtils.insertPers = function(pDataFields, pDataTypes,  pFieldDef, pFiel
     ContactValues["DEPARTMENT"] = ContactInfoUtils.getContactDepartment(pLeadValues);
     ContactValues["CONTACTROLE"] = ContactInfoUtils.getContactRole(pLeadValues);
     ContactValues["CONTACTPOSITION"] = ContactInfoUtils.getContactPosition(pLeadValues);
-    ContactValues["CONTACTPOSITION"] = ContactInfoUtils.getContactPosition(pLeadValues);
     
     if (pOrgId == "")//private
+    {
         ContactValues["ORGANISATION_ID"] = 0;
+        ContactValues["ADDRESS_ID"] = util.getNewUUID();
+    }
     else
+    {
         ContactValues["ORGANISATION_ID"] = pOrgId;
+        ContactValues["ADDRESS_ID"] = 0
+    }
+        
     
     var contactId =  LeadImportUtils.insertTable(pDataFields, pDataTypes, ContactValues, "CONTACT", pUser, pDate);
     
     //Address
-    var AddrValues = LeadImportUtils.setValues(pDataFields["ADDRESS"], pFieldDef, pFieldValues);
-    AddrValues["ADDRESSID"] = ContactValues["ADDRESS_ID"];
-    AddrValues["ADDR_TYPE"] = "HOMEADDR";
-    AddrValues["CONTACT_ID"] = contactId;
-    LeadImportUtils.insertTable(pDataFields, pDataTypes, AddrValues, "ADDRESS", pUser, pDate);
-
-    var entityFieldValues = LeadImportUtils.getEntityFieldsPers(PersValues, ContactValues, AddrValues);
+    if (ContactValues["ADDRESS_ID"])
+    {
+        var AddrValues = LeadImportUtils.setValues(pDataFields["ADDRESS"], pFieldDef, pFieldValues);
+        AddrValues["ADDRESSID"] = ContactValues["ADDRESS_ID"];
+        AddrValues["ADDR_TYPE"] = "HOMEADDR";
+        AddrValues["CONTACT_ID"] = contactId;
+        LeadImportUtils.insertTable(pDataFields, pDataTypes, AddrValues, "ADDRESS", pUser, pDate);
+    }
+    
+    var entityFieldValues = LeadImportUtils.getEntityFieldsPers(PersValues, ContactValues);
     
     return new Array(persid, contactId, entityFieldValues);
 }
@@ -689,32 +712,32 @@ LeadImportUtils.insertLeadAttr  = function(pAttrObject, orgid, persid, pUser, pD
 {
     for (var i = 0; i < pAttrObject["Values"].length; i++)
     {
-        var AttrValues = pAttrObject["Values"][i];
+        let attrValues = pAttrObject["Values"][i];
 
         // Attribute for the Organisation
         if (orgid != "" && pInsertOrgAttr)
         {
-            AttrValues[0] = "Organisation";
-            AttrValues[7] = newSelect("CONTACTID")
+            attrValues[0] = "Organisation";
+            attrValues[7] = newSelect("CONTACTID")
                                 .from("CONTACT")
                                 .where("CONTACT.ORGANISATION_ID", orgid)
                                 .and("CONTACT.PERSON_ID is null")
                                 .cell();
                                 
-            LeadImportUtils.sqlInsertAttr(pAttrObject, AttrValues, pUser, pDate);
+            LeadImportUtils.sqlInsertAttr(pAttrObject, attrValues, pUser, pDate);
         }
         // Attribute für the Person
         if (persid != "")
         {
-            AttrValues[0] = "Person";
+            attrValues[0] = "Person";
             if (orgid == "")	orgid = "0";  // Private
-            AttrValues[7] = newSelect("CONTACT.CONTACTID")
+            attrValues[7] = newSelect("CONTACT.CONTACTID")
                                 .from("CONTACT")
                                 .where("CONTACT.ORGANISATION_ID", orgid)
                                 .and("CONTACT.PERSON_ID", persid)
                                 .cell();
 
-            LeadImportUtils.sqlInsertAttr(pAttrObject, AttrValues, pUser, pDate);
+            LeadImportUtils.sqlInsertAttr(pAttrObject, attrValues, pUser, pDate);
         }
     }
 }
@@ -731,14 +754,16 @@ LeadImportUtils.insertLeadAttr  = function(pAttrObject, orgid, persid, pUser, pD
  */
 LeadImportUtils.sqlInsertAttr = function(pAttrObject, pAttrValues, pUser, pDate)
 {
+    if (AttributeUtil.getPossibleAttributes(pAttrValues[0]).indexOf(pAttrValues[1]) == -1)
+        return;
     pAttrValues[8] = util.getNewUUID();
     pAttrValues[9] = pUser;
     pAttrValues[10] = pDate;
     
     let countAttributes = newSelect("count(*)")
                         .from("AB_ATTRIBUTERELATION")
-                        .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", AttrValues[7])
-                        .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", attrdata[1][0])
+                        .where("AB_ATTRIBUTERELATION.OBJECT_ROWID", pAttrValues[7])
+                        .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttrValues[1])
                         .cell();
     if (countAttributes == 0) {
         db.insertData("AB_ATTRIBUTERELATION", pAttrObject["Fields"] , pAttrObject["Types"], pAttrValues);
@@ -835,12 +860,11 @@ LeadImportUtils.getEntityFieldsOrg = function(pOrgDataFields, pContactDataFields
  * maps the DB-Field to the ENTITY-Field
  * 
  * @param {Object} pPersDataFields the the PERSON values; 
- * @param {Object} pContactDataFields the CONTACT values; 
- * @param {Object} pAddressDataFields the ADDRESS values; 
+ * @param {Object} pContactDataFields the CONTACT values;
  * 
  * @return {Object} the mapping
  */
-LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFields, pAddressDataFields)
+LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFields)
 {
     var EntityPersFieldObj = {};
     EntityPersFieldObj["CONTACTID"] = pContactDataFields["CONTACTID"];
@@ -882,19 +906,19 @@ LeadImportUtils.scanLeadDups = function(pAllContactData)
         
         if (orgObj != undefined && Object.keys(orgObj).length > 0)//checks if there is an ORGANISATIONDUPLICATE
         {
-            let scanResultsOrg = DuplicateScannerUtils.ScanForDuplicates("OrganisationDuplicates", "Organisation_entity", orgObj, null);
+            let scanResultsOrg = DuplicateScannerUtils.scanForDuplicates("OrganisationDuplicates", "Organisation_entity", orgObj, null);
             if (scanResultsOrg != null && scanResultsOrg.length > 0)
             {
-                let insertCountOrg = DuplicateScannerUtils.CacheNewScanResults(orgObj["CONTACTID"], scanResultsOrg, "Organisation_entity");
+                let insertCountOrg = DuplicateScannerUtils.cacheNewScanResults(orgObj["CONTACTID"], scanResultsOrg, "Organisation_entity");
                 dupOrg = true;
             }
         }
         if (persObj != undefined && Object.keys(persObj).length > 0)//checks if there is an PERSONDUPLICATE
         {
-            let scanResultsPers = DuplicateScannerUtils.ScanForDuplicates("PersonDuplicates", "Person_entity", persObj, null);
+            let scanResultsPers = DuplicateScannerUtils.scanForDuplicates("PersonDuplicates", "Person_entity", persObj, null);
             if (scanResultsPers != null && scanResultsPers.length > 0)
             {
-                let insertCountPers = DuplicateScannerUtils.CacheNewScanResults(persObj["CONTACTID"], scanResultsPers, "Person_entity");
+                let insertCountPers = DuplicateScannerUtils.cacheNewScanResults(persObj["CONTACTID"], scanResultsPers, "Person_entity");
                 dupPers = true;
             }
         }
@@ -1020,17 +1044,7 @@ function ContactInfoUtils() {}
  */
 ContactInfoUtils.getContactDepartment = function(pLeadValues)
 {
-    if (pLeadValues["DEPARTMENT"] != undefined && pLeadValues["DEPARTMENT"] != "")
-    {
-        var department = KeywordUtils.getEntryNamesByContainer("ContactDepartment");
-    
-        for (let i = 0; i < department.length; i++)
-        {
-            if (pLeadValues["DEPARTMENT"].trim() == department[i].trim())
-                return department[i];
-        }
-    }
-    return "";
+    return ContactInfoUtils.getEntryNameByContainerAndFieldValue("ContactDepartment", pLeadValues["DEPARTMENT"]);
 };
 
 /**
@@ -1042,17 +1056,7 @@ ContactInfoUtils.getContactDepartment = function(pLeadValues)
  */
 ContactInfoUtils.getContactPosition = function(pLeadValues)
 {   
-    if (pLeadValues["CONTACTPOSITION"] != undefined && pLeadValues["CONTACTPOSITION"] != "")
-    {
-        var position = KeywordUtils.getEntryNamesByContainer("ContactPosition");
-
-        for (let i = 0; i < position.length; i++)
-        {
-            if (pLeadValues["CONTACTPOSITION"].trim() == position[i].trim())
-                return position[i];
-        }
-    }
-    return "";
+    return ContactInfoUtils.getEntryNameByContainerAndFieldValue("ContactPosition", pLeadValues["CONTACTPOSITION"]);
 };
 
 /**
@@ -1064,17 +1068,7 @@ ContactInfoUtils.getContactPosition = function(pLeadValues)
  */
 ContactInfoUtils.getContactRole = function(pLeadValues)
 {
-    if (pLeadValues["CONTACTROLE"] != undefined && pLeadValues["CONTACTROLE"] != "")
-    {
-        var role = KeywordUtils.getEntryNamesByContainer("ContactContactrole");
-  
-        for (let i = 0; i < role.length; i++)
-        {
-            if (pLeadValues["CONTACTROLE"].trim() == role[i].trim())
-                return role[i];
-        }
-    }
-    return "";
+    return ContactInfoUtils.getEntryNameByContainerAndFieldValue("ContactContactrole", pLeadValues["CONTACTROLE"]);
 };
 
 /**
@@ -1086,14 +1080,27 @@ ContactInfoUtils.getContactRole = function(pLeadValues)
  */
 ContactInfoUtils.getGender = function(pLeadValues)
 {
-    if (pLeadValues["GENDER"] != undefined && pLeadValues["GENDER"] != "")
+    return ContactInfoUtils.getEntryNameByContainerAndFieldValue("PersonGender", pLeadValues["GENDER"]);
+};
+
+/**
+ * Gets the keyword value if it is set and it is a correct value
+ * 
+ * @param {Object} pContainerName the name of the KeywordContainer;
+ * @param {Object} pFieldValue the value of the field for the keyword;
+ * 
+ * @return {String} the keywordvalue
+ */
+ContactInfoUtils.getEntryNameByContainerAndFieldValue = function(pContainerName, pFieldValue)
+{
+    if (pFieldValue != undefined && pFieldValue != "")
     {
-        var gender = KeywordUtils.getEntryNamesByContainer("PersonGender");
+        let keyword = KeywordUtils.getEntryNamesAndIdsByContainer(pContainerName);
 
-        for (let i = 0; i < gender.length; i++)
+        for (let i = 0; i < keyword.length; i++)
         {
-            if (pLeadValues["GENDER"].trim() == gender[i].trim())
-                return gender[i];
+            if (pFieldValue.trim() == keyword[i][0].trim() || pFieldValue.trim() == keyword[i][1].trim())
+                return keyword[i][0];
         }
     }
     return "";
diff --git a/process/Liquibase_lib/process.js b/process/Liquibase_lib/process.js
index 09973aa50b9da66a5ffe9810f76762c3bdf9cf97..65cfed3485bd752f8321603ffde1ad9b411c99ac 100644
--- a/process/Liquibase_lib/process.js
+++ b/process/Liquibase_lib/process.js
@@ -67,19 +67,24 @@ LiquiUtils.exportAllTablesAsLiquibaseFiles = function(pOutFolderPath, pAuthor, p
 * @param {Boolean} [pIncludeClearTableDirective=false] if true, a delete element is added at the beginning of the changeset for the table
 * @param {String} [pAlias=current db-alias] alias where the data will be loaded from
 * @param {Boolean} [pGenerateChangeSetIdFromArguments=false] if true the id of the changeset will be generated by the passed arguments to this function
+* @param {function} [pBlobCallbackFn=undefined] function that returns the filename for a stored file (only for BLOB-databasetypes). <br/>
+*                                               if nothing is specified, the filename is generated automatically with a hash of the content <br />
+*                                               The callback function retrieves all the arguments of the LiquiXTable.prototype.addBlobCol-function
+* @param {String} [pFileName=«pTableName».xml] name of the changelog file (without the .xml extension) <br/>
+*                                              If nothing is specified the file is named based on the tablename that is exported 
 *
 * @return {Object} returns an object that has currently only one property<br/>- exported:boolean if the table has been exported or not
 */
-LiquiUtils.exportTableAsLiquibaseFiles = function(pPath, pTableName, pColumns, pCondition, pAuthor, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments)
+LiquiUtils.exportTableAsLiquibaseFiles = function(pPath, pTableName, pColumns, pCondition, pAuthor, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments, pBlobCallbackFn, pFileName)
 {
-    var resXml = LiquiUtils._getDataXml(pAuthor, pPath, pTableName, pColumns, pCondition, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments);
+    var resXml = LiquiUtils._getDataXml(pAuthor, pPath, pTableName, pColumns, pCondition, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments, pBlobCallbackFn);
     if (resXml == "")
         return {exported: false};
-    
+    var fileName = pFileName || pTableName;
     fileIO.mkdir(pPath, true);
-    var fullFileName = pPath += "/" + pTableName + ".xml";
+    var fullFileName = pPath += "/" + fileName + ".xml";
     fileIO.storeData(fullFileName, resXml, util.DATA_TEXT, false, "UTF8");
-    return {exported: true};
+    return {exported: true, fileName: fileName};
 };
 
 /**
@@ -97,10 +102,13 @@ LiquiUtils.exportTableAsLiquibaseFiles = function(pPath, pTableName, pColumns, p
 * @param {Boolean} [pIncludeClearTableDirective=false] if true, a delete element is added at the beginning of the changeset for the table
 * @param {String} [pAlias=current db-alias] alias where the data will be loaded from
 * @param {Boolean} [pGenerateChangeSetIdFromArguments=false] if true the id of the changeset will be generated by the passed arguments to this function
+* @param {function} [pBlobCallbackFn=undefined] function that returns the filename for a stored file (only for BLOB-databasetypes). <br/>
+*                                               if nothing is specified, the filename is generated automatically with a hash of the content <br/>
+*                                               The callback function retrieves all the arguments of the LiquiXTable.prototype.addBlobCol-function
 *
 * @return {String} the liquibase-changest in xml-form
 */
-LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCondition, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments) 
+LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCondition, pIncludeClearTableDirective, pAlias, pGenerateChangeSetIdFromArguments, pBlobCallbackFn) 
 {
     var author = pAuthor || "autogenerated";
     var alias = pAlias || db.getCurrentAlias();
@@ -111,7 +119,7 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
     var dbData = db.table("select " + columns.join(", ") + " from " + pTableName + " " + (pCondition ? "where " + pCondition : ""), alias);
     if (dbData.length == 0)
         return "";
-    var colTypes = db.getColumnTypes(pTableName, columns, alias);
+    var colTypes = db.getColumnTypes(pTableName, columns, alias);//needed to determine the correct liquibase function
     //every type has its function that accepts a columnName- and a value-parameter
     //so let's dertermine once the corresponding funtion to its type for faster access 
     //(the function will only depend on the type and not change per datarow - so no need to determine the correct function per datarow)
@@ -128,7 +136,7 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
         else if(SQLTYPES.isLOBType(colType))
         {
             if ([SQLTYPES.BLOB, SQLTYPES.LONGVARBINARY, SQLTYPES.VARBINARY].indexOf(colType) != -1)
-                return LiquiXTable.prototype.addBlobCol;
+                return (function (pTab, pCol, pRow){ return this.addBlobCol(pTab, pCol, pRow, pBlobCallbackFn);});
             else
                return  LiquiXTable.prototype.addClobCol;
         }
@@ -151,6 +159,9 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
         changeLogXml.changeSet.appendChild(<delete tableName={pTableName}/>);
     dbData.forEach(function(row)
     {
+        var rowObj = {};
+        for (let i = 0; i < columnLen; i++)
+            rowObj[columns[i]] = row[i];
         var tableXml = LiquiXTable.make(pTableName);
         if (pLobPath)
             tableXml.setLobBasePath(pLobPath);
@@ -160,7 +171,7 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
             var value = row[i];
             var fnToUse = colCallbackFn[i];
             if (fnToUse != null)
-                fnToUse.call(tableXml, colName, value)
+                fnToUse.call(tableXml, colName, value, rowObj)
         }
         changeLogXml.changeSet.insert += tableXml.xml;
     });
@@ -306,7 +317,7 @@ LiquiXTable.prototype.addClobCol = function (pColName, pValue)
     }
 };
 
-LiquiXTable.prototype.addBlobCol = function (pColName, pValue)
+LiquiXTable.prototype.addBlobCol = function (pColName, pValue, pRow, pFileNameCallback)
 {
     if (pValue == "")
         return this;
@@ -315,7 +326,11 @@ LiquiXTable.prototype.addBlobCol = function (pColName, pValue)
             throw new Error(translate.withArguments("[%0]it was necessary to create a file from a blob-field but no lob-file-path was specified."
                 + "The lob-file-path is required when adding blob-values.", ["LiquiXTable addClobCol"]));
     var relativeFolderPath = this._name + "/" + pColName + "/blobFiles/";
-    var fileName = text.hash(pValue, text.HASH_MD5);
+    var fileName;
+    if (pFileNameCallback)
+        fileName = pFileNameCallback.apply(this, arguments);
+    if (!fileName)
+        fileName = text.hash(pValue, text.HASH_MD5);
     fileIO.mkdir(lobBasePath + relativeFolderPath, true);
     fileIO.storeData(lobBasePath + relativeFolderPath + fileName, pValue, util.DATA_BINARY, false);
     return this.appendIfNotNull(LiquiXmlUtils.colValue(pColName, relativeFolderPath + fileName, "valueBlobFile"));
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index a5eb0b3129038bb2d749b1afd2732e2c19d39dad..b758e7db586995f24a7a3051427e610e5e053b7f 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -380,7 +380,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
                 vals.push(colMapping[col].newValue.toString());
             }
 
-            var colTypes = db.getColumnTypes(destTable, cols)
+            var colTypes = db.getColumnTypes(destTable, cols)//load once for better performance
 
             return [destTable, cols, colTypes, vals];
         }
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 3ba48d7e1d7ddd87f6e07038e6601034abac295e..7c9504fa26da75fa05ae7753f287070f922dd250 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -384,9 +384,8 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
  * @param pLanguage {String} language
  * @param pCurrency {String} [currency=""]
  * @param pAddress {String} [address=""]
- * @param pHeader {String} [header=""]
  */
-OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pHeader)
+OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress)
 {  
         var fieldparams = 
         {
@@ -394,7 +393,6 @@ OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLa
         "$field.ISOLANGUAGE" : pLanguage,
         "$field.OFFER_ID" : pOfferId,
         "$field.CURRENCY" : pCurrency || "",
-        "$field.HEADER" : pHeader || "",
         "$field.PAYMENTADDRESS" : pAddress || "",
         "$field.OBJECT_TYPE" : pContextId || "",
         "$field.OBJECT_ROWID" : pRowId || ""
diff --git a/process/PermissionCalendar_lib/process.js b/process/PermissionCalendar_lib/process.js
index 56c7388c901a63a865403ecd30e0e4cf736debac..5fdc9fb6c34ca9533b4bbf052e586d6f6226c608 100644
--- a/process/PermissionCalendar_lib/process.js
+++ b/process/PermissionCalendar_lib/process.js
@@ -264,7 +264,6 @@ PermissionCalendar.getTree = function(pCurrentUser)
         PermissionCalendar._getDataRecursive(root[0], pCurrentUser, permissions, user, resultArr);    
     
     return resultArr;
-    resultArr = [];
 };
 
 /**
diff --git a/process/RebuildAllDuplicateCaches_serverProcess/process.js b/process/RebuildAllDuplicateCaches_serverProcess/process.js
index 900db39e93276f4e204d596255e67796bb3ba745..b08a0abf9efa74df1e609510b0cd09d63a06d1bf 100644
--- a/process/RebuildAllDuplicateCaches_serverProcess/process.js
+++ b/process/RebuildAllDuplicateCaches_serverProcess/process.js
@@ -24,16 +24,16 @@ import("DuplicateScanner_lib");
 
 var filterName = "PersonDuplicates";
 var targetEntity = "Person_entity";
-var recordBlockSize = DuplicateScannerUtils.GetBlockSize();
+var recordBlockSize = DuplicateScannerUtils.getBlockSize();
 
 logging.log(filterName + ": Delete duplicates -> ");
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 
 logging.log(filterName + ": Recalculate duplicates -> ");
-DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
+DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
 
 logging.log(filterName + ": Refresh unrelated duplicates -> ");
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 logging.log(filterName + ": Done rebuilding ");
 
@@ -44,12 +44,12 @@ filterName = "OrganisationDuplicates";
 targetEntity = "Organisation_entity";
 
 logging.log(filterName + ": Delete duplicates -> ");
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 
 logging.log(filterName + ": Recalculate duplicates -> ");
-DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
+DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
 
 logging.log(filterName + ": Refresh unrelated duplicates -> ");
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 logging.log(filterName + ": Done rebuilding ");
\ No newline at end of file
diff --git a/process/RebuildDuplicatesCache_serverProcess/process.js b/process/RebuildDuplicatesCache_serverProcess/process.js
index 4a932ce9b3afb63b398e6c19663c60de559e3e1e..1e7f532f75a8b4a36d1c06de9cc4503bf6f74c62 100644
--- a/process/RebuildDuplicatesCache_serverProcess/process.js
+++ b/process/RebuildDuplicatesCache_serverProcess/process.js
@@ -25,16 +25,16 @@ import("DuplicateScanner_lib");
 
 var filterName = vars.get("$local.filterName");
 var targetEntity = vars.get("$local.targetEntity");
-var recordBlockSize = DuplicateScannerUtils.GetBlockSize();
+var recordBlockSize = DuplicateScannerUtils.getBlockSize();
 
 logging.log(filterName + ": Delete duplicates -> ");
-DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
+DuplicateScannerUtils.deleteClustersByTargetEntity(targetEntity);
 
 logging.log(filterName + ": Recalculate duplicates -> ");
-DuplicateScannerUtils.RebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
+DuplicateScannerUtils.rebuildDuplicatesCache(filterName, targetEntity, recordBlockSize, null);
 
 logging.log(filterName + ": Refresh unrelated duplicates -> ");
-DuplicateScannerUtils.RefreshUnrelatedDuplicateRelations(targetEntity);
+DuplicateScannerUtils.refreshUnrelatedDuplicateRelations(targetEntity);
 
 logging.log(filterName + ": Done rebuilding ");
 
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index ba5bbada8c524289541fe6be8ff5bad25ac8098a..53974b0854233bf64338f7423e1ac1c2bb6f5e0d 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -52,16 +52,16 @@ Salesproject.validateProjectNumber = function(projectNumber) {
 Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForecast) {
     if (KeywordUtils.exists(value, type)) {
         var id = newSelect("SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID")
-                    .from("SALESPROJECT_MILESTONE")
-                    .where("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
-                    .and("SALESPROJECT_MILESTONE.KIND", type)
-                    .and("SALESPROJECT_MILESTONE.DATE_END is null")
-                    .cell();       
+        .from("SALESPROJECT_MILESTONE")
+        .where("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
+        .and("SALESPROJECT_MILESTONE.KIND", type)
+        .and("SALESPROJECT_MILESTONE.DATE_END is null")
+        .cell();       
         
         newWhere("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
-            .and("SALESPROJECT_MILESTONE.KIND", type)
-            .and("SALESPROJECT_MILESTONE.DATE_END is null")
-            .updateData(true, "SALESPROJECT_MILESTONE", ["DATE_END"], null, [vars.get("$sys.date")]);
+        .and("SALESPROJECT_MILESTONE.KIND", type)
+        .and("SALESPROJECT_MILESTONE.DATE_END is null")
+        .updateData(true, "SALESPROJECT_MILESTONE", ["DATE_END"], null, [vars.get("$sys.date")]);
         
         db.insertData(
             "SALESPROJECT_MILESTONE",
@@ -93,9 +93,9 @@ Salesproject.notifyToUpdateForecast = function() {
 Salesproject.getSalesProjectTitleById = function(pSalesProjectId)
 {
     return newSelect("PROJECTTITLE")
-                .from("SALESPROJECT")
-                .where("SALESPROJECT.SALESPROJECTID", pSalesProjectId)
-                .cell();
+    .from("SALESPROJECT")
+    .where("SALESPROJECT.SALESPROJECTID", pSalesProjectId)
+    .cell();
 }
 
 /**
@@ -118,11 +118,11 @@ Salesproject.createNewSalesprojectFromOrg = function(pRelationId, pSalesprojectN
 {
     var uid = util.getNewUUID();
     db.insertData(
-            "SALESPROJECT",
-            ["SALESPROJECTID", "CONTACT_ID", "PROJECTTITLE", "PROJECTCODE", "STARTDATE", "STATUS", "PHASE"],
-            null,
-            [uid, pRelationId, pSalesprojectName, Salesproject.getNextProjectNumber(), 
-                vars.get("$sys.date"), $KeywordRegistry.salesprojectState$open(), $KeywordRegistry.salesprojectPhase$nqc()]); 
+        "SALESPROJECT",
+        ["SALESPROJECTID", "CONTACT_ID", "PROJECTTITLE", "PROJECTCODE", "STARTDATE", "STATUS", "PHASE"],
+        null,
+        [uid, pRelationId, pSalesprojectName, Salesproject.getNextProjectNumber(), 
+        vars.get("$sys.date"), $KeywordRegistry.salesprojectState$open(), $KeywordRegistry.salesprojectPhase$nqc()]); 
     return uid;        
                   
 }
@@ -134,10 +134,10 @@ Salesproject.insertTouchPoint = function(pSalesprojectId, pTouchPoint, pInfo)
 {
     var uid = util.getNewUUID();
     db.insertData(
-            "SALESPROJECT_TOUCHPOINT",
-            ["SALESPROJECT_TOUCHPOINTID", "SALESPROJECT_ID", "ENTRYDATE", "INFO", "TOUCHPOINT"],
-            null,
-            [uid, pSalesprojectId, vars.get("$sys.date"), pInfo, pTouchPoint]); 
+        "SALESPROJECT_TOUCHPOINT",
+        ["SALESPROJECT_TOUCHPOINTID", "SALESPROJECT_ID", "ENTRYDATE", "INFO", "TOUCHPOINT"],
+        null,
+        [uid, pSalesprojectId, vars.get("$sys.date"), pInfo, pTouchPoint]); 
     return uid;                         
 }
 
@@ -147,5 +147,106 @@ Salesproject.insertTouchPoint = function(pSalesprojectId, pTouchPoint, pInfo)
 Salesproject.updateSalesprojectPhase = function(pSalesprojectId, pPhase)
 {
     newWhere("SALESPROJECT.SALESPROJECTID", pSalesprojectId)
-        .updateData(true, "SALESPROJECT", ["PHASE"], null, [pPhase]);                      
+    .updateData(true, "SALESPROJECT", ["PHASE"], null, [pPhase]);                      
 }
+
+/**
+ * Methods used by the SalesprojectConversionRate.
+ * Do not create an instance of this!
+ * 
+ * @class
+ */
+function SalesprojectConversionRate() {}
+
+/**
+ * Returns the Mapping of the Fields and FilterExtention for the grouping 
+ * 
+ * @param {Boolean} pRightOneTables if true you get the Mappings with the actual Tablenames 
+ * 
+ * @return {Object}
+ */
+SalesprojectConversionRate.groupMapping = function (pRightOneTables) 
+{
+    let sqlHelper = new SqlMaskingUtils();
+    if (pRightOneTables)
+    {
+        return {
+            "AB_KEYWORD_ENTRYID_KEYID": "AB_KEYWORD_ENTRY.KEYID", 
+            "#EXTENSION.Year.Year#NUMBER" : sqlHelper.yearFromDate("SALESPROJECT_MILESTONE.DATE_START"), 
+            "#EXTENSION.Month.Month#NUMBER" : sqlHelper.monthFromDate("SALESPROJECT_MILESTONE.DATE_START")
+        }
+    }
+    
+    let dateStartYear = sqlHelper.yearFromDate("DATA.DATE_START");
+    let dateStartMonth = sqlHelper.monthFromDate("DATA.DATE_START");
+    
+    return {
+        "AB_KEYWORD_ENTRYID_KEYID": ["DATA.KEYID", "DATA.TITLE", "DATA.SORTING"], 
+        "#EXTENSION.Year.Year#NUMBER" : [dateStartYear, dateStartYear, dateStartYear], 
+        "#EXTENSION.Month.Month#NUMBER" : [dateStartMonth, dateStartMonth, dateStartMonth]
+    }
+}
+
+/**
+ * Returns the FieldMappings for the FilterExtentions for the giffen Table
+ * if there is a TableAlias used as pField there have to be a pTable
+ * 
+ * @param {String} pField the filtered Feld in the format Table.Column or TableAlias.Column
+ * @param {Boolean} pIsAll if true you get the Mapping for all Fields
+ * @param {Integer} pTable the Table of the used TableAlias
+ * 
+ * @return {Object} FieldMapping
+ */
+SalesprojectConversionRate.filterMapping = function(pField, pIsAll, pTable)
+{
+    let sqlHelper = new SqlMaskingUtils();
+    if (pField == null){
+        return {
+        
+            "AB_KEYWORD_ENTRYID_KEYID": "AB_KEYWORD_ENTRY.KEYID", 
+            "#EXTENSION.Year.Year#NUMBER" : null, 
+            "#EXTENSION.Month.Month#NUMBER" : null,
+            "#EXTENSION.DATE_START.DATE_START#DATE" : null
+        }
+    } else {
+        let mapping = {
+            "AB_KEYWORD_ENTRYID_KEYID": null, 
+            "#EXTENSION.Year.Year#NUMBER" : function (pValue, pOperator) {
+                return _getFilterByFunction(pValue, pOperator,  sqlHelper.yearFromDate(pField));
+            }
+            , 
+            "#EXTENSION.Month.Month#NUMBER" : function (pValue, pOperator) {
+                return _getFilterByFunction(pValue, pOperator, sqlHelper.monthFromDate(pField));
+            }
+            ,
+            "#EXTENSION.DATE_START.DATE_START#DATE" : pField
+        };
+        if (pIsAll){
+            mapping.AB_KEYWORD_ENTRYID_KEYID = "AB_KEYWORD_ENTRY.KEYID";
+        }
+        
+        if (pTable) {
+            let arr = pField.split(".");
+            mapping["#EXTENSION.DATE_START.DATE_START#DATE"] = [pTable, arr[1], arr[0]];
+        }
+        
+        return mapping;
+                
+    }
+    
+    function _getFilterByFunction (pValue, pOperator, pAggregate) {
+        let sqlCond = "" + pAggregate;
+
+        if (pOperator == "EQUAL")
+            sqlCond += " = " + pValue + "";
+        else if (pOperator == "NOT_EQUAL")
+            sqlCond += " <> " + pValue + ""; 
+        else
+            sqlCond = "1=1";
+
+        return  sqlCond;
+    }
+    
+}
+
+
diff --git a/process/SetAttribute_workflowService/serviceTaskParameterProcess.js b/process/SetAttribute_workflowService/serviceTaskParameterProcess.js
index 6a32e4b765c7647a389b26e8add46d362ec5ed3e..118269c0c1e6b7093e9e3923e44df5c9c5c10ac3 100644
--- a/process/SetAttribute_workflowService/serviceTaskParameterProcess.js
+++ b/process/SetAttribute_workflowService/serviceTaskParameterProcess.js
@@ -16,14 +16,14 @@ var currentValues = JSON.parse(vars.get("$local.value"));
 
 var allAttributes = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_TYPE, ATTRIBUTE_ACTIVE")
     .from("AB_ATTRIBUTE")
-    .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.OBJECTSELECTION, SqlBuilder.NOT_EQUAL()) //these can't work yet
+    .where("AB_ATTRIBUTE.ATTRIBUTE_TYPE", AttributeTypes.OBJECTSELECTION(), SqlBuilder.NOT_EQUAL()) //these can't work yet
     .table();
 var attributeNameMap = {};
 var attributes = [];
 allAttributes.forEach(function ([attributeId, parentId, attributeName, attributeType, isActive])
 {
     attributeNameMap[attributeId] = [translate.text(attributeName), parentId];
-    if (isActive == "1" && attributeType != $AttributeTypes.GROUP && attributeType != $AttributeTypes.COMBOVALUE)
+    if (isActive == "1" && attributeType != AttributeTypes.GROUP() && attributeType != AttributeTypes.COMBOVALUE())
         attributes.push(attributeId);
 });
 attributes = attributes.map(function (attributeId)
diff --git a/process/Sql_lib/documentation.adoc b/process/Sql_lib/documentation.adoc
index 4330b3af2166a38f050685d472b18d5b0a8daab3..8b903c2155e9d54f160b06ef6fa80a586a8335e6 100644
--- a/process/Sql_lib/documentation.adoc
+++ b/process/Sql_lib/documentation.adoc
@@ -170,7 +170,12 @@ If used as pField, you can provide the table and column in different ways.
 * *pValue*
 This is the value of the condition: If, e.g., you need the SQL condition "FIRSTNAME = 'John'" then this parameter is "John")
 * *pCondition*
-This parameter defines what condition is used. You can use any SQL. # will be replaced by the pFieldOrCond and ? is used for the pValue (default is "# = ?"). If, e.g., you need the SQL condition "FIRSTNAME <> 'John'" then this parameter is "# <> ?" (or SqlBuilder.NOT_EQUAL()). You can use SqlBuilder constants here (for example SqlBuilder.NOT_EQUAL(), SqlBuilder.EXISTS())
+This parameter defines what condition is used. You can use any SQL. `#` will be replaced by the pFieldOrCond and `?` is used for the pValue (default is `# = ?`). 
+If, e.g., you need the SQL condition `FIRSTNAME <> 'John'` then this parameter is `# <> ?` (or `SqlBuilder.NOT_EQUAL()`). 
+You can use SqlBuilder constants here (for example `SqlBuilder.NOT_EQUAL()`, `SqlBuilder.EXISTS()`)
+For better useability, it is also possible to give the value without the bracets like this: `SqlBuilder.NOT_EQUAL`
+It is possible to escape the # symbol with a backslash, note that to write a backslash in a string it needs to be escaped itself.
+Example: `cond.and("MYTABLE.MYCOLUMN", "XYZ", "\\## = ?");` results in _( #MYTABLE.MYCOLUMN = 'XYZ' )_
 * *pFieldType*
 This parameter is for specifying the SQLTYPE explicitly. In most cases, you won't need it, as the type is loaded from the db by the table name and the column name you specified in pFieldOrCond.
 
@@ -552,7 +557,7 @@ var cond = newWhere("TABLE.FIELD", aSqlBuilderContainingFullSelect);
 === IN statement with array of values
 
 pValue can also be an array of values which is automatically transfered into a SQL prepared statement SQL like this:
- ["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]
+ `["(?, ?, ?)", [["Peter", SQLTYPES.VARCHAR], ["Paul", SQLTYPES.VARCHAR], ["Mary", SQLTYPES.VARCHAR]]]`
 
 With this it is very easy to create a in-statement:
 [source,js]
@@ -560,7 +565,10 @@ With this it is very easy to create a in-statement:
 var cond = newWhere("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"], SqlBuilder.IN()) // SqlBuilder.IN() == "in ?"
 // Note that also SqlBuilder.NOT_IN() is possible here
 ----
-Note that an empty array is threated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+Note that an empty array is treated like null or undefined: using .where throws an error, using .whereIfSet ignores the whole condition.
+
+TIP: Passing nothing as condition will result in an SqlBuilder.IN when the values are an array. 
+For example `myCondition.and("PERSON.FIRSTNAME", ["Peter", "Paul", "Mary"])`
 
 === IN statement with subquery
 
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 3600f01d4ac7385d61f8687c1c0d9be752cbe9ab..a8014755360de174c6529d7d096c9f90821e15e1 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1527,6 +1527,25 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
         var field = pFieldOrCond;
         var typeofValue = typeof pValue;
 
+        // ... a string starting with $ -> jdito varable which has to be resolved
+        if (typeofValue == "string" && pValue.length >= 2 && pValue[0] == "$" && pValue[1] != "$") // escape $ if using two $
+        {
+            //important: just overwrite the value because some $local variables may contain an array and then the default handling of arrays (which
+            //is generating an IN-statement) should apply
+            pValue = vars.get(pValue);
+            if (pMandatory && pValue === null)
+                throw SqlBuilder._ERROR_VALUE_IS_MANDATORY_JDITO_VAR();
+            typeofValue = typeof pValue;
+        }
+
+        // remove the first $ if there are two $
+        if (typeofValue == "string" && pValue.length >= 2 && pValue[0] == "$" && pValue[1] == "$")
+            pValue = pValue.slice(1);
+        
+        //support for Set by converting to Array
+        if (pValue instanceof Set)
+            pValue = Array.from(pValue);
+        
         // pValue can be...
         // ... a SqlBuilder / Prepared statement array -> it is a SqlBuilder containing a complete subquery or an simple array (in statement)
         if (pValue instanceof SqlBuilder || Array.isArray(pValue) || (typeofValue == "string" && (pFieldOrCond == undefined || pFieldOrCond == null)))
@@ -1549,7 +1568,9 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
                     if (pFieldType === undefined || pFieldType === null)
                         pFieldType = SqlUtils.getSingleColumnType(parsedField, undefined, this.alias);
                 }
-                                
+                //overwrite condition to set a default behaviour
+                if (pCondition == undefined)
+                    pCondition = SqlBuilder.IN();
                 // value-array -> convert it to a prepared statement ["(?, ?, ?)", [[val1, type1], [val2, type2], [val3, type3]]]
                 this._whereCondition(this._prepare(field, SqlUtils.getSqlInStatement(undefined, pValue, undefined, true, pFieldType), pCondition, pFieldType, false), undefined, pAddPreparedConditionCallback, true);
                 return this;
@@ -1575,23 +1596,6 @@ SqlBuilder.prototype._addWhere = function(pFieldOrCond, pValue, pMandatory, pCon
         if (!pCondition)
             pCondition = SqlBuilder.EQUAL();
 
-        // ... a string starting with $ -> jdito varable which has to be resolved
-        if (typeofValue == "string" && pValue.length >= 2 && pValue[0] == "$" && pValue[1] != "$") // escape $ if using two $
-        {
-            pValue = vars.getString(pValue)
-            if (pMandatory && pValue === null)
-                throw SqlBuilder._ERROR_VALUE_IS_MANDATORY_JDITO_VAR();
-            
-            if (pValue == "" || pValue)
-                this._whereCondition(this._prepare(field, pValue, pCondition, pFieldType), undefined, pAddPreparedConditionCallback);
-            
-            return this;
-        }
-        
-        // remove the first $ if there are two $
-        if (typeofValue == "string" && pValue.length >= 2 && pValue[0] == "$" && pValue[1] == "$")
-            pValue = pValue.slice(1);
-
         // ... everything else -> just pass it
         if (pValue === false || pValue === 0 || pValue === "" || pValue)
         {
@@ -2458,7 +2462,7 @@ SqlBuilder.prototype.updateData = function(pExecuteOnlyIfConditionExists, pTable
  * Updates data in the database. This function calls SqlBuilder.prototype.updateData, but provides a shorter syntax to
  * improve the readability.
  * 
- * @param {Object} pFieldValues Object with the columns to update as keys mapped to their values
+ * @param {Object|Map} pFieldValues Object with the columns to update as keys mapped to their values
  * @param {String} [pTableName] The table for updating data. If undefined, the from part of the SqlBuilder will be used (works only if it is a tablename). If no from is set,
  *      the table of the first where-condition is used.
  * @return {Number} the number of rows affected
@@ -2471,22 +2475,16 @@ SqlBuilder.prototype.updateFields = function (pFieldValues, pTableName)
     if (!pFieldValues || typeof(pFieldValues) !== "object")
         throw SqlBuilder._ERROR_UPDATE_VALUES_INVALID;
         
-    var columns = [];
-    var values = [];
-    for (let field in pFieldValues)
-    {
-        columns.push(field);
-        values.push(pFieldValues[field].toString());
-    }
-    if (columns.length === 0)
+    var columnValues = SqlBuilder._columnsValuesFromObject(pFieldValues, true);
+    if (columnValues.columns.length === 0)
         return 0;
-    return this.updateData(true, pTableName, columns, null, values);
+    return this.updateData(true, pTableName, columnValues.columns, null, columnValues.values);
 }
 
 /**
  * Builds an array containing the table and condition for an update.
  * 
- * @param {Object} pFieldValues Object with the columns to update as keys mapped to their values
+ * @param {Object|Map} pFieldValues Object with the columns to update as keys mapped to their values
  * @param {String} [pTableName] The table for updating data. If undefined, the from part of the SqlBuilder will be used (works only if it is a tablename). If no from is set,
  *      the table of the first where-condition is used.
  * @return {Array} array of [tableName, columns, columnTypes, values, preparedCondition], like it is required by db.updates or null if there is no condition
@@ -2501,25 +2499,51 @@ SqlBuilder.prototype.buildUpdateStatement = function (pFieldValues, pTableName)
     if (!pFieldValues || typeof(pFieldValues) !== "object")
         throw SqlBuilder._ERROR_UPDATE_VALUES_INVALID;
         
-    var columns = [];
-    var values = [];
-    for (let field in pFieldValues)
+    var columnValues = SqlBuilder._columnsValuesFromObject(pFieldValues, true);
+    if (columnValues.columns.length !== 0 && this._checkForUpdate())
     {
-        columns.push(field);
-        values.push(pFieldValues[field].toString());
+        if (!pTableName && !this._tableName)
+            throw SqlBuilder._ERROR_NO_TABLE();
+        
+        return [
+            (pTableName ? pTableName : this._tableName),
+            columnValues.columns,
+            null,
+            columnValues.values,
+            this.buildCondition()
+        ];
     }
+    return null;
+}
+
+/**
+ * Builds an array containing the data for an insert.
+ * 
+ * @param {Object|Map} pFieldValues Object with the columns to insert into as keys mapped to their values
+ * @param {String} [pTableName] The table for updating data. If undefined, the from part of the SqlBuilder will be used (works only if it is a tablename). If no from is set,
+ *      the table of the first where-condition is used.
+ * @param {String} [pAutoUidField] UID column that should be filled with a random UUID 
+ * @return {Array} array of [tableName, columns, columnTypes, values, preparedCondition], like it is required by db.updates or null if there is no condition
+ */
+SqlBuilder.prototype.buildInsertStatement = function (pFieldValues, pTableName, pAutoUidField)
+{
+    if (!pFieldValues || !Utils.isObject(pFieldValues))
+        throw SqlBuilder._ERROR_UPDATE_VALUES_INVALID;
+        
+    if (pAutoUidField)
+        pFieldValues[pAutoUidField] = util.getNewUUID();
     
-    if (columns.length !== 0 && this._checkForUpdate())
+    var columnValues = SqlBuilder._columnsValuesFromObject(pFieldValues);
+    if (columnValues.columns.length !== 0)
     {
         if (!pTableName && !this._tableName)
             throw SqlBuilder._ERROR_NO_TABLE();
         
         return [
             (pTableName ? pTableName : this._tableName),
-            columns,
+            columnValues.columns,
             null,
-            values,
-            this.buildCondition()
+            columnValues.values
         ];
     }
     return null;
@@ -2558,7 +2582,7 @@ SqlBuilder.prototype.insertData = function(pTableName, pColumns, pColumnTypes, p
  * Inserts data in the database. This function calls SqlBuilder.prototype.insertData, but provides a shorter syntax to
  * improve the readability.
  * 
- * @param {Object} pFieldValues Object with the columns to update as keys mapped to their values
+ * @param {Object|Map} pFieldValues Object with the columns to update as keys mapped to their values
  * @param {String} [pTableName] The table for updating data. If undefined, the from part of the SqlBuilder will be used (works only if it is a tablename). If no from is set,
  *      the table of the first where-condition is used.
  * @param {String} [pAutoUidField] UID column that should be filled with a random UUID 
@@ -2578,19 +2602,49 @@ SqlBuilder.prototype.insertFields = function (pFieldValues, pTableName, pAutoUid
     if (pAutoUidField)
         pFieldValues[pAutoUidField] = util.getNewUUID();
     
+    var columnValues = SqlBuilder._columnsValuesFromObject(pFieldValues);
+    if (columnValues.columns.length === 0)
+        return 0;
+    return this.insertData(pTableName, columnValues.columns, null, columnValues.values);
+}
+
+SqlBuilder._columnsValuesFromObject = function (pFieldValues, pIncludeNullValues)
+{
     var columns = [];
     var values = [];
-    for (let field in pFieldValues)
+    if (Utils.isMap(pFieldValues))
     {
-        if (pFieldValues[field] !== undefined && pFieldValues[field] !== null)
+        pFieldValues.forEach(function (value, key)
         {
-            columns.push(field);
-            values.push(pFieldValues[field].toString());
+            if (pIncludeNullValues || (value !== undefined && value !== null))
+            {
+                columns.push(key);
+                values.push(_valueToString(value));
+            }
+        });
+    }
+    else
+    {
+        for (let field in pFieldValues)
+        {
+            if (pIncludeNullValues || (pFieldValues[field] !== undefined && pFieldValues[field] !== null))
+            {
+                columns.push(field);
+                values.push(_valueToString(pFieldValues[field]));
+            }
         }
     }
-    if (columns.length === 0)
-        return 0;
-    return this.insertData(pTableName, columns, null, values);
+    return {
+        columns: columns,
+        values: values
+    };
+    
+    function _valueToString (pValue)
+    {
+        if (pValue === undefined || pValue === null)
+            return "";
+        return pValue.toString();
+    }
 }
 
 /**
@@ -3969,13 +4023,28 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
 };
 
 /**
-* resolves key-value pairs (of strings) into a case when expression
+* resolves an array of key-value pairs (of strings) into a sql case when expression<br/>
+* This is useful for results of entities.getRows for example.
 * 
-* @param {String[][]} pKeyValueArray you've to pass a 2D-Array where each element has at pos0 the key and pos1 the value
-* @param {String} pDbFieldName name fo the database field where the KEY-value is stored
-* @param {String} [pLocale=current client language] specifies the locale for translating the title; can be false if nothing shalle be translated
+* @param {Array} pKeyValueObject    <p/>you've to pass a 2D-Array where each element has to be an object with at least one key: value-pair, e.g.: 
+*                                   <br/>[{uid: "uid1", value: "value1"}, {uid: "uidN", value: "valueN"}]
+* @param {String} pUid              <p/>name of the key where the rawvalue (the uid) is located in the object
+* @param {String} pTranslatedValue  <p/>name of the key where the already translated value is located in the object
+* @param {String} pDbFieldName      <p/>name fo the database field where the KEY-value is stored
 * 
-* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
+* @return {String}                  <p/>a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as 
+*                                       preparedSatement-elements
+*                                   <br/>The else-value is "unassigned".
+* 
+* @example
+* var exampleDataStack = [
+*       {keyVal: "PHONE", titleOriginal: "Phone", titleTranslated: "Telefon", origin: "MetaImporter"},
+*       {keyVal: "EMAIL", titleOriginal: "email", titleTranslated: "E-Mail", origin: "MetaImporter"}
+* ];
+* 
+* var sqlExpr = SqlUtils.getResolvingCaseWhenFromObject(exampleDataStack, "keyVal", "titleTranslated", "FORM.COMMUNICATION");
+* //results in a sql case when as prepared statement that is resolvedas following: 
+* //case  when FORM.COMMUNICATION = 'PHONE'  then 'Telefon'   when FORM.COMMUNICATION = 'EMAIL'  then 'E-Mail'   else 'nicht zugeordnet' end
 */
 SqlUtils.getResolvingCaseWhenFromObject = function(pKeyValueObject, pUid, pTranslatedValue, pDbFieldName) 
 {
diff --git a/process/Util_lib/Util_lib.aod b/process/Util_lib/Util_lib.aod
index 18ccba5128774c467915662c198183f2f6f93744..6a28f6ac135dc0e474b2a0c951704dc8635e5591 100644
--- a/process/Util_lib/Util_lib.aod
+++ b/process/Util_lib/Util_lib.aod
@@ -3,6 +3,7 @@
   <name>Util_lib</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <process>%aditoprj%/process/Util_lib/process.js</process>
+  <alias>Data_alias</alias>
   <variants>
     <element>LIBRARY</element>
   </variants>
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 2c687d66a4dda42890909aa061ac311e69be5ef9..79d48fd346254731ff46aa8f6a8f04467dd63151 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -23,15 +23,17 @@ import("Date_lib");
 function Utils () {}
 
 /**
- * Checks if the given object, array or string is empty.
+ * Checks if the given object, array, map, set or string is empty.
  * 
- * @param {Object|Array|String} pObject the object to check
+ * @param {Object|Array|String|Map|Set} pObject the object to check
  * @return {Boolean} true if the object is empty
  */
 Utils.isEmpty = function (pObject)
 {
     if (Utils.isString(pObject) || Array.isArray(pObject))
         return pObject.length === 0;
+    if (pObject instanceof Set || pObject instanceof Map)
+        return pObject.size === 0;
     for (let key in pObject)
     {
         return false;
@@ -175,6 +177,17 @@ Utils.isObject = function (pValue)
     return typeof pValue === "object";
 }
 
+/**
+ * Checks if the given value is a Map. 
+ * 
+ * @param {Object} pValue the value to check
+ * @return {Boolean} true if the value is a Map
+ */
+Utils.isMap = function (pValue)
+{
+    return pValue instanceof Map;
+}
+
 /**
  * Checks if the given value is a boolean.
  * 
@@ -203,6 +216,39 @@ Utils.toBoolean = function (pValue)
     return !(!pValue || pValue === "0" || pValue === "false" || pValue === "null" || pValue === "undefined" || !(pValue.valueOf()));
 }
 
+/**
+ * Creates an object containing the keys and values of the given Map
+ * 
+ * @param {Map} pMap a Map
+ * @return {Object} object with properties from the Map
+ */
+Utils.objectFromMap = function (pMap)
+{
+    if (!Utils.isMap(pMap))
+        return pMap; //throw error?
+    
+    var mapObject = {}; //maybe use Object.create(null)?
+    pMap.forEach(function (value, key)
+    {
+        mapObject[key] = value;
+    });
+    return mapObject;
+}
+
+/**
+ * Parses the given JSON to an object, but ignores empty strings, undefined or null.
+ * 
+ * @param {String} pJSON the JSON string to parse
+ * @param {Function} [pReviver] optional reviver function
+ * @return {Array|Object} the parsed object or null if no JSON was given
+ */
+Utils.parseJSON = function (pJSON, pReviver)
+{
+    if (pJSON !== "" && pJSON !== undefined && pJSON !== null)
+        return JSON.parse(pJSON, pReviver);
+    return null;
+}
+
 /**
  * Class containing static utility functions for regular expression objects (RegExp)
  * Do not create an instance of this
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index d7387dcc3df1b261445bbaf1fbac122a1e1be983..03bccc71e669831494fb55307bacff0ba8b07156 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -95,6 +95,11 @@ WsValidationType.get = function(pKey)
                 var cityext = pPlaceData.address.suburb
                     || pPlaceData.address.city_district;
                 
+                var road = pPlaceData.address.road 
+                    || pPlaceData.address.street
+                    || pPlaceData.address.path
+                    || pPlaceData.address.address27;
+                
                 return {
                     placeId: pPlaceData.place_id,
                     value: pValue,
@@ -106,7 +111,7 @@ WsValidationType.get = function(pKey)
                     district: pPlaceData.address.district,
                     region: pPlaceData.address.state_district,
                     state: pPlaceData.address.state,
-                    road: pPlaceData.address.road, //8
+                    road: road, //8
                     buildingNo: pPlaceData.address.house_number,
                     lat: pPlaceData.lat,
                     lon: pPlaceData.lon
diff --git a/process/_test_importer/process.js b/process/_test_importer/process.js
index 90df3ed16d4cf23d17ca8d241d24ca7b8be153c9..418c18564dbf0757efb950e9e9af8d57443e7557 100644
--- a/process/_test_importer/process.js
+++ b/process/_test_importer/process.js
@@ -1,3 +1,4 @@
+import("Attribute_lib");
 import("system.text");
 import("Util_lib");
 import("ImporterTest_lib");
@@ -241,53 +242,53 @@ var fixtures = {
     iAttribute: {
         "insertAttributeNew": function() {
             return [
-                ["TestString", $AttributeTypes.TEXT.toString()],
-                ["TestCombo1.TestCombo2.TestCombo3", $AttributeTypes.COMBOVALUE.toString()],
-                ["TestBool", $AttributeTypes.BOOLEAN.toString()],
-                ["TestNum", $AttributeTypes.NUMBER.toString()]
+                ["TestString", AttributeTypes.TEXT()],
+                ["TestCombo1.TestCombo2.TestCombo3", AttributeTypes.COMBOVALUE()],
+                ["TestBool", AttributeTypes.BOOLEAN()],
+                ["TestNum", AttributeTypes.NUMBER()]
             ];
         },
         "insertAttributeUsage": function() {
             return [
-                ["TestUsage1", $AttributeTypes.NUMBER.toString(), "Organisation"],
-                ["TestUsage1", $AttributeTypes.NUMBER.toString(), "Person"]
+                ["TestUsage1", AttributeTypes.NUMBER(), "Organisation"],
+                ["TestUsage1", AttributeTypes.NUMBER(), "Person"]
             ];
         },
         "insertAttributeRelation": function() {
             return [
-                ["TestRel1", $AttributeTypes.TEXT.toString(), "Person", "666", "six hundred sixty six"],
-                ["TestRel1", $AttributeTypes.TEXT.toString(), "Person", "777", "seven hundred seventy seven"],
-                ["TestRel2", $AttributeTypes.NUMBER.toString(), "Organisation", "888", 888],
-                ["TestRel2", $AttributeTypes.NUMBER.toString(), "Organisation", "999", 999]
+                ["TestRel1", AttributeTypes.TEXT(), "Person", "666", "six hundred sixty six"],
+                ["TestRel1", AttributeTypes.TEXT(), "Person", "777", "seven hundred seventy seven"],
+                ["TestRel2", AttributeTypes.NUMBER(), "Organisation", "888", 888],
+                ["TestRel2", AttributeTypes.NUMBER(), "Organisation", "999", 999]
             ];
         },
         "insertAttributeMissing": function() {
             return [
-                ["", $AttributeTypes.TEXT.toString()],
+                ["", AttributeTypes.TEXT()],
                 ["TestNum", ""],
                 ["", 234]
             ];
         },
         "insertAttributeSame": function() {
             return [
-                ["TestRel1", $AttributeTypes.TEXT.toString(), "Person", "666", "six hundred sixty four"],
-                ["TestRel1", $AttributeTypes.TEXT.toString(), "Person", "777", "seven hundred seventy five"]               
+                ["TestRel1", AttributeTypes.TEXT(), "Person", "666", "six hundred sixty four"],
+                ["TestRel1", AttributeTypes.TEXT(), "Person", "777", "seven hundred seventy five"]               
             ];
         }
     },
     iKeywordAttribute: {
         "insertKeywordAttributeNew": function() {
             return [
-                ["KeyAttribute1", $AttributeTypes.TEXT.toString(), "ContainerTest2"],
-                ["KeyAttribute2", $AttributeTypes.NUMBER.toString(), "ContainerTest2"],
-                ["KeyAttribute3", $AttributeTypes.TEXT.toString(), "ContainerTest3"]
+                ["KeyAttribute1", AttributeTypes.TEXT(), "ContainerTest2"],
+                ["KeyAttribute2", AttributeTypes.NUMBER(), "ContainerTest2"],
+                ["KeyAttribute3", AttributeTypes.TEXT(), "ContainerTest3"]
             ];
         },
         "insertKeywordAttributeRelation": function() {
             return [
-                ["KeyAttRel1", $AttributeTypes.TEXT.toString(), "ContainerTest2", "KeywordTest6", "test value"],
-                ["KeyAttRel2", $AttributeTypes.TEXT.toString(), "ContainerTest2", "KeywordTest7", "test value"],
-                ["KeyAttribute2", $AttributeTypes.NUMBER.toString(), "ContainerTest1", "KeywordTest8", 888]
+                ["KeyAttRel1", AttributeTypes.TEXT(), "ContainerTest2", "KeywordTest6", "test value"],
+                ["KeyAttRel2", AttributeTypes.TEXT(), "ContainerTest2", "KeywordTest7", "test value"],
+                ["KeyAttribute2", AttributeTypes.NUMBER(), "ContainerTest1", "KeywordTest8", 888]
             ]
         },
         "insertKeywordAttributeMissing": function() {
diff --git a/process/ctiServerEvents/process.js b/process/ctiServerEvents/process.js
index e0df2b323d8dc904b125b3c44fc12db5a50a5fe2..9ad5932612224bca843de4ac2a78acb6df6fd27d 100644
--- a/process/ctiServerEvents/process.js
+++ b/process/ctiServerEvents/process.js
@@ -62,10 +62,8 @@ var ringingHandlerFn = function()
                 var affectedContext = this.contactsCall[0].PERSON_ID.trim() == "" ? "Organisation" : "Person";
                 notificationConfig.linkInfo(text.encodeMS([affectedContext, affectedContactId]));
             }
-            
-            notificationConfig.initialState(notification.STATE_CONFIRMED);
-
-            
+            //do not set the notification-state CONFIRMED here because otherwise setting the state in the disconnectingHandlerFn would not work 
+            //the logic for the correct state is handled there
             notification.addNotificationWith(notificationConfig);
             return null;
         }, this);
@@ -100,6 +98,7 @@ var disconnectingHandlerFn = function()
 
     var [lastAnswermode, callBeginTime] = lastCallData
     var isMissedCall = lastAnswermode == "" || lastAnswermode == $KeywordRegistry.callAnswerMode$missed();//no TALKING state was called -> this means that the call has been missed
+    var isUnknownCall = this.contactsCall.length == 0;
 
     var cols = ["DATE_EDIT"];
     var vals = [callEndTime];
@@ -125,7 +124,7 @@ var disconnectingHandlerFn = function()
         var title, desc;
         if (isMissedCall)
         {
-            if (this.contactsCall.length == 0)
+            if (isUnknownCall)
             {
                 title = translate.withArguments("Call from unknown", [], targetLocale);
                 desc = translate.withArguments("Missed call from %0 to %1", [this.getFormattedCallAddress(), this.getFormattedLocalAddress()], targetLocale);
@@ -140,7 +139,7 @@ var disconnectingHandlerFn = function()
         else
         {
             var talkDuration = DateUtils.formatDurationFromStartTillEnd(callBeginTime, callEndTime, targetLocale);
-            if (this.contactsCall.length == 0)
+            if (isUnknownCall)
             {
                 title = translate.withArguments("Call from unknown", [], targetLocale);
                 desc = translate.withArguments("Unknown accepted call from %0 to %1, duration: %2", [this.getFormattedCallAddress(), this.getFormattedLocalAddress(), talkDuration], targetLocale);
@@ -157,7 +156,7 @@ var disconnectingHandlerFn = function()
         if (notificationConfig == null)
             return null;
 
-        if (this.contactsCall.length > 0)
+        if (!isUnknownCall)
         {
             //add the linkInfo again because otherwise the linkInfo would be overwritten with null when disconnecting
             //TODO: wait for #1047703 
@@ -167,7 +166,11 @@ var disconnectingHandlerFn = function()
         }
         
         notificationConfig.description(desc).caption(title);
-
+        notificationConfig.remindAgainOnNewContent(false);
+        if (isMissedCall)
+            notificationConfig.initialState(notification.STATE_UNSEEN);
+        else
+            notificationConfig.initialState(notification.STATE_CONFIRMED);
         notification.addNotificationWith(notificationConfig);
         return null;
     }, this);
diff --git a/process/exportLiquibaseContent_serverProcess/process.js b/process/exportLiquibaseContent_serverProcess/process.js
index 82cb96143a7df97b0b64818a6a9730a2e604716d..6a7a654b74e3129fa93ca05af77a8a2d3adef5fe 100644
--- a/process/exportLiquibaseContent_serverProcess/process.js
+++ b/process/exportLiquibaseContent_serverProcess/process.js
@@ -8,9 +8,10 @@ import("system.db");
 import("system.fileIO");
 
 var alias = "diffAlias";
-var outFolderBase = vars.get("$sys.servertemp") + "/" + alias + "/";
-
-var outFolderPath = outFolderBase + "generatedData/";
+var basePath = vars.get("$sys.servertemp") + "/" + alias;
+if (fileIO.exists(basePath))
+    fileIO.remove(basePath);
+var outFolderPath = basePath + "/" + "generatedData/";
 
 var excludedTables = ["AB_COUNTRYINFO", "AB_LANGUAGE"];
 excludedTables.push("AB_KEYWORD_ATTRIBUTE", "AB_KEYWORD_ATTRIBUTERELATION", "AB_KEYWORD_ENTRY");
@@ -30,8 +31,13 @@ logging.log("liquibase data (" + exportedTables.length + " tables) exported into
 
 //remember to change the alias db to the data_system when running binaries exporter:
 alias = "diffAliasSystem";
-outFolderPath = vars.get("$sys.servertemp") + "/" + alias + "/" + "generatedData/";
+basePath = vars.get("$sys.servertemp") + "/" + alias;
+if (fileIO.exists(basePath))
+    fileIO.remove(basePath);
+outFolderPath = basePath + "/" + "generatedData/";
 LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_BINARIES", null, null, null, false, alias, true);
+LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_RECORD", null, null, null, false, alias, true);
+LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_RECORDGROUP", null, null, null, false, alias, true);
 
 //alias = SqlUtils.getSystemAlias();
 //outFolderPath = "C:\\temp\\generatedData\\" + alias + "\\";
diff --git a/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod b/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9437d3b30537612af789f265de1b2a9375903711
--- /dev/null
+++ b/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>exportLiquibaseSystemalias_serverProcess</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/exportLiquibaseSystemalias_serverProcess/process.js</process>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
diff --git a/process/exportLiquibaseSystemalias_serverProcess/process.js b/process/exportLiquibaseSystemalias_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce74923a68d60606aede9f3409f08f787d1e0890
--- /dev/null
+++ b/process/exportLiquibaseSystemalias_serverProcess/process.js
@@ -0,0 +1,102 @@
+import("Util_lib");
+import("system.vars");
+import("Sql_lib");
+import("system.datetime");
+import("system.util");
+import("system.logging");
+import("Liquibase_lib");
+import("system.db");
+import("system.fileIO");
+
+/*
+ * This process is still WIP.
+ * The process is designed to help upgrading the lqiuibase-definition of the content of the _____SYSTEMALIAS.
+ **/
+
+var alias = "tempAlias";
+
+var outFolderBase = vars.get("$sys.servertemp") + "/" + alias + "/";
+
+_exportSystemData();
+_exportAsysBinariesData();
+_exportAsysUsersAdmin();
+_exportAsysUsersExamples();
+_exportAsysUsersWorkflow();
+
+function _exportSystemData()
+{
+    var outFolderPath = outFolderBase + "init/data/";
+    var exportTables = [];
+
+    exportTables.push({
+        tableName: "ASYS_ALIASCONFIG", 
+        blobNameCallback: function(pColumnName, pValue, pRow){
+            return pRow.ALIASID ? pRow.ALIASID + ".xml" : null;
+        } 
+    });
+    exportTables.push({
+        tableName: "ASYS_PERMISSION"
+    });
+    exportTables.push({
+        tableName: "ASYS_PERMISSIONACTION"
+    });
+    exportTables.push({
+        tableName: "ASYS_PERMISSIONSET"
+    });
+    exportTables.push({
+        tableName: "ASYS_SYSTEM", 
+        blobNameCallback: function(pColumnName, pValue, pRow){
+            return pRow.NAME ? pRow.NAME + ".xml" : null;
+        } 
+    });
+
+    var changeLogData = LiquiXmlUtils.databaseChangeLog();
+    exportTables.forEach(function (tableCfg){
+        var tableName = tableCfg.tableName;
+        var fileValue = tableName + ".xml";
+        var blobNameCallback = tableCfg.blobNameCallback;
+        LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, tableName, null, null, null, false, alias, true, blobNameCallback);
+    
+        changeLogData.appendChild(<include relativeToChangelogFile="true" file={
+            fileValue
+            }/>);    
+    });
+    changeLogData = LiquiXmlUtils.xmlHeaderLineStr() + "\n" + changeLogData.toString();
+    //write changelog file
+    fileIO.storeData(outFolderPath + "changelog.xml", changeLogData, util.DATA_TEXT, false, "UTF8");
+    logging.log("liquibase data (" + exportTables.length + " tables) exported into folder:" + outFolderPath);
+}
+
+
+
+function _exportAsysBinariesData()
+{
+    var outFolderPath = outFolderBase + "_demoData/generatedData/";
+    LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_BINARIES", null, null, null, false, alias, true);
+}
+
+function _exportAsysUsersAdmin()
+{
+    var outFolderPath = outFolderBase + "_demoData/example_asys_users/";
+    var cond = "NAME = (select NAME from ASYS_USERS where propkey = 'title' and propval = 'Admin')";
+    LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_USERS", null, cond, null, false, alias, true, null, "insert_asys_users-admin");
+}
+
+function _exportAsysUsersExamples()
+{
+    var outFolderPath = outFolderBase + "_demoData/example_asys_users/";
+    var usersForExport = db.table("select PROPVAL, NAME from ASYS_USERS where PROPKEY = 'title' and PROPVAL not in ('flowableIdmService', 'Admin')", alias);
+    
+    usersForExport.forEach(function (user){
+        var cond = newWhere("ASYS_USERS.NAME", user[1], SqlBuilder.EQUAL(), null, alias);
+        var fileName = StringUtils.replaceAll(user[0], " ", "_");//keep backwards compatible
+        LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_USERS", null, cond.toString(), null, false, alias, true, null, fileName);
+    });
+}
+
+function _exportAsysUsersWorkflow()
+{
+    var outFolderPath = outFolderBase + "Workflow/";
+    var cond = "NAME = (select NAME from ASYS_USERS where propkey = 'title' and propval = 'flowableIdmService')";
+    LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_USERS", null, cond, null, false, alias, true, null, "webserviceUser_flowableIdmService");
+}
\ No newline at end of file
diff --git a/process/importLead_serverProcess/process.js b/process/importLead_serverProcess/process.js
index c572bd5191e75ca1271e77b855cda357108de6b5..a24b084a933769d7e6d3ab8b6b1d316828841452 100644
--- a/process/importLead_serverProcess/process.js
+++ b/process/importLead_serverProcess/process.js
@@ -68,6 +68,9 @@ var posOrginfo = getFieldPos(ImportFieldDef, "INFO");
 // Data without headline
 var dsanz = 1;
 
+// set the mappings
+LeadImportUtils.mapping = LeadImportUtils.getMapping(importdefid);
+
 
 try
 {
@@ -125,6 +128,15 @@ try
         //check the COUNTRY
         impvalues[countrypos] = LeadImportUtils.checkCountry(impvalues[countrypos]);
         
+        if (!(getFieldPos(ImportFieldDef, "ISOLANGUAGE").length ==  0)){
+            //get the position of the ISOLANGUAGE
+            var isolanguepos = getFieldPos (FieldDef, "ISOLANGUAGE")[0];
+        
+            //mapp and check the ISOLANGUAGE
+            impvalues[isolanguepos] = LeadImportUtils.getMappedOutputvalue("ISOLANGUAGE", impvalues[isolanguepos]);
+            impvalues[isolanguepos] = LeadImportUtils.checkISOLanguage(impvalues[isolanguepos]);
+        }
+        
         try//import data
         {
             var dupCheck = LeadImportUtils.importData(DataFields, DataTypes, FieldDef, impvalues, importdefid, AttrObject, source, user, currDate);
@@ -146,7 +158,15 @@ catch(err)
     logging.log(err);
 }
 
-LeadImportUtils.scanLeadDups(allContactData);//search for duplicates
+try 
+{
+    LeadImportUtils.scanLeadDups(allContactData);//search for duplicates
+}
+catch (err)
+{
+    logging.log(err);
+}
+
 
 var rows = eMath.subInt(dsanz, 1);
 rows = eMath.subInt(rows, errorCount);//datasetcount - errors = inserts
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cfd92c97942fb960b69e71317d82e75f4f013e0f
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>mark_cachedrecordcontainers_invalid_serverProcess</name>
+  <title>Mark all cached record containers as invalid</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:RECYCLE</icon>
+  <process>%aditoprj%/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js</process>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..402e201144084d4b01593dafbe040bd9416bad6b
--- /dev/null
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/process.js
@@ -0,0 +1,3 @@
+import("system.entities");
+
+entities.invalidateCache();
\ No newline at end of file
diff --git a/process/workflowDeploy_rest/process.js b/process/workflowDeploy_rest/process.js
index 82c3ed4a98aedf4504ec4d250b36a6d6f4e19f90..4b5a9c33f2b5ad99d586be23daac221fcfbeda08 100644
--- a/process/workflowDeploy_rest/process.js
+++ b/process/workflowDeploy_rest/process.js
@@ -1,3 +1,4 @@
+import("Workflow_lib");
 import("system.workflow");
 import("system.util");
 
@@ -6,7 +7,7 @@ function restpost (pRequest)
     var request = JSON.parse(pRequest);
     
     var processObj = JSON.parse(util.decodeBase64String(request.body));
-    if (processObj && processObj.processXML)
+    if (processObj && processObj.processXML && WorkflowUtils.engineIsEnabled())
     {
         var processIds = workflow.getProcessIds(processObj.processXML);
         processIds = processIds != null ? JSON.parse(processIds) : [];
diff --git a/process/workflowRoles_rest/process.js b/process/workflowRoles_rest/process.js
index dd60527468bec7b763a4a8a0b94fea46c88350c8..360a7522eaa827f434f49489f5111cab7f45495c 100644
--- a/process/workflowRoles_rest/process.js
+++ b/process/workflowRoles_rest/process.js
@@ -1,82 +1,102 @@
+import("Workflow_lib");
 import("system.text");
 import("system.tools");
 
 function restget (pRequest)
 {
-    var request = JSON.parse(pRequest);
+    //Workaround for handling corrupt json. Remove when the json problem is fixed.
+    var request;
+    try 
+    {
+        request = JSON.parse(pRequest);
+    }
+    catch (err)
+    {
+        pRequest = pRequest.replace(/"value"\s*?:\s*?"(\{\s*?".+?\})"/, function (foundStr, unescapedJson)
+        {
+            return '"value":"' + unescapedJson.replace(/"/g, '\\"') + '"';
+        });
+        request = JSON.parse(pRequest);
+    }
+    
     var header = request.header;
     var roleIds = header.Ids && JSON.parse(header.Ids);
     var userId = header.Userid;
     
-    if (userId)
-    {
-        //if a userId is present, get only the roles of that user
-        let user = tools.getUserByAttribute(tools.NAME, userId);
-        roleIds = user ? user[tools.ROLENAMES].slice() : [];
-    }
+    var roles = [];
     
-    var roles = tools.getAllRoles([tools.ROLE_PROJECT, tools.ROLE_CUSTOM], false);
-    roles = Object.keys(roles).map(function (role)
+    if (WorkflowUtils.engineIsEnabled())
     {
-        var [title, type, desc, id] = roles[role];
-        return {
-            name : title,
-            id : id,
-            type : type
-        };
-    });
-    
-    //object for handling filtering
-    var filter = {
-        EQUAL : "equal",
-        IGNORECASE : "ignoreCase",
-        IN : "in",
-        LIKE : "like",
-        LIKEIGNORECASE : "likeIgnoreCase",
-        
-        _filters : [],
-        addIfSet : function (pUserPropertyName, pFilterValue, pType)
-        {
-            if (pFilterValue && pFilterValue.length !== 0)
-                this.add(pUserPropertyName, pFilterValue, pType);
-        },
-        add : function (pUserPropertyName, pFilterValue, pType)
+        if (userId)
         {
-            this._filters.push([pUserPropertyName, pFilterValue, pType]);
-        },
-        check : function  (pUser)
+            //if a userId is present, get only the roles of that user
+            let user = tools.getUserByAttribute(tools.NAME, userId);
+            roleIds = user ? user[tools.ROLENAMES].slice() : [];
+        }
+
+        roles = tools.getAllRoles([tools.ROLE_PROJECT, tools.ROLE_CUSTOM], false);
+        roles = Object.keys(roles).map(function (role)
         {
-            return this._filters.every(function ([prop, value, type])
+            var [title, type, desc, id] = roles[role];
+            return {
+                name : title,
+                id : id,
+                type : type
+            };
+        });
+
+        //object for handling filtering
+        var filter = {
+            EQUAL : "equal",
+            IGNORECASE : "ignoreCase",
+            IN : "in",
+            LIKE : "like",
+            LIKEIGNORECASE : "likeIgnoreCase",
+
+            _filters : [],
+            addIfSet : function (pUserPropertyName, pFilterValue, pType)
             {
-                let userValue = pUser[prop] || "";
-                let flags;
-                switch (type)
+                if (pFilterValue && pFilterValue.length !== 0)
+                    this.add(pUserPropertyName, pFilterValue, pType);
+            },
+            add : function (pUserPropertyName, pFilterValue, pType)
+            {
+                this._filters.push([pUserPropertyName, pFilterValue, pType]);
+            },
+            check : function  (pUser)
+            {
+                return this._filters.every(function ([prop, value, type])
                 {
-                    case this.EQUAL:
-                        return userValue == value;
-                    case this.IGNORECASE:
-                        return userValue.toUpperCase() == value.toUpperCase();
-                    case this.IN:
-                        return value.indexOf(userValue) !== -1;
-                    case this.LIKEIGNORECASE:
-                        flags = "i";
-                    case this.LIKE:
-                        value = text.replaceAll(value, {"%" : ".*", "_" : "."});
-                        return new RegExp(value, flags).test(userValue);
-                }
-                return false;
-            }, this);
-        }
-    };
-    
-    //add the filters of the request to the filter object
-    filter.addIfSet("id", header.Id, filter.EQUAL);
-    filter.addIfSet("id", roleIds, filter.IN);
-    filter.addIfSet("name", header.Name, filter.EQUAL);
-    filter.addIfSet("name", header.Namelike, filter.LIKE);
-    filter.addIfSet("name", header.Namelikeignorecase, filter.LIKEIGNORECASE);
-    
-    roles = roles.filter(filter.check, filter); //do the filtering
+                    let userValue = pUser[prop] || "";
+                    let flags;
+                    switch (type)
+                    {
+                        case this.EQUAL:
+                            return userValue == value;
+                        case this.IGNORECASE:
+                            return userValue.toUpperCase() == value.toUpperCase();
+                        case this.IN:
+                            return value.indexOf(userValue) !== -1;
+                        case this.LIKEIGNORECASE:
+                            flags = "i";
+                        case this.LIKE:
+                            value = text.replaceAll(value, {"%" : ".*", "_" : "."});
+                            return new RegExp(value, flags).test(userValue);
+                    }
+                    return false;
+                }, this);
+            }
+        };
+
+        //add the filters of the request to the filter object
+        filter.addIfSet("id", header.Id, filter.EQUAL);
+        filter.addIfSet("id", roleIds, filter.IN);
+        filter.addIfSet("name", header.Name, filter.EQUAL);
+        filter.addIfSet("name", header.Namelike, filter.LIKE);
+        filter.addIfSet("name", header.Namelikeignorecase, filter.LIKEIGNORECASE);
+
+        roles = roles.filter(filter.check, filter); //do the filtering
+    }
     
     request.response.body = JSON.stringify(roles);
 
diff --git a/process/workflowServiceTaskParams_rest/process.js b/process/workflowServiceTaskParams_rest/process.js
index 15f2084ec4d54ef90ec3c8234dd434249fd9a416..529fdbf1cdd8ce6be48c6d209fa785452b504664 100644
--- a/process/workflowServiceTaskParams_rest/process.js
+++ b/process/workflowServiceTaskParams_rest/process.js
@@ -1,8 +1,23 @@
+import("Workflow_lib");
 import("system.workflow");
 
 function restget (pRequest)
 {
-    var request = JSON.parse(pRequest);
+    //Workaround for handling corrupt json. Remove when the json problem is fixed.
+    var request;
+    try 
+    {
+        request = JSON.parse(pRequest);
+    }
+    catch (err)
+    {
+        pRequest = pRequest.replace(/"value"\s*?:\s*?"(\{\s*?".+?\})"/, function (foundStr, unescapedJson)
+        {
+            return '"value":"' + unescapedJson.replace(/"/g, '\\"') + '"';
+        });
+        request = JSON.parse(pRequest);
+    }
+    
     var jditoProcess = request.header.Jditoprocess;
     
     /* this is an object containing the values currently set in the modeler, it looks like this:
@@ -12,7 +27,9 @@ function restget (pRequest)
      * }
      */
     var currentValues = request.header.Currentvalues;
-    var parameters = workflow.getServiceTaskParameters(jditoProcess, currentValues);
+    var parameters = jditoProcess && WorkflowUtils.engineIsEnabled()
+        ? workflow.getServiceTaskParameters(jditoProcess, currentValues)
+        : null;
     
     request.response.body = parameters || "[]";
 
diff --git a/process/workflowServiceTasks_rest/process.js b/process/workflowServiceTasks_rest/process.js
index 470717e7e185c7c7af401533042bcac29582bee1..0831b230247a2dae697df15869bf9613519ade48 100644
--- a/process/workflowServiceTasks_rest/process.js
+++ b/process/workflowServiceTasks_rest/process.js
@@ -1,3 +1,4 @@
+import("Workflow_lib");
 import("Sql_lib");
 import("system.project");
 import("system.process");
@@ -5,15 +6,19 @@ import("system.process");
 function restget (pRequest)
 {
     var request = JSON.parse(pRequest);
+    var serviceTasks = [];
     
-    var serviceTaskNames = process.getProcesses([process.VARIANT_WORKFLOW]);
-    var serviceTasks = project.getDataModels(project.DATAMODEL_KIND_PROCESS, serviceTaskNames).map(function (row)
+    if (WorkflowUtils.engineIsEnabled())
     {
-        return {
-            id : row[0],
-            name : row[1] || row[0]
-        };
-    });
+        var serviceTaskNames = process.getProcesses([process.VARIANT_WORKFLOW]);
+        serviceTasks = project.getDataModels(project.DATAMODEL_KIND_PROCESS, serviceTaskNames).map(function (row)
+        {
+            return {
+                id : row[0],
+                name : row[1] || row[0]
+            };
+        });
+    }
     
     request.response.body = JSON.stringify(serviceTasks);
 
diff --git a/process/workflowUsers_rest/process.js b/process/workflowUsers_rest/process.js
index 99246ce894bff9755188ae39982a98d885d8eee5..c9368b9006e371c6c0ab80ab006a83b3d9a33a47 100644
--- a/process/workflowUsers_rest/process.js
+++ b/process/workflowUsers_rest/process.js
@@ -1,3 +1,4 @@
+import("Workflow_lib");
 import("system.text");
 import("system.vars");
 import("system.logging");
@@ -10,7 +11,21 @@ function restget (pRequest)
     //minimum required length of the search pattern
     const MIN_SEARCHLENGTH = 0;
 
-    var request = JSON.parse(pRequest);
+    //Workaround for handling corrupt json. Remove when the json problem is fixed.
+    var request;
+    try 
+    {
+        request = JSON.parse(pRequest);
+    }
+    catch (err)
+    {
+        pRequest = pRequest.replace(/"value"\s*?:\s*?"(\{\s*?".+?\})"/, function (foundStr, unescapedJson)
+        {
+            return '"value":"' + unescapedJson.replace(/"/g, '\\"') + '"';
+        });
+        request = JSON.parse(pRequest);
+    }
+    
     var header = request.header;
     var userFilter = header.Userfilter 
         ? JSON.parse(header.Userfilter)
@@ -95,7 +110,7 @@ function restget (pRequest)
     function _getUsers (pSearch)
     {
         //empty result if the search value does not have the minimal required length
-        if (pSearch !== undefined && pSearch.trim() < MIN_SEARCHLENGTH)
+        if ((pSearch !== undefined && pSearch.trim() < MIN_SEARCHLENGTH) || !WorkflowUtils.engineIsEnabled())
             return [];
         
         //if the search value contains spaces, it will be split into individual words, every word must be found
diff --git a/report/Organisation_report/Organisation_report.aod b/report/Organisation_report/Organisation_report.aod
index 0d4e3d583a6c710d89307a87795d36f95418d8ac..f04a61ab015d5ed7d780e2fcdf2280ee1735fa44 100644
--- a/report/Organisation_report/Organisation_report.aod
+++ b/report/Organisation_report/Organisation_report.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
   <name>Organisation_report</name>
-  <title>Kundenstammblatt</title>
+  <title>Customer Base Sheet</title>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>%aditoprj%/report/Organisation_report/icon.png</icon>
diff --git a/report/Reminder_report/Reminder_report.aod b/report/Reminder_report/Reminder_report.aod
index f36b26362cf772bd2f0e45c006c6134b18a6d019..795c6170335a88d2b82bd336dc44af6230de5d2c 100644
--- a/report/Reminder_report/Reminder_report.aod
+++ b/report/Reminder_report/Reminder_report.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
   <name>Reminder_report</name>
-  <title>Mahnung</title>
+  <title>Reminder</title>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <reportData>%aditoprj%/report/Reminder_report/reportData.jrxml</reportData>