Fix for "#6 The active navigation does not reflect the current page".