#502 - PR followup

- Adding tenant information to collections
- Grouping group-add-members by 'object'
- Minor code cleanup