HTML Entities + Use the right template

Courgette was using the wrong template. I assume it was a mistake.

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 %}