Changed the design to have separate grouping sets list in Query node and make groupClause flat in all cases