LPS-44657 Refactorization of searchers