2 files changed, 6 insertions, 4 deletions

diff --git a/index.php b/index.php
index 82a92473..b4c4347a 100644
--- a/index.php
+++ b/index.php
@@ -1021,7 +1021,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
 
     // -------- User wants to see only untagged links (toggle)
     if (isset($_GET['untaggedonly'])) {
-        $_SESSION['untaggedonly'] = !empty($_SESSION['untaggedonly']);
+        $_SESSION['untaggedonly'] = empty($_SESSION['untaggedonly']);
 
         if (! empty($_SERVER['HTTP_REFERER'])) {
             $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('untaggedonly'));
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html
index 254397fb..a3e741d3 100644
--- a/tpl/default/tag.list.html
+++ b/tpl/default/tag.list.html
@@ -13,9 +13,11 @@
   <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
     {$countTags=count($tags)}
     <h2 class="window-title">{'Tag list'|t} - {$countTags} {'tags'|t}</h2>
-    <p style="text-align: center">
-      <a href="?searchtags={$search_tags|urlencode}">{'List all links with those tags'|t}</a>
-    </p>
+    {if="!empty($search_tags)"}
+      <p class="center">
+        <a href="?searchtags={$search_tags|urlencode}">{'List all links with those tags'|t}</a>
+      </p>
+    {/if}
 
     <div id="search-tagcloud" class="pure-g">
       <div class="pure-u-lg-1-4"></div>