Improved Client Search