Ensure groups are respected and v2 endpoints handle groups.