diff --git a/digimarks.py b/digimarks.py
index 41fad78..8cc28a3 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -318,10 +318,18 @@ class Bookmark(BaseModel):
     def _set_favicon_with_iconsbetterideaorg(self, domain):
         """ Fetch favicon for the domain """
         fileextension = '.png'
-        meta = requests.head('http://icons.better-idea.org/icon?size=60&url=' + domain, allow_redirects=True, headers={'User-Agent': DIGIMARKS_USER_AGENT})
+        meta = requests.head(
+            'http://icons.better-idea.org/icon?size=60&url=' + domain,
+            allow_redirects=True,
+            headers={'User-Agent': DIGIMARKS_USER_AGENT}
+        )
         if meta.url[-3:].lower() == 'ico':
             fileextension = '.ico'
-        response = requests.get('http://icons.better-idea.org/icon?size=60&url=' + domain, stream=True, headers={'User-Agent': DIGIMARKS_USER_AGENT})
+        response = requests.get(
+            'http://icons.better-idea.org/icon?size=60&url=' + domain,
+            stream=True,
+            headers={'User-Agent': DIGIMARKS_USER_AGENT}
+        )
         filename = os.path.join(MEDIA_ROOT, 'favicons/' + domain + fileextension)
         with open(filename, 'wb') as out_file:
             shutil.copyfileobj(response.raw, out_file)
@@ -394,9 +402,9 @@ class Bookmark(BaseModel):
         #self._set_favicon_with_iconsbetterideaorg(domain)
         self._set_favicon_with_realfavicongenerator(domain)
 
-    def set_tags(self, tags):
+    def set_tags(self, newtags):
         """ Set tags from `tags`, strip and sort them """
-        tags_split = tags.split(',')
+        tags_split = newtags.split(',')
         tags_clean = clean_tags(tags_split)
         self.tags = ','.join(tags_clean)
 
@@ -485,7 +493,11 @@ def make_external(url):
 def _find_bookmarks(userkey, filter_text):
     return Bookmark.select().where(
         Bookmark.userkey == userkey,
-        (Bookmark.title.contains(filter_text) | Bookmark.url.contains(filter_text) | Bookmark.note.contains(filter_text)),
+        (
+            Bookmark.title.contains(filter_text) |
+            Bookmark.url.contains(filter_text) |
+            Bookmark.note.contains(filter_text)
+        ),
         Bookmark.status == Bookmark.VISIBLE
     ).order_by(Bookmark.created_date.desc())
 
@@ -659,7 +671,7 @@ def addbookmark(userkey):
     )
 
 
-def updatebookmark(userkey, request, urlhash = None):
+def updatebookmark(userkey, urlhash=None):
     """ Add (no urlhash) or edit (urlhash is set) a bookmark """
     title = request.form.get('title')
     url = request.form.get('url')
@@ -720,7 +732,7 @@ def addingbookmark(userkey):
     tags = get_cached_tags(userkey)
 
     if request.method == 'POST':
-        bookmark = updatebookmark(userkey, request)
+        bookmark = updatebookmark(userkey)
         if not bookmark:
             return redirect(url_for('addbookmark', userkey=userkey, message='No url provided', tags=tags))
         if type(bookmark).__name__ == 'Response':
@@ -735,7 +747,7 @@ def editingbookmark(userkey, urlhash):
     """ Edit the bookmark from form submit """
 
     if request.method == 'POST':
-        bookmark = updatebookmark(userkey, request, urlhash=urlhash)
+        bookmark = updatebookmark(userkey, urlhash=urlhash)
         all_tags[userkey] = get_tags_for_user(userkey)
         return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
     return redirect(url_for('editbookmark', userkey=userkey, urlhash=urlhash))
@@ -771,7 +783,7 @@ def undeletebookmark(userkey, urlhash):
 
 
 @app.route('/<userkey>/tags')
-def tags(userkey):
+def tags_page(userkey):
     """ Overview of all tags used by user """
     tags = get_cached_tags(userkey)
     #publictags = PublicTag.select().where(Bookmark.userkey == userkey)
@@ -812,7 +824,7 @@ def tags(userkey):
 
 
 @app.route('/<userkey>/tag/<tag>')
-def tag(userkey, tag):
+def tag_page(userkey, tag):
     """ Overview of all bookmarks with a certain tag """
     bookmarks = Bookmark.select().where(
         Bookmark.userkey == userkey,
@@ -865,7 +877,7 @@ def publictag_page(tagkey):
         return render_template(
             'publicbookmarks.html',
             bookmarks=bookmarks,
-            tag=tag,
+            tag=this_tag.tag,
             action=this_tag.tag,
             tagkey=tagkey,
             theme=theme
diff --git a/templates/base.html b/templates/base.html
index 62d459b..97eb232 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -48,7 +48,7 @@
             <div class="nav-wrapper container"><a id="logo-container" href="{% if userkey %}{{ url_for('bookmarks_page', userkey=userkey) }}{% else %}{{ url_for('index') }}{% endif %}" class="brand-logo">digimarks</a>
                 <ul class="right hide-on-med-and-down">
                     {% if userkey %}
-                    <li><a href="{{ url_for('tags', userkey=userkey) }}" class="waves-effect waves-light btn"><i class="material-icons left">label</i>Tags</a></li>
+                    <li><a href="{{ url_for('tags_page', userkey=userkey) }}" class="waves-effect waves-light btn"><i class="material-icons left">label</i>Tags</a></li>
                     <li><a href="{{ url_for('addbookmark', userkey=userkey) }}" class="waves-effect waves-light btn"><i class="material-icons left">add</i>Add bookmark</a></li>
                     {% endif %}
                 </ul>
@@ -56,7 +56,7 @@
                 {% if userkey %}
                 <ul id="nav-mobile" class="sidenav">
                     <li><a class="waves-effect" href="{{ url_for('bookmarks_page', userkey=userkey) }}"><i class="material-icons left">turned_in</i>Home</a></li>
-                    <li><a class="waves-effect" href="{{ url_for('tags', userkey=userkey) }}"><i class="material-icons left">label</i>Tags</a></li>
+                    <li><a class="waves-effect" href="{{ url_for('tags_page', userkey=userkey) }}"><i class="material-icons left">label</i>Tags</a></li>
                     <li><a class="waves-effect" href="{{ url_for('addbookmark', userkey=userkey) }}"><i class="material-icons left">add</i>Add bookmark</a></li>
                 </ul>
                 <a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index dbf74a0..dfceb43 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -62,7 +62,7 @@
                 </div>
                 {% for tag in tags %}
                 <div class="chip">
-                    <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+                    <a href="{{ url_for('tag_page', userkey=userkey, tag=tag) }}">{{ tag }}</a>
                 </div>
                 {% endfor %}
             </li>
diff --git a/templates/cards.html b/templates/cards.html
index 2d95d27..9fb774f 100644
--- a/templates/cards.html
+++ b/templates/cards.html
@@ -46,7 +46,7 @@
                 <div class="digimark-card-header-tags">
                 {% for tag in bookmark.tags_list %}
                     <div class="chip">
-                        <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+                        <a href="{{ url_for('tag_page', userkey=userkey, tag=tag) }}">{{ tag }}</a>
                     </div>
                 {% endfor %}
                 </div>
diff --git a/templates/tags.html b/templates/tags.html
index 762ca58..4342570 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -44,7 +44,7 @@
             {% for tag in tags %}
             <tr>
                 <td>
-                    <a href="{{ url_for('tag', userkey=userkey, tag=tag['tag']) }}">{{ tag['tag'] }}</a>
+                    <a href="{{ url_for('tag_page', userkey=userkey, tag=tag['tag']) }}">{{ tag['tag'] }}</a>
                 </td>
                 <td>
                     {% if tag['publictag'] %}