diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py
index e943c219..a8d6fe55 100755
--- a/couchpotato/core/media/movie/searcher.py
+++ b/couchpotato/core/media/movie/searcher.py
@@ -74,7 +74,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
         self.in_progress = True
         fireEvent('notify.frontend', type = 'movie.searcher.started', data = True, message = 'Full search started')
 
-        medias = [x['_id'] for x in fireEvent('media.with_status', 'active', with_doc = False, single = True)]
+        medias = [x['_id'] for x in fireEvent('media.with_status', 'active', 'movie', single = True)]
         random.shuffle(medias)
 
         total = len(medias)
diff --git a/couchpotato/core/media/show/_base/static/search.js b/couchpotato/core/media/show/_base/static/search.js
index 91e2ed3b..44bb8944 100644
--- a/couchpotato/core/media/show/_base/static/search.js
+++ b/couchpotato/core/media/show/_base/static/search.js
@@ -185,7 +185,7 @@ Block.Search.ShowItem = new Class({
 				self.category_select.show();
 				categories.each(function(category){
 					new Element('option', {
-						'value': category.data.id,
+						'value': category.data._id,
 						'text': category.data.label
 					}).inject(self.category_select);
 				});
diff --git a/couchpotato/core/media/show/providers/nzb/newznab.py b/couchpotato/core/media/show/providers/nzb/newznab.py
index e376d058..43546110 100644
--- a/couchpotato/core/media/show/providers/nzb/newznab.py
+++ b/couchpotato/core/media/show/providers/nzb/newznab.py
@@ -18,15 +18,15 @@ class Newznab(MultiProvider):
 
 class Season(SeasonProvider, Base):
 
-    def buildUrl(self, media, api_key):
-        search_title = fireEvent('media.search_query', media, include_identifier = False, single = True)
-        identifier = fireEvent('media.identifier', media, single = True)
+    def buildUrl(self, media, host):
+        related = fireEvent('library.related', media, single = True)
+        identifier = fireEvent('library.identifier', media, single = True)
 
         query = tryUrlencode({
             't': 'tvsearch',
-            'q': search_title,
+            'apikey': host['api_key'],
+            'q': related['show']['title'],
             'season': identifier['season'],
-            'apikey': api_key,
             'extended': 1
         })
         return query
@@ -34,16 +34,15 @@ class Season(SeasonProvider, Base):
 
 class Episode(EpisodeProvider, Base):
 
-    def buildUrl(self, media, api_key):
-        search_title = fireEvent('media.search_query', media['show'], include_identifier = False, single = True)
-        identifier = fireEvent('media.identifier', media, single = True)
-
+    def buildUrl(self, media, host):
+        related = fireEvent('library.related', media, single = True)
+        identifier = fireEvent('library.identifier', media, single = True)
         query = tryUrlencode({
             't': 'tvsearch',
-            'q': search_title,
+            'apikey': host['api_key'],
+            'q': related['show']['title'],
             'season': identifier['season'],
             'ep': identifier['episode'],
-            'apikey': api_key,
             'extended': 1
         })