fix search client
merge
merge