Refactoring QueryController -> QuerySearchController