Chart Grouping fixes