CON-1073 | Additional markup for local navigation