diff --git a/app/assets/javascripts/search.coffee b/app/assets/javascripts/search.coffee
index 3825292..ccc5767 100644
--- a/app/assets/javascripts/search.coffee
+++ b/app/assets/javascripts/search.coffee
@@ -27,7 +27,7 @@ class window.Search
           , 10000
       else if data.status is 'corrected'
         _search.loadArtistData data.correct_name
-      else if data.status == 'not_found'
+      else if data.status is 'not_found'
         _search.hideSpinner()
         alert "Not found"
       else
diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb
index 1341da7..207a44e 100644
--- a/app/controllers/artist_controller.rb
+++ b/app/controllers/artist_controller.rb
@@ -13,7 +13,7 @@ class ArtistController < ApplicationController
     unless @artist
       results = MusicBrainz::Artist.search(artist_name)
       if results.empty?
-        return render json: { status: 'not_found' }, status: 404
+        return render json: { status: 'not_found' }
       end
       best_match = results[0][:sort_name]
       if best_match != artist_name and similar_names(artist_name, best_match)
diff --git a/app/views/artist/_page.html.haml b/app/views/artist/_page.html.haml
index 92a8c45..7c59cba 100644
--- a/app/views/artist/_page.html.haml
+++ b/app/views/artist/_page.html.haml
@@ -6,8 +6,8 @@
     = image_tag @data[:pic_url] unless @data[:pic_url].nil?
   .span7.columns.desc
     %h2
-      =@data[:name]
-      %small= " "+@data[:original_name].to_s
+      = @data[:name]
+      %small= " "+@data[:original_name] unless @data[:name] == @data[:original_name]
     %p= @data[:desc].html_safe unless @data[:desc].nil?
     - unless @data[:artist_links].empty?
       .service-icons