Manage user search fix