Fixing accordion groups and adding multi-groups