refactor SearchFormService