search service small cleanup