fix
rollback UsersController + sorting of the users