Fix typo and default groups
Merge branch 'multi_room'