more changes for SearchClient