3 files changed, 4 insertions, 3 deletions

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index ce99fe0ac..ac7179158 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -16,7 +16,7 @@
 {%- endmacro %}
 {%- macro search_url() %}{{ url_for('search', _external=True) }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&language={{ current_language }}{% endif %}{% endmacro -%}
 
-{% block title %}{% if query_in_title %}{{- q|e -}} - {% endif %}{% endblock %}
+{% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %}
 {% block meta %}{{"    "}}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ search_url() }}&amp;format=rss">{% endblock %}
 {% block content %}
     {% include 'oscar/search.html' %}
diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html
index 5a279bd7d..72e10e075 100644
--- a/searx/templates/simple/results.html
+++ b/searx/templates/simple/results.html
@@ -7,7 +7,7 @@
         {% endfor %}
     {% endfor %}
 {%- endmacro %}
-{% block title %}{% if query_in_title %}{{- q|e -}} - {% endif %}{% endblock %}
+{% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %}
 {% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ url_for('search', _external=True) }}?q={{ q|urlencode }}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}&amp;pageno={{ pageno }}&amp;time_range={{ time_range }}&amp;language={{ current_language }}&amp;safesearch={{ safesearch }}&amp;format=rss">{% endblock %}
 {% block content %}
 <nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
diff --git a/searx/webapp.py b/searx/webapp.py
index 613849dc4..b6dc18937 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -916,7 +916,8 @@ def autocompleter():
         suggestions = json.dumps([sug_prefix, results])
         mimetype = 'application/x-suggestions+json'
 
-    suggestions = escape(suggestions, False)
+    if get_current_theme_name() == 'simple':
+        suggestions = escape(suggestions, False)
     return Response(suggestions, mimetype=mimetype)