Better nav route handling