diff --git a/.liquibase/Data_alias/basic/2021.0.3/DSGVO/create_DSGVODeleteFlag.xml b/.liquibase/Data_alias/basic/2021.0.3/DSGVO/create_DSGVODeleteFlag.xml
index fde4201e56e2eb3351164b47ea6ffd9f98f24de8..b633ff087812d6595c9bfb1336ff6e34c4dee6a0 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/DSGVO/create_DSGVODeleteFlag.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/DSGVO/create_DSGVODeleteFlag.xml
@@ -10,8 +10,8 @@
             <column name="USER_NEW" type="NVARCHAR(50)" />
             <column name="DATE_NEW" type="DATETIME" />
         </createTable>
+        <createIndex tableName="DSGVODELETEFLAG" indexName="IDX_DSGVODELETEFLAG_CONTACT_ID">
+            <column name="CONTACT_ID"/>
+        </createIndex>
     </changeSet>
-    <createIndex tableName="DSGVODELETEFLAG" indexName="IDX_DSGVODELETEFLAG_CONTACT_ID">
-        <column name="CONTACT_ID"/>
-    </createIndex>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Address_entity/afterOperatingState.js b/entity/Address_entity/afterOperatingState.js
index 8a3ecf6feb69c7114b5845521e125a69fc317e91..83cbe277d0eae36e6744186d6d70f35fb00f42f8 100644
--- a/entity/Address_entity/afterOperatingState.js
+++ b/entity/Address_entity/afterOperatingState.js
@@ -6,8 +6,8 @@ if (vars.exists("$field.AddressSearch"))
 {
     neon.setFieldValue("$field.AddressSearch", "");//why is this needed?
 }
-    
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+   
+if(vars.exists("$sys.operatingstate") && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
 {
     vars.set("$context.PushDataPrivacyNotification", "false");
 }