Move search to Searcher