diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 809c0623e86..cac14abaa49 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -74,7 +74,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
 
   showAdminControls: function() {
     return !this.get('secondaryTag') && this.get('canAdminTag') && !this.get('category');
-  }.property('canAdminTag', 'category'),
+  }.property('secondaryTag', 'canAdminTag', 'category'),
 
   loadMoreTopics() {
     return this.get("list").loadMore();
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index ef54c1a1b88..b652898b11f 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -34,7 +34,7 @@
         {{fa-icon "angle-right"}}
         {{discourse-tag-bound tagRecord=tag style="simple"}}
         {{#if secondaryTag}}
-          <span>&</span>
+          <span>&amp;</span>
           {{discourse-tag-bound tagRecord=secondaryTag style="simple"}}
         {{/if}}
       </h2>
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 85cd7cf9fcf..902b42c4a37 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -462,8 +462,8 @@ class TopicQuery
         if @options[:tags] && @options[:tags].size > 0
           result = result.joins(:tags)
 
-          # ALL of the given tags:
           if @options[:match_all_tags]
+            # ALL of the given tags:
             @options[:tags] = Tag.where(name: @options[:tags]).pluck(:id) unless @options[:tags][0].is_a?(Integer)
             @options[:tags].each_with_index do |tag, index|
               sql_alias = ['t', index].join