search service fixes