Fixed bug in grouping handler that tried to access old format.