PROJ-151: Fixed sub-navigation for dynamic pages (2)