Refactor to cleanup search fragment.