diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html
index 2c1349fc..1e00b281 100644
--- a/data/interfaces/default/artist.html
+++ b/data/interfaces/default/artist.html
@@ -109,7 +109,7 @@
 			%>
 			<tr class="grade${grade}">
 				<td id="select"><input type="checkbox" name="${album['AlbumID']}" class="checkbox" /></td>
-				<td id="albumart"><img class="albumArt" title="${album['AlbumID']}" height="64" width="64"></td>
+				<td id="albumart"><img class="albumArt" id="${album['AlbumID']}" height="64" width="64"></td>
 				<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
 				<td id="reldate">${album['ReleaseDate']}</td>
 				<td id="type">${album['Type']}</td>
@@ -161,7 +161,7 @@
 	
 	function getAlbumArt() {
 		$("table#album_table tr td#albumart").each(function(){	
-			var id = $(this).children('img').attr('title');
+			var id = $(this).children('img').attr('id');
 			var image = $(this).children('img');
 			if ( !image.hasClass('done') ) {
 				image.addClass('done');
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 68fb3492..bcd8cf2b 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -53,8 +53,8 @@
 				
 			%>
 			<tr class="grade${grade}">
-				<td id="albumart"><div id="artistImg"><img class="albumArt" alt=""/></div></td>
-				<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}" title="${artist['ArtistID']}">${artist['ArtistName']}</a></td>
+				<td id="albumart"><div id="artistImg"><img class="albumArt" alt="" id="${artist['ArtistID']}"/></div></td>
+				<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td>
 				<td id="status">${artist['Status']}</td>
 				<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>
 				<td id="have"><span title="${percent}"></span><div class="progress-container"><div style="width:${percent}%"><div class="havetracks">${havetracks}/${totaltracks}</div></div></div></td>
@@ -72,9 +72,9 @@
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	<script>
 	function getArtistArt() {
-		$("table#artist_table tr td#name").each(function(){	
-			var id = $(this).children('a').attr('title');
-			var image = $(this).parent().find("td#albumart img");
+		$("table#artist_table tr td#albumart #artistImg").each(function(){	
+			var id = $(this).children('img').attr('id');
+			var image = $(this).children('img');
 			if ( !image.hasClass('done') ) {
 				image.addClass('done');
 				getThumb(image,id,'artist');
diff --git a/headphones/cache.py b/headphones/cache.py
index 32ca9d62..5c257a61 100644
--- a/headphones/cache.py
+++ b/headphones/cache.py
@@ -489,7 +489,8 @@ def getArtwork(ArtistID=None, AlbumID=None):
     if artwork_path.startswith('http://'):
         return artwork_path
     else:
-        return "cache" + artwork_path[len(headphones.CACHE_DIR):]
+        artwork_file = os.path.basename(artwork_path)
+        return "cache/artwork/" + artwork_file
         
 def getThumb(ArtistID=None, AlbumID=None):
     
@@ -502,7 +503,8 @@ def getThumb(ArtistID=None, AlbumID=None):
     if artwork_path.startswith('http://'):
         return artwork_path
     else:
-        return "cache" + artwork_path[len(headphones.CACHE_DIR):]
+        thumbnail_file = os.path.basename(artwork_path)
+        return "cache/artwork/" + thumbnail_file
     
 def getInfo(ArtistID=None, AlbumID=None):