Align the router_state this gives 5% improvement.
The back_journey_pattern_point and journey_pattern_point are only required in the expanded scenario.

When removing them the performance increases 2%