Refactored search options