Refactor/searcher

Likewise here