Fix for change in group_filter signature