User listing and UsersApiRouter fixes