diff --git a/deemix/app/downloader.py b/deemix/app/downloader.py
index e1a6e8c..88e97d0 100644
--- a/deemix/app/downloader.py
+++ b/deemix/app/downloader.py
@@ -789,6 +789,10 @@ def after_download_single(track, settings, queueItem):
         return None
     if 'extrasPath' not in track:
         track['extrasPath'] = settings['downloadLocation']
+    if settings['saveArtwork'] and 'albumPath' in track:
+        downloadImage(track['albumURL'], track['albumPath'])
+    if settings['saveArtworkArtist'] and 'artistPath' in track:
+        downloadImage(track['artistURL'], track['artistPath'])
     if settings['logSearched'] and 'searched' in track:
         with open(os.path.join(track['extrasPath'], 'searched.txt'), 'wb+') as f:
             orig = f.read().decode('utf-8')
diff --git a/deemix/app/queuemanager.py b/deemix/app/queuemanager.py
index 104477d..47fa2ee 100644
--- a/deemix/app/queuemanager.py
+++ b/deemix/app/queuemanager.py
@@ -51,7 +51,10 @@ def generateQueueItem(dz, sp, url, settings, bitrate=None, albumAPI=None, interf
         trackAPI = dz.get_track_gw(id)
         if albumAPI:
             trackAPI['_EXTRA_ALBUM'] = albumAPI
-        trackAPI['FILENAME_TEMPLATE'] = settings['tracknameTemplate']
+        if settings['createSingleFolder']:
+            trackAPI['FILENAME_TEMPLATE'] = settings['albumTracknameTemplate']
+        else:
+            trackAPI['FILENAME_TEMPLATE'] = settings['tracknameTemplate']
         trackAPI['SINGLE_TRACK'] = True
 
         result['title'] = trackAPI['SNG_TITLE']