1 files changed, 6 insertions, 6 deletions

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 5f097f3f..84fc8e8b 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -21,7 +21,7 @@
             {% elseif view == 'fav' %}{% trans "No articles favourited" %}
             {% elseif view == 'archive' %}{% trans "No articles marked as read" %}
             {% elseif view == 'tags' %}{% trans "No articles with this tag found" %}
-            {% elseif search_term is defined %} {% trans %}No articles found for « {{ search_term }} »{% endtrans %}
+            {% elseif searchterm is defined %} {% trans %}No articles found for « {{ searchterm }} »{% endtrans %}
             {% else %}{% trans "No articles found" %}{% endif %}
             </p></div>
             {% else %}
@@ -41,8 +41,8 @@
                         {{ nb_results }} {% trans "articles marked as read" %}
                     {% elseif view == 'tag' %}
                         {{ nb_results }} {% trans "articles with this tag" %}
-                    {% elseif search_term is defined %}{{ nb_results }}
-                        {% trans %}articles found for « {{ search_term }} »{% endtrans %}
+                    {% elseif searchterm is defined %}
+                    {{ nb_results }} {% trans %}articles found for « {{ searchterm }} »{% endtrans %}
                     {% else %}
                         {{ nb_results }} {% trans "articles" %}
                     {% endif %}
@@ -58,7 +58,7 @@
                         {% elseif view == 'fav' %}{% trans "Just one article favourited" %}
                         {% elseif view == 'archive' %}{% trans "One article marked as read" %}
                         {% elseif view == 'tag' %}{% trans "One article with this tag" %}
-                        {% elseif search_term is defined %}{% trans %}Only one result found for « {{ search_term }} »{% endtrans %}
+                        {% elseif searchterm is defined %}{% trans %}Only one result found for « {{ searchterm }} »{% endtrans %}
                         {% else %}{% trans "One article found" %}{% endif %}</div>
                      </div>
                     {% endif %}
@@ -91,20 +91,20 @@
 
             {% if tag %}<a title="{% trans "Mark all articles from this tag as read" %}" href="./?action=toggle_archive&amp;tag_id={{ tag.id }}">{% trans "Mark all articles from this tag as read" %}</a><br />{% endif %}
 
-            {% if entries is not empty %}
             {% if tag %}
             {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this tag in an epub file" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as ePub3" %}</a>{% endif %}
             {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this tag in a mobi file" %}" href="./?mobi&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as Mobi" %}</a>{% endif %}
             {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this tag in a pdf file" %}" href="./?pdf&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download as PDF" %}</a>{% endif %}
+
             {% elseif searchterm is defined %}
             {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as ePub3" %}</a>{% endif %}
             {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this search in a mobi file" %}" href="./?mobi&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as Mobi" %}</a>{% endif %}
             {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this search in a pdf file" %}" href="./?pdf&amp;method=search&amp;value={{ searchterm }}">{% trans "Download as PDF" %}</a>{% endif %}
+
             {% else %}
             {% if constant('EPUB') == 1 %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download as ePub3" %}</a>{% endif %}
             {% if constant('MOBI') == 1 %}<a title="{% trans "Download the articles from this category in a mobi file" %}" href="./?mobi&amp;method=category&amp;value={{ view }}">{% trans "Download as Mobi" %}</a>{% endif %}
             {% if constant('PDF') == 1 %}<a title="{% trans "Download the articles from this category in a pdf file" %}" href="./?pdf&amp;method=category&amp;value={{ view }}">{% trans "Download as PDF" %}</a>{% endif %}
             {% endif %}
-            {% endif %}
 {% endif %}
 {% endblock %}