diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index d345e5b20..1466be232 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -10,7 +10,7 @@
     this.common_bind("#related-artists-button", "artist");
     this.common_bind("#related-characters-button", "character");
     this.common_bind("#related-copyrights-button", "copyright");
-    $("find-artist-button").click(Danbooru.RelatedTag.find_artist);
+    $("#find-artist-button").click(Danbooru.RelatedTag.find_artist);
   }
   
   Danbooru.RelatedTag.common_bind = function(button_name, category) {
@@ -51,6 +51,10 @@
   }
   
   Danbooru.RelatedTag.build_all = function() {
+    if (Danbooru.RelatedTag.recent_search === null || Danbooru.RelatedTag.recent_search === undefined) {
+      return;
+    }
+    
     var query = Danbooru.RelatedTag.recent_search.query;
     var related_tags = Danbooru.RelatedTag.recent_search.tags;
     var wiki_page_tags = Danbooru.RelatedTag.recent_search.wiki_page_tags;
@@ -114,6 +118,7 @@
   }
   
   Danbooru.RelatedTag.find_artist = function(e) {
+    Danbooru.RelatedTag.recent_search = null;
     var url = $("#upload_source,#post_source");
     $.get("/artists.json", {"search[url_match]": url.val()}).success(Danbooru.RelatedTag.process_artist);
     e.preventDefault();
@@ -123,16 +128,30 @@
     var $dest = $("#related-tags");
     $dest.empty();
     
-    if (data.size() === 0) {
+    if (data.length === 0) {
       $dest.html("No artists found");
       return;
+    } else if (data.length > 2) {
+      $dest.html("Too many matches found");
+      return;
     }
     
     $.each(data, function(i, json) {
-      var id = json.id;
-      var name = json.name;
-      var other_names = json.other_names;
-      var urls
+      var $div = $("<div/>").addClass("artist");
+      var $ul = $("<ul/>");
+      $ul.append(
+        $("<li/>").append("Artist: ").append(
+          $("<a/>").attr("href", "/artists/" + json.id).html(json.name).click(Danbooru.RelatedTag.toggle_tag)
+        )
+      );
+      if (json.other_names.length > 0) {
+        $ul.append($("<li/>").html("Other names: " + json.other_names));
+      }
+      $.each(json.urls, function(i, v) {
+        $ul.append($("<li/>").html("URL: " + v.url));
+      });
+      $div.append($ul);
+      $dest.append($div);
     });
   }
 })();
diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 2f21c92ac..ef5e4521f 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -20,7 +20,11 @@ class ArtistsController < ApplicationController
   def index
     @search = Artist.search(params[:search])
     @artists = @search.paginate(params[:page])
-    respond_with(@artists)
+    respond_with(@artists) do |format|
+      format.json do
+        render :json => @artists.to_json(:include => [:urls])
+      end
+    end
   end
   
   def search
diff --git a/app/models/artist.rb b/app/models/artist.rb
index 2bad09e1a..ddf3771f9 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -138,13 +138,13 @@ class Artist < ActiveRecord::Base
     end
     
     def notes=(msg)
-      if wiki_page.nil?
-        self.wiki_page = WikiPage.new
+      if wiki_page
+        wiki_page.title = name
+        wiki_page.body = msg
+        wiki_page.save
+      else
+        self.wiki_page = WikiPage.new(:title => name, :body => msg)
       end
-
-      wiki_page.title = name
-      wiki_page.body = msg
-      wiki_page.save
     end
   end
   
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 140846047..b9c6320e3 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -20,6 +20,7 @@
         <%= f.label :source, nil, :title => "You can enter a URL to have #{Danbooru.config.app_name} automatically download and process it" %>
         <%= f.text_field :source, :size => 50, :value => params[:url] %>
         <%= button_tag "Similar", :id => "similar-button" %>
+        <%= button_tag "Artist", :id => "find-artist-button" %>
       </div>
       
       <div class="input">