diff --git a/resources/lib/database/__init__.py b/resources/lib/database/__init__.py
index 4b7c5ecb..213a122a 100644
--- a/resources/lib/database/__init__.py
+++ b/resources/lib/database/__init__.py
@@ -246,10 +246,10 @@ def get_sync():
     except Exception:
         sync = {}
 
-    sync['Libraries'] = sync.get('Libraries', [])
+    sync['Libraries'] = list(set(sync.get('Libraries', [])))
     sync['RestorePoint'] = sync.get('RestorePoint', {})
-    sync['Whitelist'] = sync.get('Whitelist', [])
-    sync['SortedViews'] = sync.get('SortedViews', [])
+    sync['Whitelist'] = list(set(sync.get('Whitelist', [])))
+    sync['SortedViews'] = list(set(sync.get('SortedViews', [])))
 
     return sync
 
diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py
index e6b4e16a..7d03cf1c 100644
--- a/resources/lib/downloader.py
+++ b/resources/lib/downloader.py
@@ -152,13 +152,13 @@ def get_artists(parent_id=None, basic=False, params=None, server_id=None):
     for items in _get_items(query, server_id):
         yield items
 
-def get_albums_by_artist(artist_id, basic=False, server_id=None):
+def get_albums_by_artist(artist_id, basic=False):
 
     params = {
         'SortBy': "DateCreated",
         'ArtistIds': artist_id
     }
-    for items in get_items(None, "MusicAlbum", basic, params, server_id):
+    for items in get_items(None, "MusicAlbum", basic, params):
         yield items
 
 @stop()
diff --git a/resources/lib/full_sync.py b/resources/lib/full_sync.py
index 655e46fa..dac4d74b 100644
--- a/resources/lib/full_sync.py
+++ b/resources/lib/full_sync.py
@@ -133,7 +133,7 @@ class FullSync(object):
 
             self.process_library(library)
 
-            if not library.startswith('Boxsets:'):
+            if not library.startswith('Boxsets:') and library not in self.sync['Whitelist']:
                 self.sync['Whitelist'].append(library)
 
             self.sync['Libraries'].pop(self.sync['Libraries'].index(library))