Search Refactoring