[BUGFIX] refactored collection component

__Tasks:__

- [x] gather feedback for my changes

__Informations:__

| Q             | A
| ------------- | ---
| Bug fix?      | yes 
| New feature?  | no
| Tests pass?   | none
| Fixed tickets | none
| Doc           | none