Refactor SearchOptions a bit