Make subnetroute label and flow management more robust