diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
index 81770bcb119b9ec1406eed35ce6bdb293d6374fb..fc7be7e82c94f2486f24da75d07ec4d92ba20c4f 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
@@ -14,8 +14,6 @@
             <column name="EXTERNAL_SERVICE_USAGE_ALLOWED" type="INTEGER" >
                 <constraints nullable="false"/>
             </column>
-            <column name="ID_FIELD_NAME" type="NVARCHAR(100)" />
-            <column name="SCAN_PATTERN" type="NVARCHAR(4000)" />
             <column name="USER_NEW" type="NVARCHAR(50)">
                 <constraints nullable="false"/>
             </column>
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb66aa7f870dff79b9f0653f66a2dbed4f5ade00
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml
@@ -0,0 +1,28 @@
+<?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.buechler" id="1c532327-8b0f-4f0d-b160-dd75db93cecb">
+        <createTable tableName="DUPLICATESCANNERINDEXCONFIG">
+            <column name="ID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERINDEXCONFIG_ID"/>
+            </column>
+            <column name="DUPLICATESCANNER_ID" type="CHAR(36)">
+                <constraints nullable="false" />
+            </column>
+            <column name="ENTITY_FIELD_NAME" type="NVARCHAR(100)" />
+            <column name="IS_ID_FIELD" type="INTEGER" >
+                <constraints nullable="false"/>
+            </column>
+            <column name="USE_FOR_INDEX_DUPLICATE_SEARCH" type="INTEGER" >
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="DATE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_EDIT" type="NVARCHAR(50)" />
+            <column name="DATE_EDIT" type="DATE"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78e3f8c3d81a1e12a33dccfb63820c962953bc50
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml
@@ -0,0 +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="d.buechler" id="cf165521-f2bb-4941-82ee-c4a5812ea8b8">
+        <createTable tableName="DUPLICATESCANNERPREFILTERCONFIG">
+            <column name="ID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERPREFILTERCONFIG_ID"/>
+            </column>
+            <column name="DUPLICATESCANNER_ID" type="CHAR(36)">
+                <constraints nullable="false" />
+            </column>
+            <column name="FILTER_CONDITION" type="CLOB" />
+            <column name="COUNT_CHARACTERS_TO_USE" type="INTEGER" />
+            <column name="MAX_RESULTS_THRESHOLD" type="INTEGER" />
+            <column name="CONDITION_CONFIG_NAME" type="NVARCHAR(200)"/>
+            
+            <column name="USER_NEW" type="NVARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="DATE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="USER_EDIT" type="NVARCHAR(50)" />
+            <column name="DATE_EDIT" type="DATE"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
index 959073dddf702cabce345853fba156d35415a800..6f631428d208824bcdc8d082cb33ff711b64fcaa 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
@@ -14,6 +14,8 @@
 
     <include relativeToChangelogFile="true" file="Duplicates/create_duplicateClusters.xml"/>
     <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScanner.xml"/>
+    <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerPrefilterConfig.xml"/>
+    <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerIndexConfig.xml"/>
     <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerResultFieldsConfig.xml"/>
     <include relativeToChangelogFile="true" file="Duplicates/create_unrelatedDuplicates.xml"/>
 </databaseChangeLog>
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
new file mode 100644
index 0000000000000000000000000000000000000000..48074afa89c5f371c46dbd3138efd40f8cae1ea2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml
@@ -0,0 +1,12 @@
+<?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.buechler" id="279d7d76-1b21-4c03-ae0e-5b8e19af5614">
+    <addColumn tableName="DUPLICATESCANNER">
+        <column name="ID_FIELD_NAME" type="NVARCHAR(100)"/>
+    </addColumn>
+    <addColumn tableName="DUPLICATESCANNER">
+        <column name="SCAN_PATTERN" type="NVARCHAR(4000)"/>
+    </addColumn>
+</changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerIndexConfig.xml b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerIndexConfig.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af4d378114841bb36af38ffbed5379d930cd218e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerIndexConfig.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">
+<changeSet author="d.buechler" id="f82b4092-a1d1-469d-a345-b820750aaa56">
+    <dropTable tableName="DUPLICATESCANNERINDEXCONFIG" />
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerPrefilterConfig.xml b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerPrefilterConfig.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8e4ff2d9039db26c7f92e557c4f569117099e896
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.3.2/Duplicates/drop_duplicateScannerPrefilterConfig.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">
+<changeSet author="d.buechler" id="f8b9b569-772d-4bed-94aa-8596f8bb6504">
+    <dropTable tableName="DUPLICATESCANNERPREFILTERCONFIG" />
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/changelog.xml b/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
index edc8f2873350c12db43dba973114d437efe0a302..5b0a63479333d4e803f0c9bf37ce7feded61c6db 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/changelog.xml
@@ -7,4 +7,9 @@
     <include relativeToChangelogFile="true" file="leadimport/changelog.xml"/>
     <include relativeToChangelogFile="true" file="AttributeLoyalty_newValue_unknown.xml"/>
     <include relativeToChangelogFile="true" file="reworkDbIndexes.xml"/>
+    <include relativeToChangelogFile="true" file="update_attriubteTheme.xml"/>
+
+    <include relativeToChangelogFile="true" file="Duplicates/drop_duplicateScannerPrefilterConfig.xml"/>
+    <include relativeToChangelogFile="true" file="Duplicates/drop_duplicateScannerIndexConfig.xml"/>
+    <include relativeToChangelogFile="true" file="Duplicates/alter_duplicateScanner.xml"/>
 </databaseChangeLog>