diff --git a/setup.py b/setup.py
index 19e1d09326da3caa4a0c79b7230dab01115905d4..51af4fbfd0bfe003cf03a947262ccecd345c808c 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,9 @@ setup(
         'rednose',
         'mock',
         'vcrpy-unittest',
-        'babel'
+        'babel',
+        'flake8-coding',
+        'isort'
     ],
 
     classifiers=[
diff --git a/sickbeard/clients/putio_client.py b/sickbeard/clients/putio_client.py
index 4b225fc23411f43153dd721b9ebb226fc0640783..caa8d18dca076f393f5f10a7e914ffeefbd89f15 100644
--- a/sickbeard/clients/putio_client.py
+++ b/sickbeard/clients/putio_client.py
@@ -1,3 +1,5 @@
+# coding=utf-8
+
 # Author: Clinton Collins <clinton.collins@gmail.com>
 # Medicine: Dustyn Gibson <miigotu@gmail.com>
 # This file is part of SickRage.
diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py
index a22de724b1d248d462b9f6597d4e2baa64ba206c..170a28af039dbd53fd98c98d56ca8c9b7b347048 100644
--- a/sickbeard/providers/torrentbytes.py
+++ b/sickbeard/providers/torrentbytes.py
@@ -21,12 +21,12 @@
 from __future__ import unicode_literals
 
 import re
+
 from requests.compat import urljoin
 from requests.utils import dict_from_cookiejar
 
 from sickbeard import logger, tvcache
 from sickbeard.bs4_parser import BS4Parser
-
 from sickrage.helper.common import convert_size, try_int
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
@@ -85,7 +85,8 @@ class TorrentBytesProvider(TorrentProvider):  # pylint: disable=too-many-instanc
             return results
 
         search_params = {
-            "c41": 1, "c33": 1, "c38": 1, "c32": 1, "c37": 1
+            "Episode": {"c33": 1, "c38": 1, "c32": 1, "c37": 1},
+            "Season": {"c41": 1}
         }
 
         for mode in search_strings:
@@ -97,8 +98,8 @@ class TorrentBytesProvider(TorrentProvider):  # pylint: disable=too-many-instanc
                     logger.log("Search string: {0}".format
                                (search_string.decode("utf-8")), logger.DEBUG)
 
-                search_params["search"] = search_string
-                data = self.get_url(self.urls["search"], params=search_params, returns="text")
+                search_params[mode]["search"] = search_string
+                data = self.get_url(self.urls["search"], params=search_params[mode], returns="text")
                 if not data:
                     logger.log("No data returned from provider", logger.DEBUG)
                     continue
@@ -151,7 +152,7 @@ class TorrentBytesProvider(TorrentProvider):  # pylint: disable=too-many-instanc
                                            (title, seeders, leechers), logger.DEBUG)
 
                             items.append(item)
-                        except (AttributeError, TypeError):
+                        except (AttributeError, TypeError, ValueError):
                             continue
 
             # For each search mode sort all the items by seeders if available
diff --git a/sickrage/recompiled/tags.py b/sickrage/recompiled/tags.py
index c769bd40a82c35e79fe1c521a5449ef92b598c25..4871deed22d76155d87fd0fe6ce4dca648700f9e 100644
--- a/sickrage/recompiled/tags.py
+++ b/sickrage/recompiled/tags.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 
 import re
 
diff --git a/tox.ini b/tox.ini
index 8b9aed3aeed58dc92252e93a2ad3e4b4ce050ad8..9769ffb6542099e5c1e48915adbeefefed261a17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,3 +39,18 @@ commands =
     cmd /c del /f /q {toxinidir}\tests\sickbeard.db {toxinidir}\tests\cache.db {toxinidir}\tests\failed.db 2> nul
     nosetests -c nose.cfg --nocapture
     - codecov -e APPVEYOR_REPO_BRANCH PYTHON_ARCH
+
+[testenv:py27-flake8]
+platform = linux
+envdir = {toxworkdir}/tox
+passenv = CI TRAVIS TRAVIS_*
+deps =
+    flake8-coding
+    isort
+commands =
+    flake8 --exclude node_modules,bower_components,lib --select C101,C102,C103
+    isort -rc -c -w 160  -ca -dt -a "from __future__ import unicode_literals" -df sickbeard sickrage
+
+[flake8]
+accept-encodings = utf-8, latin-1
+