@@ -329,8 +329,8 @@ class Search(object):
329329 self.blocked_engines = get_blocked_engines(engines, request.cookies)
330330
331331 self.results = []
332− self.suggestions = []
333− self.answers = []
332+ self.suggestions = set()
333+ self.answers = set()
334334 self.infoboxes = []
335335 self.request_data = {}
336336
@@ -429,9 +429,6 @@ class Search(object):
429429 requests = []
430430 results_queue = Queue()
431431 results = {}
432− suggestions = set()
433− answers = set()
434− infoboxes = []
435432
436433 # increase number of searches
437434 number_of_searches += 1
@@ -511,7 +508,7 @@ class Search(object):
511508 selected_engine['name']))
512509
513510 if not requests:
514− return results, suggestions, answers, infoboxes
511+ return self
515512 # send all search-request
516513 threaded_requests(requests)
517514
@@ -519,19 +516,19 @@ class Search(object):
519516 engine_name, engine_results = results_queue.get_nowait()
520517
521518 # TODO type checks
522− [suggestions.add(x['suggestion'])
519+ [self.suggestions.add(x['suggestion'])
523520 for x in list(engine_results)
524521 if 'suggestion' in x
525522 and engine_results.remove(x) is None]
526523
527− [answers.add(x['answer'])
524+ [self.answers.add(x['answer'])
528525 for x in list(engine_results)
529526 if 'answer' in x
530527 and engine_results.remove(x) is None]
531528
532− infoboxes.extend(x for x in list(engine_results)
533− if 'infobox' in x
534− and engine_results.remove(x) is None)
529+ self.infoboxes.extend(x for x in list(engine_results)
530+ if 'infobox' in x
531+ and engine_results.remove(x) is None)
535532
536533 results[engine_name] = engine_results
537534
@@ -541,16 +538,16 @@ class Search(object):
541538 engines[engine_name].stats['result_count'] += len(engine_results)
542539
543540 # score results and remove duplications
544− results = score_results(results)
541+ self.results = score_results(results)
545542
546543 # merge infoboxes according to their ids
547− infoboxes = merge_infoboxes(infoboxes)
544+ self.infoboxes = merge_infoboxes(self.infoboxes)
548545
549546 # update engine stats, using calculated score
550− for result in results:
547+ for result in self.results:
551548 for res_engine in result['engines']:
552549 engines[result['engine']]\
553550 .stats['score_count'] += result['score']
554551
555552 # return results, suggestions, answers and infoboxes
556− return results, suggestions, answers, infoboxes
553+ return self