searchers refactor