diff --git a/NZBmegasearch/ApiModule.py b/NZBmegasearch/ApiModule.py
index a7c9ff7..2a5a7dd 100644
--- a/NZBmegasearch/ApiModule.py
+++ b/NZBmegasearch/ApiModule.py
@@ -1,19 +1,19 @@
-# # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## #    
+# # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## #
 #~ This file is part of NZBmegasearch by 0byte.
-#~ 
+#~
 #~ NZBmegasearch is free software: you can redistribute it and/or modify
 #~ it under the terms of the GNU General Public License as published by
 #~ the Free Software Foundation, either version 3 of the License, or
 #~ (at your option) any later version.
-#~ 
+#~
 #~ NZBmegasearch is distributed in the hope that it will be useful,
 #~ but WITHOUT ANY WARRANTY; without even the implied warranty of
 #~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #~ GNU General Public License for more details.
-#~ 
+#~
 #~ You should have received a copy of the GNU General Public License
 #~ along with NZBmegasearch.  If not, see <http://www.gnu.org/licenses/>.
-# # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## #    
+# # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## # ## #
 
 
 from flask import  Flask, render_template, redirect, send_file, Response
@@ -56,61 +56,61 @@ def __init__(self, conf, cgen, wrp, ds):
 								 }
 		if(conf is not None):
 			self.timeout = conf[0]['timeout']
-			self.cfg= conf	 		
+			self.cfg= conf
 			self.cfg_cpy = copy.deepcopy(self.cfg)
 
-	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ 
+	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 	def set_extraopt(self):
 		for conf in self.cfg :
 			if ( (conf['extra_class'] ==  1 ) and (conf['valid'])):
 				conf['valid']  = 0
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-		
+
 	def dosearch(self, arguments, hname):
 		self.args = arguments
 		self.rqurl = hname.scheme+'://'+hname.netloc
 		print arguments
-		
+
 		#~ restore originals
-		self.cfg = copy.deepcopy(self.cfg_cpy)		
+		self.cfg = copy.deepcopy(self.cfg_cpy)
 		self.cfg_ds.set_extraopt(None, 'api')
-		self.set_extraopt()				
+		self.set_extraopt()
 
 		if(self.args.has_key('t')):
 			typesearch=self.args['t']
 			if (typesearch == 'tvsearch'):
 				response = self.sickbeard_req()
 			elif (typesearch == 'movie'):
-				response = self.couchpotato_req()	
+				response = self.couchpotato_req()
 			elif (typesearch == 'search'):
-				response = self.generate_tsearch_nabresponse()					
+				response = self.generate_tsearch_nabresponse()
 			#~ elif (typesearch == 'music'):
-				#~ response = self.headphones_req()	
-			elif (typesearch == 'get'):	
+				#~ response = self.headphones_req()
+			elif (typesearch == 'get'):
 				filetosend = self.proxy_NZB_file()
 				return filetosend
 			else:
-				print '>> UNKNOWN REQ -- ignore' 
+				print '>> UNKNOWN REQ -- ignore'
 				response = render_template('api_error.html')
 		else:
 			response = render_template('api_error.html')
-		return response	
+		return response
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 	def dosearch_rss(self, arguments, hname):
 		self.args = arguments
-		self.rqurl = hname.scheme+'://'+hname.netloc			
+		self.rqurl = hname.scheme+'://'+hname.netloc
 		addparams = dict(
 						age= '1500',
 						limit='20000',
 						t='search',
 						cat='1000,2000,3000,4000,5000,6000,7000')
-		
+
 		if('cat' in self.args):
 			addparams['cat'] = self.args['cat']
-			
+
 		rawResults = SearchModule.performSearch('', self.cfg, self.cfg_ds, addparams)
 		results = []
 		#~ no cleaning just flatten in one array
@@ -125,14 +125,14 @@ def dosearch_rss(self, arguments, hname):
 		return self.cleanUpResultsXML(results)
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-	
-	def headphones_req(self):	
+
+	def headphones_req(self):
 		print self.args
 		if(self.args.has_key('album') or self.args.has_key('artist')  or self.args.has_key('track')):
 			return self.generate_music_nabresponse()
-		else:	
+		else:
 			return render_template('api_error.html')
-			
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 	def generate_music_nabresponse(self):
@@ -145,34 +145,34 @@ def generate_music_nabresponse(self):
 			dstring.append(SearchModule.sanitize_strings(self.args['track']))
 		if(self.args.has_key('year')):
 			dstring.append(SearchModule.sanitize_strings(self.args['year']))
-			
-		music_search_str = ''	
+
+		music_search_str = ''
 		for i in xrange(len(dstring)):
 			if(len(dstring[i]) and i<len(dstring)-1):
 				music_search_str = music_search_str + dstring[i]
-		
+
 		print music_search_str
 		#~ print movie_search_str
 		self.searchstring = music_search_str
 		self.typesearch = 0
-		#~ compile results				
-		#~ results = SearchModule.performSearch(movie_search_str, self.cfg )		
+		#~ compile results
+		#~ results = SearchModule.performSearch(movie_search_str, self.cfg )
 		#~ flatten and summarize them
 		#~ cleaned_results = megasearch.summary_results(results,movie_search_str)
 		#~ render XML
 		#~ return self.cleanUpResultsXML(cleaned_results)
 		return 'm'
-	
-	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~		
-		
+
+	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+
 	def proxy_NZB_file(self):
 		#~ fullurl = self.wrp.chash64_decode(self.args['id'])
 		#~ print fullurl
 		arguments={}
 		sq = self.args['id'].split('&');
 		arguments['x'] = sq[0]
-		
-		
+
+
 		for i in xrange(1,len(sq) ):
 			onearg = dict(urlparse.parse_qsl(sq[i]))
 			if('m' in onearg):
@@ -184,53 +184,55 @@ def proxy_NZB_file(self):
 		#~ if('m' in self.args):
 			#~ arguments['m'] = self.args['m']
 		return self.wrp.beam(arguments)
- 
+
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-	def couchpotato_req(self):	
-	
+	def couchpotato_req(self):
+
 		if(self.args.has_key('imdbid')):
 			print 'requested movie ID'
 			#~ request imdb
 			#~ http://deanclatworthy.com/imdb/?id=tt1673434
 			#~ http://imdbapi.org/?id=tt1673434
 			imdb_show = self.imdb_movieinfo(self.args['imdbid'])
-			if(len(imdb_show['movietitle'])): 
+			if(len(imdb_show['movietitle'])):
 				return self.generate_movie_nabresponse(imdb_show)
 			else:
-				return render_template('api_error.html')		
+				return render_template('api_error.html')
 		else:
 			return render_template('api_default.html')
-			
-			
+
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-	def sickbeard_req(self):	
+	def sickbeard_req(self):
 		if(self.args.has_key('rid')):
 			#~ print 'requested series ID'
 			#~ request rage
-			tvrage_show = self.tvrage_getshowinfo(self.args['rid'])	
-			if(len(tvrage_show['showtitle'])): 
-				return self.generate_tvserie_nabresponse(tvrage_show)				
-			else:
-				return render_template('api_error.html')				
-		elif(self.args.has_key('cat')):
-			if((self.args['cat'].find('5030') != -1) or (self.args['cat'].find('5040') != -1)):
-				return self.generate_tvserie_nabresponse_broadcast();
+			tvrage_show = self.tvrage_getshowinfo(self.args['rid'])
+			if(len(tvrage_show['showtitle'])):
+				return self.generate_tvserie_nabresponse(tvrage_show)
 			else:
 				return render_template('api_error.html')
-		else:	
+			#if user searches for a query, look it up
+		elif(self.args.has_key('q')):
+			query = {'showtitle': self.args['q']}
+			return self.generate_tvserie_nabresponse(query)
+		#use userdefined category
+		elif(self.args.has_key('cat')):
+			return self.generate_tvserie_nabresponse_broadcast(self.args['cat']);
+		else:
 			return render_template('api_default.html')
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 
-	def generate_tvserie_nabresponse_broadcast(self):
-		
+	def generate_tvserie_nabresponse_broadcast(self, catIDs='5040,5030'):
+
 		addparams = dict(
 						age= '1500',
 						t='tvsearch',
-						cat='5040,5030')
-		
+						cat=catIDs)
+
 		rawResults = SearchModule.performSearch('', self.cfg, self.cfg_ds, addparams)
 		#~ rawResults = SearchModule.performSearch('', self.cfg, None, addparams)
 		results = []
@@ -240,18 +242,18 @@ def generate_tvserie_nabresponse_broadcast(self):
  				results.append(rawResults[provid][z])
 
 		self.searchstring = ''
-		self.typesearch = 1		
+		self.typesearch = 1
 		return self.cleanUpResultsXML(results)
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-	
-	def imdb_movieinfo(self, mid):  
+
+	def imdb_movieinfo(self, mid):
 		parsed_data = {'movietitle': '',
 					'year': '1900'}
 
 		url_imdb  = 'http://omdbapi.com/'
 		urlParams = dict( i= 'tt' + mid)
-			
+
 		try:
 			http_result = requests.get(url=url_imdb ,  params=urlParams, verify=False, timeout=self.timeout)
 		except Exception as e:
@@ -261,7 +263,7 @@ def imdb_movieinfo(self, mid):
 		try:
 			data = http_result.json()
 		except Exception as e:
-			log.critical(str(e))    
+			log.critical(str(e))
 			return parsed_data
 
 		if('error' in data or 'Error' in data):
@@ -270,15 +272,15 @@ def imdb_movieinfo(self, mid):
 		parsed_data = { 'movietitle': data['Title'],
 					'year': str(data['Year'])}
 		return parsed_data
-      
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 
-	def tvrage_getshowinfo(self, rid ):	
+	def tvrage_getshowinfo(self, rid ):
 		parsed_data = {'showtitle': ''}
 
 		url_tvrage = 'http://www.tvrage.com/feeds/showinfo.php'
-		urlParams = dict( sid=rid )			
+		urlParams = dict( sid=rid )
 		#~ loading
 		try:
 			http_result = requests.get(url=url_tvrage, params=urlParams, verify=False, timeout=self.timeout,  headers=self.tvrage_rqheaders)
@@ -286,7 +288,7 @@ def tvrage_getshowinfo(self, rid ):
 			print e
 			log.critical(str(e))
 			return parsed_data
-		
+
 		data = http_result.text
 		#~ parsing
 		try:
@@ -296,10 +298,10 @@ def tvrage_getshowinfo(self, rid ):
 			log.critical(str(e))
 			return parsed_data
 
-		showtitle = tree.find("showname")	
+		showtitle = tree.find("showname")
 		if(showtitle is not None):
 			parsed_data['showtitle'] = showtitle.text
-		
+
 		return parsed_data
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
@@ -310,13 +312,13 @@ def generate_tsearch_nabresponse(self):
 			freesearch_str = SearchModule.sanitize_strings(self.args['q'])
 			self.searchstring = freesearch_str
 			self.typesearch = 2
-			#~ compile results				
+			#~ compile results
 			results = SearchModule.performSearch(freesearch_str, self.cfg, self.cfg_ds )
 			#~ flatten and summarize them
 			cleaned_results = megasearch.summary_results(results, freesearch_str)
 			#~ render XML
 			return self.cleanUpResultsXML(cleaned_results)
-			
+
 
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
@@ -324,17 +326,17 @@ def generate_movie_nabresponse(self,imdb_show ):
 
 		movie_search_str = imdb_show['movietitle'].lower().replace("'", "").replace("-", " ").replace(":", " ")
 		movie_search_str = " ".join(movie_search_str.split()).replace(" ", ".") + '.' +imdb_show['year']
-		
+
 		#~ print movie_search_str
 		self.searchstring = movie_search_str
 		self.typesearch = 0
-		#~ compile results				
-		results = SearchModule.performSearch(movie_search_str, self.cfg , self.cfg_ds )	
+		#~ compile results
+		results = SearchModule.performSearch(movie_search_str, self.cfg , self.cfg_ds )
 		#~ flatten and summarize them
 		cleaned_results = megasearch.summary_results(results,movie_search_str)
 		#~ render XML
 		return self.cleanUpResultsXML(cleaned_results)
-		
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
 	def generate_tvserie_nabresponse(self,tvrage_show ):
@@ -343,17 +345,17 @@ def generate_tvserie_nabresponse(self,tvrage_show ):
 		relaxed_seasonmatch = 0
 		serie_search_str = SearchModule.sanitize_strings(tvrage_show['showtitle'])
 		if(self.args.has_key('ep')):
-			ep_num = self.args.get('ep',-1, type=int)			
+			ep_num = self.args.get('ep',-1, type=int)
 			serie_search_str = serie_search_str + '.s%02d' % season_num + 'e%02d' % ep_num
-		else:	
-			serie_search_str = serie_search_str + '.s%02d' % season_num 
+		else:
+			serie_search_str = serie_search_str + '.s%02d' % season_num
 			relaxed_seasonmatch = 1
-			
+
 		self.typesearch = 1
 		self.searchstring = serie_search_str
-		#~ compile results				
-		results = SearchModule.performSearch(serie_search_str, self.cfg , self.cfg_ds )		
-		
+		#~ compile results
+		results = SearchModule.performSearch(serie_search_str, self.cfg , self.cfg_ds )
+
 		cleaned_results = []
 		if(relaxed_seasonmatch):
 			#~ no cleaning just flatten in one array
@@ -364,41 +366,41 @@ def generate_tvserie_nabresponse(self,tvrage_show ):
 		else:
 			#~ flatten and summarize them
 			cleaned_results = megasearch.summary_results(results,serie_search_str)
-		
+
 		#~ render XML
 		return self.cleanUpResultsXML(cleaned_results)
 
-	
-	
+
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 	def crude_subcategory_identifier(self, titlestring):
 		idx1=titlestring.find('720p')
 		idx2=titlestring.find('1080p')
 		hires = False
-		
+
 		if(idx1 != -1 or idx2 != -1):
 			hires = True
-		
+
 		if(self.typesearch == 0):
 			if(hires == True):
 				return 2040
-			else:	
+			else:
 				return 2030
 
 		if(self.typesearch == 0):
 			if(hires == True):
 				return 5040
-			else:	
+			else:
 				return 5030
-	
-	
+
+
 	#~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-	
-	
+
+
 	# Generate XML for the results
 	def cleanUpResultsXML(self, results):
 		niceResults = []
-			
+
 		#~ no sorting
 		for i in xrange(len(results)):
 			if(results[i]['ignore'] == 0):
@@ -412,7 +414,7 @@ def cleanUpResultsXML(self, results):
 				#~ print qryforwarp
 				dt1 =  datetime.datetime.fromtimestamp(int(results[i]['posting_date_timestamp']))
 				human_readable_time = dt1.strftime("%a, %d %b %Y %H:%M:%S")
-				
+
 				niceResults_row = {
 							#~ 'url': results[i]['url'],
 							'url':self.rqurl + self.cgen['revproxy'] + '/warp?x='+qryforwarp,
@@ -427,11 +429,11 @@ def cleanUpResultsXML(self, results):
 				#~ non CP request generate might errors if no url is found in the permalink
 				if(self.typesearch != 0):
 					niceResults_row['encodedurl'] = 'http://bogus.gu/bog'
-					
+
 				niceResults.append(	niceResults_row)
-							
-		
-		kindofreq = datetime.datetime.now().strftime("%Y-%m-%d %H:%M ") 
+
+
+		kindofreq = datetime.datetime.now().strftime("%Y-%m-%d %H:%M ")
 		idbinfo = ''
 		if(self.typesearch == 0):
 			idbinfo = self.args['imdbid']
@@ -452,5 +454,5 @@ def cleanUpResultsXML(self, results):
 		if(self.typesearch == 3):
 			return render_template('rss.html',results=niceResults, num_results=len(niceResults), typeres= self.typesearch, idb = idbinfo)
 		else:
-			return render_template('api.html',results=niceResults, num_results=len(niceResults), typeres= self.typesearch, idb = idbinfo)				
-	
+			return render_template('api.html',results=niceResults, num_results=len(niceResults), typeres= self.typesearch, idb = idbinfo)
+