grouping in demo, some fixes