diff --git a/js/libs/api.js b/js/libs/api.js
index 58e4f8c..7a03394 100644
--- a/js/libs/api.js
+++ b/js/libs/api.js
@@ -39,13 +39,9 @@ function loadArtists(id, refresh) {
                     }
 
                     $.each(indexes, function (i, index) {
-                        if (index.name === '#') {
-                            indexname = '0-9';
-                        } else {
-                            indexname = index.name;
-                        }
-                        $('<li class=\"index\" id=\"index_' + indexname + '\" title=\"Scroll to Top\">' + indexname + '<span class=\"floatright\">&uarr;</span></li>').appendTo("#ArtistContainer");
-                        indexlist += '<li><a href=\"#\">' + indexname + '</a></li>';
+                        indexname = index.name;
+                        $('<li class=\"index\" id=\"index_' + indexname + '\" title=\"Scroll to Top\"><a name=\"index_' + indexname + '\">' + indexname + '</a><span class=\"floatright\">&uarr;</span></li>').appendTo("#ArtistContainer");
+                        indexlist += '<li><a href=\"#' + indexname + '\">' + indexname + '</a></li>';
                         var artists = [];
                         if (index.artist.length > 0) {
                             artists = index.artist;
diff --git a/js/ui-ready.js b/js/ui-ready.js
index 17c8df6..52b3924 100644
--- a/js/ui-ready.js
+++ b/js/ui-ready.js
@@ -120,7 +120,7 @@
         getAlbums($(this).attr("id"), '', '#AlbumRows');
     });
     $('#BottomIndex li a').live('click', function () {
-        var el = '#index_' + $(this).text();
+        var el = 'a[name = "index_' + $(this).text() + '"]';
         $('#Artists').stop().scrollTo(el, 400);
         return false;
     });
@@ -602,8 +602,8 @@
     };
     $("#CurrentPlaylistContainer tbody").sortable({
         helper: fixHelper,
-        stop: function() {
-            refreshRowColor('#CurrentPlaylistContainer tbody');            
+        stop: function () {
+            refreshRowColor('#CurrentPlaylistContainer tbody');
         }
     }).disableSelection();
     $("#TrackContainer tbody").sortable({
@@ -613,4 +613,4 @@
         }
     }).disableSelection();
 
-});      // End document.ready
\ No newline at end of file
+});       // End document.ready
\ No newline at end of file