Bug fixes with groups, merge
Fixed problem with multiple selection