Now i better understand your issue, actually the "mapping" is the position of the attribute group so you need to find where the attributes are displayed and change the code there to display them in the order of the attribute groups (IDs) and not the attribute IDs
Momentarily can't tell where that change needs to be done if anyone else knows maybe they can post it