1 files changed, 28 insertions, 16 deletions
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 665f2e638..d68e90e4a 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -37,19 +37,19 @@
 {%- endmacro -%}
 
 {%- macro plugin_preferences(section) -%}
-{%- for plugin in plugins -%}
-{%- if plugin.preference_section == section -%}
-<fieldset>{{- '' -}}
-    <legend>{{ _(plugin.name) }}</legend>{{- '' -}}
-    <div class="value">
-      {{- checkbox_onoff_reversed('plugin_' + plugin.id, plugin.id not in allowed_plugins, 'plugin_labelledby' + plugin.id) -}}
-    </div>{{- '' -}}
-    <div class="description" id="{{ 'plugin_labelledby' + plugin.id }}">
-      {{- _(plugin.description) -}}
-    </div>{{- '' -}}
-</fieldset>
-{%- endif -%}
-{%- endfor -%}
+  {%- for plugin in plugins_storage -%}
+    {%- if plugin.preference_section == section -%}
+      <fieldset>{{- '' -}}
+	<legend>{{ _(plugin.name) }}</legend>{{- '' -}}
+	<div class="value">
+	  {{- checkbox_onoff_reversed('plugin_' + plugin.id, plugin.id not in allowed_plugins, 'plugin_labelledby' + plugin.id) -}}
+	</div>{{- '' -}}
+	<div class="description" id="{{ 'plugin_labelledby' + plugin.id }}">
+	  {{- _(plugin.description) -}}
+	</div>{{- '' -}}
+      </fieldset>
+    {%- endif -%}
+  {%- endfor -%}
 {%- endmacro -%}
 
 {%- macro engine_about(search_engine) -%}
@@ -158,6 +158,7 @@
   <form id="search_form" method="post" action="{{ url_for('preferences') }}" autocomplete="off">
     {{- tabs_open() -}}
 
+    {# tab: general #}
 
     {{- tab_header('maintab', 'general', _('General'), True) -}}
     {%- if 'categories' not in locked_preferences -%}
@@ -179,13 +180,16 @@
     {% if 'safesearch' not in locked_preferences %}
       {%- include 'simple/preferences/safesearch.html' -%}
     {%- endif -%}
+    {%- include 'simple/preferences/tokens.html' -%}
     {{- plugin_preferences('general') -}}
+
+
     {%- if 'doi_resolver' not in locked_preferences %}
       {%- include 'simple/preferences/doi_resolver.html' -%}
     {%- endif -%}
-    {%- include 'simple/preferences/tokens.html' -%}
     {{- tab_footer() -}}
 
+    {# tab: ui #}
 
     {{- tab_header('maintab', 'ui', _('User interface')) -}}
     {%- if 'locale' not in locked_preferences -%}
@@ -208,6 +212,7 @@
     {{- plugin_preferences('ui') -}}
     {{- tab_footer() -}}
 
+    {# tab: privacy #}
 
     {{- tab_header('maintab', 'privacy', _('Privacy')) -}}
     {%- if 'method' not in locked_preferences -%}
@@ -222,6 +227,8 @@
     {{- plugin_preferences('privacy') -}}
     {{- tab_footer() -}}
 
+    {# tab: enignes #}
+
     {{- tab_header('maintab', 'engines', _('Engines')) -}}
     <p>
       {{- _('Currently used search engines') -}}
@@ -231,18 +238,23 @@
     {{- tabs_close() -}}
     {{- tab_footer() -}}
 
+    {# tab: query #}
 
     {{- tab_header('maintab', 'query', _('Special Queries')) -}}
-    {%- if answerers -%}
+    {%- if answer_storage -%}
       {%- include 'simple/preferences/answerers.html' -%}
     {%- endif -%}
     {{- tab_footer() -}}
 
+    {# tab: cookies #}
+
     {{- tab_header('maintab', 'cookies', _('Cookies')) -}}
     {%- include 'simple/preferences/cookies.html' -%}
     {{- tab_footer() -}}
-
     {{- tabs_close() -}}
+
+    {# footer with save & reset buttons #}
+
     {%- include 'simple/preferences/footer.html' -%}
 
   </form>{{- '' -}}