Simplify route-changed