Bug solving in SearchClient