6 files changed, 9 insertions, 10 deletions
diff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html
index 1f15ff2bb..ebda5380b 100644
--- a/searx/templates/courgette/result_templates/images.html
+++ b/searx/templates/courgette/result_templates/images.html
@@ -1,6 +1,6 @@
 <div class="image_result">
     <p>
-        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title={{ result.title }}/></a>
+        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
         <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
     </p>
 </div>
diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html
index d0b53b48a..62bef8c90 100644
--- a/searx/templates/courgette/results.html
+++ b/searx/templates/courgette/results.html
@@ -10,7 +10,7 @@
 
         <div id="search_url">
             {{ _('Search URL') }}:
-            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />
+            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
         </div>
         <div id="apis">
         {{ _('Download results') }}
@@ -43,9 +43,9 @@
 
     {% for result in results %}
         {% if result['template'] %}
-            {% include 'default/result_templates/'+result['template'] %}
+            {% include 'courgette/result_templates/'+result['template'] %}
         {% else %}
-            {% include 'default/result_templates/default.html' %}
+            {% include 'courgette/result_templates/default.html' %}
         {% endif %}
     {% endfor %}
 
diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html
index d03b008f9..d3ff8f06d 100644
--- a/searx/templates/default/infobox.html
+++ b/searx/templates/default/infobox.html
@@ -1,6 +1,6 @@
 <div class="infobox">
   <h2>{{ infobox.infobox }}</h2>
-  {% if infobox.img_src %}<img src="{{ infobox.img_src }}" />{% endif %}
+  {% if infobox.img_src %}<img src="{{ infobox.img_src }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %}
   <p>{{ infobox.entity }}</p>
   <p>{{ infobox.content | safe }}</p>
   {% if infobox.attributes %}
diff --git a/searx/templates/default/result_templates/images.html b/searx/templates/default/result_templates/images.html
index bead78c48..4c6d59e01 100644
--- a/searx/templates/default/result_templates/images.html
+++ b/searx/templates/default/result_templates/images.html
@@ -1,6 +1,6 @@
 <div class="image_result">
     <p>
-        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title }}"/></a>
+        <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}" /></a>
         <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
     </p>
 </div>
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html
index 6c62793a5..5925f1313 100644
--- a/searx/templates/default/result_templates/torrent.html
+++ b/searx/templates/default/result_templates/torrent.html
@@ -1,7 +1,6 @@
 <div class="result torrent_result">
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-    {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
-    <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p>
-    <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p>
     <p class="url">{{ result.pretty_url }}</p>
+    {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
+    <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a> - <span class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</span></p>
 </div>
diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index 541983532..199eb1d96 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -10,7 +10,7 @@
 
         <div id="search_url">
             {{ _('Search URL') }}:
-            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />
+            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&amp;pageno={{ pageno }}{% if selected_categories %}&amp;category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly />
         </div>
         <div id="apis">
         {{ _('Download results') }}