decomposition / corrected grouping keys extraction