Routing: flags unified under a single section with several improvements