Navigator - improvements

This already has a feature request (+ a couple of existing duplicates):

This should already work perfectly, unless I am not understanding your requirements.