diff --git a/app/controllers/iqdb_queries_controller.rb b/app/controllers/iqdb_queries_controller.rb
index 325760b3a..a8bf9439f 100644
--- a/app/controllers/iqdb_queries_controller.rb
+++ b/app/controllers/iqdb_queries_controller.rb
@@ -1,6 +1,5 @@
 class IqdbQueriesController < ApplicationController
-  respond_to :html, :json
-  before_action :detect_xhr
+  respond_to :html, :json, :xml, :js
 
   def show
     if params[:url]
@@ -16,22 +15,6 @@ class IqdbQueriesController < ApplicationController
       @matches = IqdbProxy.decorate_posts(JSON.parse(params[:matches]))
     end
 
-    respond_with(@matches) do |fmt|
-      fmt.html do |html|
-        html.xhr { render layout: false}
-      end
-      
-      fmt.json do
-        render json: @matches
-      end
-    end
-  end
-
-private
-  
-  def detect_xhr
-    if request.xhr?
-      request.variant = :xhr
-    end
+    respond_with(@matches)
   end
 end
diff --git a/app/javascript/src/javascripts/uploads.js.erb b/app/javascript/src/javascripts/uploads.js.erb
index 7a89cd3c7..83bdc2407 100644
--- a/app/javascript/src/javascripts/uploads.js.erb
+++ b/app/javascript/src/javascripts/uploads.js.erb
@@ -68,7 +68,7 @@ Upload.validate_upload = function (e) {
 
 Upload.initialize_iqdb_source = function() {
   if (/^https?:\/\//.test($("#upload_source").val())) {
-    $.get("/iqdb_queries", {"url": $("#upload_source").val()}).done(function(html) {$("#iqdb-similar").html(html)});
+    $.get("/iqdb_queries.js", { url: $("#upload_source").val() });
   }
 }
 
diff --git a/app/views/iqdb_queries/show.html+xhr.erb b/app/views/iqdb_queries/show.html+xhr.erb
deleted file mode 100644
index 1e6f5999d..000000000
--- a/app/views/iqdb_queries/show.html+xhr.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render "iqdb_queries/matches" %>
\ No newline at end of file
diff --git a/app/views/iqdb_queries/show.js.erb b/app/views/iqdb_queries/show.js.erb
new file mode 100644
index 000000000..46dbb233e
--- /dev/null
+++ b/app/views/iqdb_queries/show.js.erb
@@ -0,0 +1 @@
+$("#iqdb-similar").html("<%= j render "iqdb_queries/matches" %>");