Tested addition to database.Users.query()