Diagram View fails to draw Route2 paths correctly so message tracing does not work

1. Run CBRroute as Local Camel Context
2. Start Message Tracing on it
3. Drop messages on file:src/data endpoint
4. In Messages view, select/follow msg instances through Route1 and Route2 in Diagram view.
Diagram view, draws Route 2 incorrectly - the Route2 node should connect to a Choice2 node, which then fans out into 3 separate when and 1 otherwise paths, each with a set head node, log node, and file:target/messages/dir_name endpoint. But Diagram view draws only the Route2 node and connects it to the direct:OderFulfillment node (from which it receives messages from Route1).

I am attaching the CBRroute project, and screen shots of Diagram view/Messages view with Msg tracing turned on.