more Searcher refactor