UVAUPORTAL-14, Fixed to work with new subgroup and grouping features