Refactored Search