Refactoring Search