Route logic fixes