Feature/search client