@@ -311,9 +311,6 @@ class Search(object):
311311 if not self.request_data.get('q'):
312312 raise Exception('noquery')
313313
314− # set query
315− self.query = self.request_data['q']
316−
317314 # set pagenumber
318315 pageno_param = self.request_data.get('pageno', '1')
319316 if not pageno_param.isdigit() or int(pageno_param) < 1:
@@ -322,8 +319,11 @@ class Search(object):
322319 self.pageno = int(pageno_param)
323320
324321 # parse query, if tags are set, which change the serch engine or search-language
325− query_obj = Query(self.query, self.blocked_engines)
326− query_obj.parse_query()
322+ query_obj = Query(self.request_data['q'], self.blocked_engines)
323+ query_obj.parse_query()
324+
325+ # set query
326+ self.query = query_obj.getSearchQuery()
327327
328328 # get last selected language in query, if possible
329329 # TODO support search with multible languages