refine new nav tracking
Merge pull request #5069 from guardian/new-nav-tracking

refine new nav tracking