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"/>