diff --git a/filter_plugins/TODO.md b/filter_plugins/TODO.md
new file mode 100644
index 00000000..53ab8347
--- /dev/null
+++ b/filter_plugins/TODO.md
@@ -0,0 +1,2 @@
+# Todos
+- Refactor all 4 functions to one
\ No newline at end of file
diff --git a/filter_plugins/configuration_filters.py b/filter_plugins/configuration_filters.py
index fdbe66ad..8c1b4d63 100644
--- a/filter_plugins/configuration_filters.py
+++ b/filter_plugins/configuration_filters.py
@@ -14,7 +14,7 @@ def get_oidc_enabled(applications, application_id):
 
 def get_features_iframe(applications, application_id):
     app = applications.get(application_id)
-    enabled = app.features.iframe
+    enabled = app.get('features', {}).get('iframe', False)
     return bool(enabled)
 
 def get_database_central_storage(applications, application_id):
diff --git a/roles/nginx-domain-setup/vars/main.yml b/roles/nginx-domain-setup/vars/main.yml
index a77d1a06..53006072 100644
--- a/roles/nginx-domain-setup/vars/main.yml
+++ b/roles/nginx-domain-setup/vars/main.yml
@@ -1,2 +1,2 @@
-configuration_destination:        "{{nginx.directories.http.servers}}{{domain}}.conf"
-final_oauth2_enabled:             "{{applications[application_id].get('features', {}).get('oauth2', False)}}"
\ No newline at end of file
+configuration_destination:  "{{nginx.directories.http.servers}}{{domain}}.conf"
+final_oauth2_enabled:       "{{applications[application_id].get('features', {}).get('oauth2', False)}}"
\ No newline at end of file
diff --git a/roles/nginx-modifier-all/templates/global.includes.conf.j2 b/roles/nginx-modifier-all/templates/global.includes.conf.j2
index 7a0b1b8b..2f4d5d99 100644
--- a/roles/nginx-modifier-all/templates/global.includes.conf.j2
+++ b/roles/nginx-modifier-all/templates/global.includes.conf.j2
@@ -2,8 +2,8 @@
 sub_filter_once off;
 sub_filter_types text/html;
 
-{% set features_css_final                = applications.get(application_id).get('features').get('css') | bool %}
-{% set features_matomo_final    = applications.get(application_id).get('features').get('matomo') | bool %}
+{% set features_css_final     = applications.get(application_id).get('features').get('css') | bool %}
+{% set features_matomo_final  = applications.get(application_id).get('features').get('matomo') | bool %}
 
 
 {% if features_matomo_final | bool %}