Refactoring searches again.