diff --git a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
index b94480075bcdddbb678bcaa40e61aaa420669329..3cab67efb57200904fe58380978093b9bb00a967 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
@@ -5,9 +5,12 @@
         <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 +32,23 @@
         <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>
     </changeSet>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index c3a1d3c5759b118fd0d3d4e30e38f246a3f28166..8b0160a2bde8ebbc8f8d15af62dead828d7bfa81 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,5 +18,5 @@
     <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:-->
-    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index bd124f29d2b00a6be7d4e8cf09ebf4f687a46821..dde67708f266c7176ea4343d2c62183e5def3a6d 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -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>
@@ -14405,7 +14405,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14544,7 +14544,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14558,7 +14558,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14870,7 +14870,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14926,7 +14926,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14940,7 +14940,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>