Navigation: Base must depend on path

Fixes gh-7159
Build: Fixed path substitutions for demos

Fixes gh-7108