Improve client search