Fix navigation tracking
Merge pull request #665 from guardian/clever-nav

Fix navigation tracking