Fix search in client