Grouping issue

# Description
In some instances, when removing an item from the group the entire group disappears. Adding the item back and removing again will cause a crash with the item not being available in the collection.
See ACM-XE token manager when grouped and adding/removing a drive

# Tasks
- [ ] Investigate and fix