diff --git a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs
index ca8385242f..698d3b4a4e 100644
--- a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs
+++ b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs
@@ -20,7 +20,7 @@ public LidarrCloudRequestBuilder()
             //Search = new HttpRequestBuilder("https://api.spotify.com/{version}/{route}/") // TODO: maybe use {version} 
             //    .SetSegment("version", "v1")
             //    .CreateFactory();
-            Search = new HttpRequestBuilder("http://localhost:5000/{route}/") // TODO: maybe use {version} 
+            Search = new HttpRequestBuilder("http://localhost:3000/{route}/") // TODO: maybe use {version} 
                 .CreateFactory();
 
             InternalSearch = new HttpRequestBuilder("https://itunes.apple.com/WebObjects/MZStore.woa/wa/{route}") //viewArtist or search
diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 773b94519b..db2f389f43 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -87,7 +87,7 @@ public void Scan(Artist artist)
                 return;
             }
 
-            _logger.ProgressInfo("Scanning disk for {0}", artist.ArtistName);
+            _logger.ProgressInfo("Scanning disk for {0}", artist.Name);
 
             if (!_diskProvider.FolderExists(artist.Path))
             {
@@ -136,7 +136,7 @@ private void CleanMediaFiles(Artist artist, List<string> mediaFileList)
 
         private void CompletedScanning(Artist artist)
         {
-            _logger.Info("Completed scanning disk for {0}", artist.ArtistName);
+            _logger.Info("Completed scanning disk for {0}", artist.Name);
             _eventAggregator.PublishEvent(new ArtistScannedEvent(artist));
         }
 
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
index 9cd818dcbe..4337b00737 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs
@@ -27,7 +27,7 @@ public List<TrackFile> GetFilesWithoutMediaInfo()
 
         public List<TrackFile> GetFilesByArtist(string artistId)
         {
-            return Query.Where(c => c.SpotifyTrackId == artistId).ToList();
+            return Query.Where(c => c.ForeignTrackId == artistId).ToList();
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
index 5c61ce5352..a03d3b0a46 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs
@@ -69,7 +69,7 @@ public List<TrackFile> GetFilesWithoutMediaInfo()
 
         public List<string> FilterExistingFiles(List<string> files, Artist artist)
         {
-            var artistFiles = GetFilesByArtist(artist.SpotifyId).Select(f => Path.Combine(artist.Path, f.RelativePath)).ToList();
+            var artistFiles = GetFilesByArtist(artist.ForeignArtistId).Select(f => Path.Combine(artist.Path, f.RelativePath)).ToList();
 
             if (!artistFiles.Any()) return files;
 
@@ -89,7 +89,7 @@ public List<TrackFile> Get(IEnumerable<int> ids)
 
         public void HandleAsync(ArtistDeletedEvent message)
         {
-            var files = GetFilesByArtist(message.Artist.SpotifyId);
+            var files = GetFilesByArtist(message.Artist.ForeignArtistId);
             _mediaFileRepository.DeleteMany(files);
         }
 
diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
index a46844f548..69b3b9f0d0 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
@@ -31,8 +31,8 @@ public MediaFileTableCleanupService(IMediaFileService mediaFileService,
 
         public void Clean(Artist artist, List<string> filesOnDisk)
         {
-            var artistFiles = _mediaFileService.GetFilesByArtist(artist.SpotifyId);
-            var tracks = _trackService.GetTracksByArtist(artist.SpotifyId);
+            var artistFiles = _mediaFileService.GetFilesByArtist(artist.ForeignArtistId);
+            var tracks = _trackService.GetTracksByArtist(artist.ForeignArtistId);
 
             var filesOnDiskKeys = new HashSet<string>(filesOnDisk, PathEqualityComparer.Instance);
             
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
index 60cf5bf01f..a45ec726bf 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
@@ -65,7 +65,7 @@ public void Handle(ArtistScannedEvent message)
                 return;
             }
 
-            var allMediaFiles = _mediaFileService.GetFilesByArtist(message.Artist.SpotifyId);
+            var allMediaFiles = _mediaFileService.GetFilesByArtist(message.Artist.ForeignArtistId);
             var filteredMediaFiles = allMediaFiles.Where(c => c.MediaInfo == null || c.MediaInfo.SchemaRevision < CURRENT_MEDIA_INFO_SCHEMA_REVISION).ToList();
 
             UpdateMediaInfo(message.Artist, filteredMediaFiles);
diff --git a/src/NzbDrone.Core/MediaFiles/TrackFile.cs b/src/NzbDrone.Core/MediaFiles/TrackFile.cs
index e08555b773..ecc51c7bea 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackFile.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackFile.cs
@@ -12,7 +12,8 @@ namespace NzbDrone.Core.MediaFiles
 {
     public class TrackFile : ModelBase
     {
-        public string SpotifyTrackId { get; set; }
+        public string ForeignTrackId { get; set; }
+        public string ForeignArtistId { get; set; }
         public int AlbumId { get; set; }
         public string RelativePath { get; set; }
         public string Path { get; set; }
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
index 09abac3930..a6ff0b9be9 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
@@ -73,7 +73,7 @@ public List<ImportResult> Import(List<ImportDecision> decisions, bool newDownloa
 
                     var trackFile = new TrackFile();
                     trackFile.DateAdded = DateTime.UtcNow;
-                    trackFile.SpotifyTrackId = localTrack.Artist.SpotifyId;
+                    trackFile.ForeignArtistId = localTrack.Artist.ForeignArtistId;
                     trackFile.Path = localTrack.Path.CleanFilePath();
                     trackFile.Size = _diskProvider.GetFileSize(localTrack.Path);
                     trackFile.Quality = localTrack.Quality;
diff --git a/src/NzbDrone.Core/Music/RefreshTrackService.cs b/src/NzbDrone.Core/Music/RefreshTrackService.cs
index 77592e4f36..58754cf446 100644
--- a/src/NzbDrone.Core/Music/RefreshTrackService.cs
+++ b/src/NzbDrone.Core/Music/RefreshTrackService.cs
@@ -33,7 +33,7 @@ public void RefreshTrackInfo(Album album, IEnumerable<Track> remoteTracks)
             var successCount = 0;
             var failCount = 0;
 
-            var existingTracks = _trackService.GetTracksByAlbum(album.ArtistId, album.Id);
+            var existingTracks = _trackService.GetTracksByAlbum(album.ForeignAlbumId, album.ForeignAlbumId);
             //var albums = artist.Albums;
 
             var updateList = new List<Track>();
diff --git a/src/NzbDrone.Core/Music/TrackRepository.cs b/src/NzbDrone.Core/Music/TrackRepository.cs
index 4657b3dad8..0572ec8008 100644
--- a/src/NzbDrone.Core/Music/TrackRepository.cs
+++ b/src/NzbDrone.Core/Music/TrackRepository.cs
@@ -48,7 +48,7 @@ public Track Find(string artistId, string albumId, int trackNumber)
 
         public List<Track> GetTracks(string artistId)
         {
-            return Query.Where(s => s.ForeignTrackId == artistId).ToList();
+            return Query.Join<Track, Artist>(JoinType.Inner, s => s.Artist, (track, artist) => track.ArtistId == artist.Id).ToList();
         }
 
         public List<Track> GetTracks(string artistId, string albumId)