Updated search service

Updated search service