Updates to navigation URL generation