diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
index 63d3018343756ec51a4d8843e8d48403c0d2cc9f..8ea8bcf1040a39585fe90f35deeaaded71aa26d6 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
@@ -18,7 +18,7 @@
             <column name="SUBJECT" type="NVARCHAR(200)"/>
             <column name="SENTDATE" type="DATETIME"/>
             <column name="SENDER" type="NVARCHAR(1000)"/>
-            <column name="RECIPIENTS" type="NVARCHAR(4000)"/>
+            <column name="RECIPIENTS" type="NCLOB"/>
             <column name="MAIL" type="NCLOB"/>
         </createTable>
         <createIndex indexName="IDX_AB_UNLINKEDMAILID_SENTDATE" tableName="AB_UNLINKEDMAIL">
diff --git a/.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml
index 48074afa89c5f371c46dbd3138efd40f8cae1ea2..abee96da121530d75c4070efae2e4add465c59a5 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml
@@ -6,7 +6,7 @@
         <column name="ID_FIELD_NAME" type="NVARCHAR(100)"/>
     </addColumn>
     <addColumn tableName="DUPLICATESCANNER">
-        <column name="SCAN_PATTERN" type="NVARCHAR(4000)"/>
+        <column name="SCAN_PATTERN" type="NCLOB"/>
     </addColumn>
 </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.3.2/reworkDbIndexes.xml b/.liquibase/Data_alias/basic/2019.3.2/reworkDbIndexes.xml
index 32c1ff9347645f95897e1fcb852346b73117a11a..62c9c29573a17ca606e5c08d2f5ed680729208ae 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/reworkDbIndexes.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/reworkDbIndexes.xml
@@ -10,6 +10,16 @@
             <column name="ACTIVITY_ID"/>
         </createIndex>
     </changeSet>
+    <changeSet id="e7527e13-7546-4fa6-ac95-5cc3e1f27056" author="s.listl" dbms="!oracle">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <changeSetExecuted id="5a0b62f4-6770-454c-9a0e-d60ca16596dd" author="j.goderbauer"/>
+            </not>
+        </preConditions>
+        <createIndex indexName="IDX_TICKET_TASK_ID" tableName="TICKET">
+            <column name="TASK_ID"/>
+        </createIndex>
+    </changeSet>
     <!--indexes for all dbms-->
     <changeSet author="j.goderbauer" id="5a0b62f4-6770-454c-9a0e-d60ca16596dd">
         <!--remove problematic indexes-->
@@ -46,9 +56,6 @@
         </createIndex>
         
         <!--set all the referencing ids as single index now-->
-        <createIndex indexName="IDX_TICKET_TASK_ID" tableName="TICKET">
-            <column name="TASK_ID"/>
-        </createIndex>
         <createIndex indexName="IDX_CONTACT_ORGANISATION_ID" tableName="CONTACT">
             <column name="ORGANISATION_ID"/>
         </createIndex>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml b/.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml
index 86989600807b32fba76fc6b052f08f007cb4f390..2cabebd22aa4bfa08b01502e5d28ee906f6e1d4c 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml
@@ -1,7 +1,7 @@
 <?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 id="0aa81d84-7456-4240-91e0-a915f38abbd7" author="s.pongratz" >
+    <changeSet id="0aa81d84-7456-4240-91e0-a915f38abbd7" author="s.pongratz" dbms="!oracle">
         <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNCOST" columnDataType="DATETIME" validate="true"/>
         <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNPARTICIPANT" columnDataType="DATETIME" validate="true"/>
         <addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNSTEP" columnDataType="DATETIME" validate="true"/>
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 9e31af2c9427a6976dc010890598ca2862ad85e0..372497186413416a3a27831bd933c08792bbd0d2 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
@@ -15,6 +15,7 @@
     
     <changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
         <dropPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" dropIndex="true"/>
+        <dropNotNullConstraint tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID"/>
         <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"/>
diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index c3eab6fea6cdd0fe13a20852ee965f5581c2be5c..bf7010bb7a919e90d1688ba6ce5c12012727b5fb 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -8,15 +8,9 @@
         <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>
         <createIndex tableName="DOCUMENTTEMPLATEPLACEOFUSE" indexName="IDX_DOCUMENTTEMPLATEUSE_DT_ID">
             <column name="DOCUMENTTEMPLATE_ID"/>
         </createIndex>
-        <createIndex tableName="EXPORTTEMPLATEFIELD" indexName="IDX_EXPORTTEMPLATEFIELD_ET_ID">
-            <column name="EXPORTTEMPLATE_ID"/>
-        </createIndex>
         <createIndex tableName="VISITRECOMMENDATION" indexName="IDX_VISITRECOMMEND_CONTACT_ID">
             <column name="CONTACT_ID"/>
         </createIndex>
@@ -29,9 +23,6 @@
         <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>