refactor searcher rest api