Updated user lists to use _userQuery() and _linkUserFromQuery()