Fix my silly mistakes
Merge pull request #7018 from guardian/container-component-id

Fix my silly mistakes