Modify searcher service
improve searcher