Minor fix to PrincipalQuery. Added system roles.