Improved client search