Improved staff search