Refactor SearchService