Fixing user search