Updated client search