Fixes to user search