diff --git a/Core.py b/Core.py
index 231c59a..ec2a295 100644
--- a/Core.py
+++ b/Core.py
@@ -1475,7 +1475,7 @@ class Core:
 
     def playTorrent(self, params={}):
         if params.get('filename'):
-            torrentUrl = params.get('filename')
+            torrentUrl = unquote(params.get('filename'))
         else:
             torrentUrl = self.__settings__.getSetting("lastTorrent")
         #xbmc.executebuiltin('Action(Stop)')
diff --git a/functions.py b/functions.py
index 88669f9..a0833ed 100644
--- a/functions.py
+++ b/functions.py
@@ -1888,14 +1888,14 @@ def first_run_260():
 
 def estuary():
     if __settings__.getSetting('skin_optimization') not in ['7', '0'] and \
-                    __settings__.getSetting('ask17_skin_optimization') != 'true':
+                    __settings__.getSetting('ask17_skin_optimization') != 'True':
 
         yes = xbmcgui.Dialog().yesno('< %s >' % (Localization.localize('Torrenter Update ') + '2.6.0'),
                                      Localization.localize('Torrenter has a better view style for Kodi 17 default skin.'),
                                      Localization.localize('Would you like to try it?'), )
         if yes:
             __settings__.setSetting('skin_optimization', '7')
-    __settings__.setSetting('ask17_skin_optimization', 'true')
+    __settings__.setSetting('ask_skin_optimization', 'True')
 
 def seeking_warning(seek):
     if __settings__.getSetting('torrent_player')!='1':
diff --git a/searchwindow.py b/searchwindow.py
index f6b5529..6103b5c 100644
--- a/searchwindow.py
+++ b/searchwindow.py
@@ -64,6 +64,7 @@ class SearchWindow(pyxbmct.AddonDialogWindow):
         self.setGeometry(1280, 720, 9, 16)
         self.set_navi()
         self.set_controls()
+        self.set_focus()
         self.connect_controls()
         if params and params.get('mode'):
             if params.get('mode') == 'load':
@@ -253,7 +254,7 @@ class SearchWindow(pyxbmct.AddonDialogWindow):
     def navi_save(self, mode = None):
         debug('navi_save init')
 
-        if mode: self.set_focus(mode)
+        self.set_focus(mode)
 
         navi = json.dumps(self.navi)
 
@@ -317,7 +318,7 @@ class SearchWindow(pyxbmct.AddonDialogWindow):
         self.right_menu(mode if not right_menu else right_menu)
         self.listing.reset()
 
-    def set_focus(self, mode):
+    def set_focus(self, mode = None):
         if not self.listing.size():
             if mode and hasattr(self, "button_" + mode):
                 self.setFocus(getattr(self, "button_" + mode))