diff --git a/aircox_cms/templates/aircox_cms/dynamic_list_page.html b/aircox_cms/templates/aircox_cms/dynamic_list_page.html
index 17c28dd..0e0aed2 100755
--- a/aircox_cms/templates/aircox_cms/dynamic_list_page.html
+++ b/aircox_cms/templates/aircox_cms/dynamic_list_page.html
@@ -12,18 +12,18 @@
 {# Translators: terms are search terms, or tag tarms. url: url to the page #}
 {% with terms=list_selector.terms %}
 {% if terms %}
-{% blocktrans %}Search in publications for <i>{{ terms }}</i>{% endblocktrans %}
+    {% blocktrans %}Search in publications for <i>{{ terms }}</i>{% endblocktrans %}
 {% elif list_selector.filter_related %}
 {# should never happen #}
-{% with title=list_selector.filter_related.title url=list_selector.filter_related.url %}
-{% blocktrans %}
-    Related to <a href="{{ url }}">{{ title }}</a>{% endblocktrans %}
-{% endwith %}
+    {% with title=list_selector.filter_related.title url=list_selector.filter_related.url %}
+    {% blocktrans %}
+    Related to <a href="{{ url }}">{{ title }}</a>
+    {% endblocktrans %}
+    {% endwith %}
 {% else %}
-{% blocktrans %}All the publications{% endblocktrans %}
+    {% blocktrans %}All the publications{% endblocktrans %}
 {% endif %}
 {% endwith %}
-{% endif %}
 </h1>
 {% endblock %}
 
@@ -36,18 +36,16 @@
             {{ related.summary }}
             <a href="{{ related.url }}">{% trans "More about it" %}</a>
         </div>
-        {% elif page.body %}
+    {% elif page.body %}
         <div class="body">
         {{ page.body|richtext }}
         </div>
-        {% endif %}
-        {% endwith %}
-
-        {% with list_paginator=paginator %}
-        {% include "aircox_cms/snippets/list.html" %}
-        {% endwith %}
     {% endif %}
 {% endwith %}
+
+{% with list_paginator=paginator %}
+{% include "aircox_cms/snippets/list.html" %}
+{% endwith %}
 {% endblock %}
 
 
diff --git a/aircox_cms/templates/aircox_cms/sections/section_search_field.html b/aircox_cms/templates/aircox_cms/sections/section_search_field.html
index ea04380..159cd0b 100755
--- a/aircox_cms/templates/aircox_cms/sections/section_search_field.html
+++ b/aircox_cms/templates/aircox_cms/sections/section_search_field.html
@@ -5,7 +5,7 @@
 {% load wagtailsettings_tags %}
 
 {% block content %}
-{% with list_page=settings.cms.WebsiteSettings.list_page %}
+{% with list_page=settings.aircox_cms.WebsiteSettings.list_page %}
 <form action="{{ list_page.url }}" method="GET">
     <img src="{% static "aircox_cms/images/search.png" %}" class="icon"/>
     <input type="text" name="search" placeholder="{{ self.default_text }}">