diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html
index da287746..da7fc4f8 100644
--- a/data/interfaces/default/album.html
+++ b/data/interfaces/default/album.html
@@ -51,7 +51,7 @@
 						<th id="number">#</th>
 						<th id="name">Track Title</th>
 						<th id="duration">Duration</th>
-						<th id="have"></th>
+						<th id="location"></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -61,13 +61,11 @@
 				%for track in tracks:
 					<%
 						i += 1
-						have = myDB.select('SELECT TrackTitle from have WHERE ArtistName like ? AND AlbumTitle like ? AND TrackTitle like ?', [track['ArtistName'], track['AlbumTitle'], track['TrackTitle']])
-						if len(have):
+						if track['Location']:
 							grade = 'A'
-							check = '<img src="images/checkmark.png" alt="checkmark">'
 						else:
 							grade = 'Z'
-							check = ''
+
 						try:
 							trackduration = helpers.convert_milliseconds(track['TrackDuration'])
 						except:
@@ -77,7 +75,7 @@
 						<td id="number">${i}</td>
 						<td id="name">${track['TrackTitle']}</td>
 						<td id="duration">${trackduration}</td>
-						<td id="have">${check}</td>
+						<td id="location">${track['Location']}</td>
 					</tr>
 				%endfor
 				</tbody>
diff --git a/headphones/__init__.py b/headphones/__init__.py
index 7b1fc2fb..ca776d30 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -439,7 +439,7 @@ def dbcheck():
     c=conn.cursor()
     c.execute('CREATE TABLE IF NOT EXISTS artists (ArtistID TEXT UNIQUE, ArtistName TEXT, ArtistSortName TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, LatestAlbum TEXT, ReleaseDate TEXT, AlbumID TEXT, HaveTracks INTEGER, TotalTracks INTEGER)')
     c.execute('CREATE TABLE IF NOT EXISTS albums (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, ReleaseDate TEXT, DateAdded TEXT, AlbumID TEXT UNIQUE, Status TEXT, Type TEXT)')
-    c.execute('CREATE TABLE IF NOT EXISTS tracks (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, AlbumID TEXT, TrackTitle TEXT, TrackDuration, TrackID TEXT, TrackNumber INTEGER)')
+    c.execute('CREATE TABLE IF NOT EXISTS tracks (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, AlbumID TEXT, TrackTitle TEXT, TrackDuration, TrackID TEXT, TrackNumber INTEGER, Location TEXT)')
     c.execute('CREATE TABLE IF NOT EXISTS snatched (AlbumID TEXT, Title TEXT, Size INTEGER, URL TEXT, DateAdded TEXT, Status TEXT, FolderName TEXT)')
     c.execute('CREATE TABLE IF NOT EXISTS have (ArtistName TEXT, AlbumTitle TEXT, TrackNumber TEXT, TrackTitle TEXT, TrackLength TEXT, BitRate TEXT, Genre TEXT, Date TEXT, TrackID TEXT)')
     c.execute('CREATE TABLE IF NOT EXISTS lastfmcloud (ArtistName TEXT, ArtistID TEXT, Count INTEGER)')
@@ -489,7 +489,12 @@ def dbcheck():
     try:
         c.execute('SELECT FolderName from snatched')
     except sqlite3.OperationalError:
-        c.execute('ALTER TABLE snatched ADD COLUMN FolderName TEXT')    
+        c.execute('ALTER TABLE snatched ADD COLUMN FolderName TEXT')
+    
+    try:
+        c.execute('SELECT Location from tracks')
+    except sqlite3.OperationalError:
+        c.execute('ALTER TABLE tracks ADD COLUMN Location TEXT')    
     
     conn.commit()
     c.close()