diff --git a/resources/site-packages/xbmctorrent/scrapers/bitsnoop.py b/resources/site-packages/xbmctorrent/scrapers/bitsnoop.py
index 676323c..181b357 100644
--- a/resources/site-packages/xbmctorrent/scrapers/bitsnoop.py
+++ b/resources/site-packages/xbmctorrent/scrapers/bitsnoop.py
@@ -55,4 +55,4 @@ def bitsnoop_search():
     if not query:
         query = plugin.keyboard("", "XBMCtorrent - Bitsnoop - Search")
     if query:
-        plugin.redirect(plugin.url_for("bitsnoop_page", root="/search/video/%s/c/d/" % urllib.quote("%s safe:no" % query), page=1, **plugin.request.args_dict))
+        plugin.redirect(plugin.url_for("bitsnoop_page", root="/search/video/%s/c/d/" % urllib.quote_plus("%s safe:no" % query), page=1, **plugin.request.args_dict))
diff --git a/resources/site-packages/xbmctorrent/scrapers/btdigg.py b/resources/site-packages/xbmctorrent/scrapers/btdigg.py
index 6ff38c4..83b3295 100644
--- a/resources/site-packages/xbmctorrent/scrapers/btdigg.py
+++ b/resources/site-packages/xbmctorrent/scrapers/btdigg.py
@@ -60,9 +60,6 @@ def btdigg_page(query, sort, page):
 @plugin.route("/btdigg/search")
 @tracked
 def btdigg_search():
-    import urllib
-    from xbmctorrent.utils import first
-
     query = plugin.request.args_dict.pop("query", None)
     if not query:
         query = plugin.keyboard("", "XBMCtorrent - BTDigg - Search")
diff --git a/resources/site-packages/xbmctorrent/scrapers/extratorrent.py b/resources/site-packages/xbmctorrent/scrapers/extratorrent.py
index 0eff531..92da236 100644
--- a/resources/site-packages/xbmctorrent/scrapers/extratorrent.py
+++ b/resources/site-packages/xbmctorrent/scrapers/extratorrent.py
@@ -96,9 +96,6 @@ def extratorrent_page(type_="", cid="", search="", page=1):
 @plugin.route("/extratorrent/search")
 @tracked
 def extratorrent_search():
-    import urllib
-    from xbmctorrent.utils import first
-
     query = plugin.request.args_dict.pop("query", None)
     if not query:
         query = plugin.keyboard("", "XBMCtorrent - ExtraTorrent - Search")
diff --git a/resources/site-packages/xbmctorrent/scrapers/kickass.py b/resources/site-packages/xbmctorrent/scrapers/kickass.py
index cada37e..8a1d5d0 100644
--- a/resources/site-packages/xbmctorrent/scrapers/kickass.py
+++ b/resources/site-packages/xbmctorrent/scrapers/kickass.py
@@ -164,11 +164,9 @@ def kat_page(root, page, sort_field, sort_order):
 @tracked
 def kat_search():
     import urllib
-    from xbmctorrent.utils import first
-
     query = plugin.request.args_dict.pop("query", None)
     suffix = plugin.request.args_dict.pop("query_suffix", "")
     if not query:
         query = plugin.keyboard("", "XBMCtorrent - Kickass Torrent - Search")
     if query:
-        plugin.redirect(plugin.url_for("kat_page", root="usearch/%s/" % urllib.quote("%s %s verified:1" % (query, suffix)), page=1, **plugin.request.args_dict))
+        plugin.redirect(plugin.url_for("kat_page", root="usearch/%s/" % urllib.quote_plus("%s %s verified:1" % (query, suffix)), page=1, **plugin.request.args_dict))
diff --git a/resources/site-packages/xbmctorrent/scrapers/nyaa.py b/resources/site-packages/xbmctorrent/scrapers/nyaa.py
index f35a526..d18782a 100644
--- a/resources/site-packages/xbmctorrent/scrapers/nyaa.py
+++ b/resources/site-packages/xbmctorrent/scrapers/nyaa.py
@@ -98,8 +98,6 @@ def nyaa_page(cats, offset, sort, order, term=""):
 @plugin.route("/nyaa/search")
 @tracked
 def nyaa_search():
-    import urllib
-
     query = plugin.request.args.get("query")
     if query:
         query = query[0]
diff --git a/resources/site-packages/xbmctorrent/scrapers/tpb.py b/resources/site-packages/xbmctorrent/scrapers/tpb.py
index e851ad6..6795d8c 100644
--- a/resources/site-packages/xbmctorrent/scrapers/tpb.py
+++ b/resources/site-packages/xbmctorrent/scrapers/tpb.py
@@ -105,4 +105,4 @@ def piratebay_search():
     else:
         query = plugin.keyboard("", "XBMCtorrent - The Pirate Bay - Search")
     if query:
-        plugin.redirect(plugin.url_for("piratebay_page", root="/search/%s" % urllib.quote(query), page=0))
+        plugin.redirect(plugin.url_for("piratebay_page", root="/search/%s" % urllib.quote_plus(query), page=0))