updated users and guardians queries