Small changes to match_route_dp