diff --git a/src/app/filters.coffee b/src/app/filters.coffee
index e944c565fa..699da10955 100644
--- a/src/app/filters.coffee
+++ b/src/app/filters.coffee
@@ -23,10 +23,14 @@ module.exports.app = (appExports, model) ->
     tags = user.get('tags')
     tagId = $(el).attr('data-tag-id')
     model.del "_user.filters.#{tagId}"
-    #TODO remove tag from each task
     _.each tags, (tag, i) ->
       if tag.id is tagId
         tags.splice(i,1)
         model.del "_user.filters.#{tag.id}"
+
+    # remove tag from all tasks
+    _.each user.get("tasks"), (task) ->
+      user.del "tasks.#{task.id}.tags.#{tagId}"
+
     model.set "_user.tags", tags , -> browser.resetDom(model)
 
diff --git a/views/app/avatar.html b/views/app/avatar.html
index f8505fbf9f..d895dd96d7 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -192,7 +192,7 @@
                     <span class='label'>Contributor</span>
                 {{/}}
             </h5>
-            <small>Has contributed to HabitRPG (code, design, pixel art, legal advice, etc)</small>
+            <small>Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)</small>
         </app:avatar:achievement>
 
         <app:avatar:achievement unlocked={{@profile.backer.tier}} classes='achievement-heart' unlockable=false profile={{@profile}}>