diff --git a/README.md b/README.md
index f699bcd8ae..c72a70d234 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ selfoss
 Copyright (c) 2013 Tobias Zeising, tobias.zeising@aditu.de  
 http://selfoss.aditu.de  
 Licensed under the GPLv3 license  
-Version 2.6-SNAPSHOT
+Version 2.6
 
 
 INSTALLATION
@@ -50,11 +50,12 @@ Visit the page http://yourselfossurl.com/opml for importing your OPML File. If y
 CHANGELOG
 ---------
 
-Version 2.6-SNAPSHOT
+Version 2.6
 * fixed OPML import for other formats (thanks a lot to Remy Gardette)
 * fix deletion of sources (no longer bad request)
 * disable tag click on smartphone
 * shortcuts mark/unmark as read and star/unstar also available on closed articles
+* fix tag list refresh
 
 Version 2.5
 * new navigation with right/left cursor (thanks a lot to jicho)
diff --git a/_docs/website/index.html b/_docs/website/index.html
index 1597aae853..d9e34b5187 100644
--- a/_docs/website/index.html
+++ b/_docs/website/index.html
@@ -26,7 +26,7 @@ <h1 id="header-name"><span>selfoss</span></h1>
             <li class="documentation">documentation</li>
             <li class="about">about</li>
             <li class="forum"><a href="/forum">forum</a></li>
-            <li class="download"><a href="selfoss-2.5.zip">download</a></li>
+            <li class="download"><a href="selfoss-2.6.zip">download</a></li>
         </ul>
         
         <a id="header-fork" href="https://github.com/SSilence/selfoss"></a>
@@ -35,7 +35,7 @@ <h1 id="header-name"><span>selfoss</span></h1>
         
         <div id="header-just-updated"></div>
         
-        <a id="header-download" href="selfoss-2.5.zip"><span>download selfoss 2.5</span></a>
+        <a id="header-download" href="selfoss-2.6.zip"><span>download selfoss 2.6</span></a>
         
         <a id="header-donate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LR67F3T9DMSC8"><span>donate</span></a>
         
diff --git a/index.php b/index.php
index cf5989c954..acf0cd40d9 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
 $f3 = require(__DIR__.'/libs/f3/base.php');
 
 $f3->set('DEBUG',0);
-$f3->set('version','2.6-SNAPSHOT');
+$f3->set('version','2.6');
 $f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
 $f3->set('cache',__dir__.'/data/cache');
 $f3->set('BASEDIR',__dir__);
@@ -100,6 +100,7 @@
     $f3->route('GET    /sources/stats',     'controllers\Sources->stats');        // json
     
     $f3->route('GET  /tags',                'controllers\Tags->listTags');        // json
+    $f3->route('GET  /tagslist',            'controllers\Tags->tagslist');        // html
     $f3->route('POST /tags/color',          'controllers\Tags->color');           // json
     
     $f3->route('GET  /opml',                'controllers\Opml->show');            // html
diff --git a/public/js/selfoss-base.js b/public/js/selfoss-base.js
index 750204a54e..fe6ae4ded6 100644
--- a/public/js/selfoss-base.js
+++ b/public/js/selfoss-base.js
@@ -80,7 +80,7 @@ var selfoss = {
     showErrors: function(form, errors) {
         $(form).find('span.error').remove();
         $.each(errors, function(key, val) {
-            form.find('#'+key).addClass('error').parent('li').append('<span class="error">'+val+'</span>');
+            form.find("[name='"+key+"']").addClass('error').parent('li').append('<span class="error">'+val+'</span>');
         });
     },
     
@@ -182,7 +182,7 @@ var selfoss = {
         $('#nav-tags li:not(:first)').remove();
         
         $.ajax({
-            url: $('base').attr('href')+'tags',
+            url: $('base').attr('href')+'tagslist',
             type: 'GET',
             success: function(data) {
                 $('#nav-tags').append(data);