diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 17fbd7d5..879503ac 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -102,7 +102,7 @@
                         <td>
                             <fieldset>
                                 <legend>Usenet</legend>
-                                <input type="radio" name="nzb_downloader" id="nzb_downloader_sabnzbd" value="0" ${config['nzb_downloader_sabnzbd']}>Sabnzbd <input type="radio" name="nzb_downloader" id="nzb_downloader_nzbget" value="1" ${config['nzb_downloader_nzbget']}> NZBget <input type="radio" name="nzb_downloader" id="nzb_downloader_blackhole" value="2" ${config['nzb_downloader_blackhole']}> Blackhole
+                                <input type="radio" name="nzb_downloader" id="nzb_downloader_sabnzbd" value="0" ${config['nzb_downloader_sabnzbd']}>Sabnzbd <input type="radio" name="nzb_downloader" id="nzb_downloader_nzbget" value="1" ${config['nzb_downloader_nzbget']}> NZBget <input type="radio" name="nzb_downloader" id="nzb_downloader_blackhole" value="2" ${config['nzb_downloader_blackhole']}>Black Hole
                             </fieldset>
                             <fieldset id="sabnzbd_options">
                                 <div class="row">
diff --git a/headphones/__init__.py b/headphones/__init__.py
index 51f0af1a..2e1416c8 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -372,7 +372,7 @@ def initialize():
         MOVE_FILES = bool(check_setting_int(CFG, 'General', 'move_files', 0))
         RENAME_FILES = bool(check_setting_int(CFG, 'General', 'rename_files', 0))
         FOLDER_FORMAT = check_setting_str(CFG, 'General', 'folder_format', 'Artist/Album [Year]')
-        FILE_FORMAT = check_setting_str(CFG, 'General', 'file_format', 'Track Artist - Album [Year]- Title')
+        FILE_FORMAT = check_setting_str(CFG, 'General', 'file_format', 'Track Artist - Album [Year] - Title')
         CLEANUP_FILES = bool(check_setting_int(CFG, 'General', 'cleanup_files', 0))
         ADD_ALBUM_ART = bool(check_setting_int(CFG, 'General', 'add_album_art', 0))
         ALBUM_ART_FORMAT = check_setting_str(CFG, 'General', 'album_art_format', 'folder')
diff --git a/headphones/searcher.py b/headphones/searcher.py
index 4ecf7d0d..b5993ddd 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -1073,6 +1073,8 @@ def searchTorrent(albumid=None, new=False, losslessOnly=False):
                                        provider))
 
         # Pirate Bay
+        if headphones.PIRATEBAY and headphones.TORRENT_DOWNLOADER == 0:
+            logger.warn("Cannot search Pirate Bay with Blackhole option set")
         if headphones.PIRATEBAY and headphones.TORRENT_DOWNLOADER != 0:
             provider = "The Pirate Bay"    
             providerurl = url_fix("http://thepiratebay.sx/search/" + term + "/0/99/")
@@ -1437,7 +1439,7 @@ def preprocesstorrent(resultlist, pre_sorted_list=False):
             return True, result
 
         try:
-            request = urllib2.Request(selresult[2])
+            request = urllib2.Request(result[2])
             request.add_header('Accept-encoding', 'gzip')
     
             if result[3] == 'Kick Ass Torrent':