Improves route handling once more.