fixed groupctrl, small addition to Tenant