More front-end search refactoring