Fix onward component tracking
Merge pull request #3968 from guardian/onward-component-tracking

Fix onward component tracking