Group By seperation - Fixes for Pie Chart