Feature/searchclient