Search Method Refactor