diff --git a/app/javascript/src/javascripts/related_tag.js b/app/javascript/src/javascripts/related_tag.js
index 1076c90f9..2b34c5d17 100644
--- a/app/javascript/src/javascripts/related_tag.js
+++ b/app/javascript/src/javascripts/related_tag.js
@@ -34,7 +34,7 @@ RelatedTag.on_click_related_tags_button = function (event) {
   RelatedTag.show();
 }
 
-RelatedTag.on_update_source_data = function (event, { source, related_tags_html }) {
+RelatedTag.on_update_source_data = function (event, { related_tags_html }) {
   $(".source-related-tags-columns").replaceWith(related_tags_html);
   RelatedTag.update_selected();
 }
@@ -126,12 +126,18 @@ RelatedTag.toggle_tag = function(e) {
 RelatedTag.show = function(e) {
   $(document).trigger("danbooru:show-related-tags");
   $("#related-tags-container").removeClass("hidden").addClass("visible");
-  return false;
+
+  if (e) {
+    e.preventDefault();
+  }
 }
 
 RelatedTag.hide = function(e) {
   $("#related-tags-container").removeClass("visible").addClass("hidden");
-  return false;
+
+  if (e) {
+    e.preventDefault();
+  }
 }
 
 $(function() {
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index ab4fef581..c2123c752 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -89,5 +89,5 @@
     <%= submit_tag "Submit", :class => "ui-button ui-widget ui-corner-all" %>
   </div>
 
-  <%= render "related_tags/container", related_tags: nil %>
+  <%= render "related_tags/container" %>
 <% end %>
diff --git a/app/views/related_tags/_source_tags.html.erb b/app/views/related_tags/_source_tags.html.erb
index a49308932..13b2a0cea 100644
--- a/app/views/related_tags/_source_tags.html.erb
+++ b/app/views/related_tags/_source_tags.html.erb
@@ -5,13 +5,13 @@
     <div class="tag-column wide-column artist-related-tags-column">
       <h6>Artist</h6>
 
-      <% if source.artists.any?(&:is_banned?) %>
-        <%= TagSetPresenter.new(["banned_artist"]).tag_list_html(name_only: true) %>
-      <% end %>
-
       <% if source.artists.size == 0 %>
         none
       <% else %>
+        <% if source.artists.any?(&:is_banned?) %>
+          <%= TagSetPresenter.new(["banned_artist"]).tag_list_html(name_only: true) %>
+        <% end %>
+
         <% source.artists.each do |artist| %>
           <%= TagSetPresenter.new([artist.name]).tag_list_html(name_only: true) %>
 
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 8af463050..09e3d52e2 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -104,7 +104,7 @@
           <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: {disable_with: false} %>
         </div>
 
-        <%= render "related_tags/container", related_tags: nil %>
+        <%= render "related_tags/container" %>
       <% end %>
     <% else %>
       <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>