Add labels to groups
Fix saving collections