ToolpathDisplay using G54 and G55

[luremaker]

I often run programmes which start on G54 to cut one piece then change to G55 to cut another. The issue is that the UCCNC onscreen toolpath shows both parts on top of each other.Is there anything I can do to get the toolpath display shown correctly?

Here is an example of the gcode (with lines removed)

( 107mmgrub lam bottom Router )
( End Mill D 8 )
( Generated on Thursday, September 17, 2020 8:03)
G21
G90
G91 G28 X0 Y0 Z0 M05
(T1 End Mill D 8 )
M5
G90 M6 T1
G00 X0.0000Y0.0000
(Check X and Y datum, press Cycle Start to continue)
M00
G01 Z10.000 F1500
(Z is at +10mm , press Cycle Start to continue)
M00
G01 Z20.000 F500
(Start Operation: Facing.1)
M03 S16000
G01 X69.5000 Y0.0000 Z-0.3000 F1400
G01 X0.0000
G01 Y89.0000
G01 Y45.0000
G01 X95.0000
G01 Y44.0000
G01 X69.5000
G01 Z2.000
(End Operation: Facing.1)
(Start Operation: Profile Contouring.3)
M03 S16000
G01 X0.0000 Y19.0003 Z0.7000 F600
G01 Z-0.4000
G01 Y69.9997 F1000
G00 Z-0.2500 F666
G00 Z-1.5500 F666
G01 Z-1.8000 F600
G01 Y69.9997 F1000
G01 Z0.7000 F1000
G01 Z2.000
(End Operation: Profile Contouring.3)
(Start Operation: Profile Contouring.4)
M03 S16000
G01 X139.000 F600
G01 Z-0.4000
G01 Y19.0003 F800
G00 Z-0.2500 F666
G01 Z-0.5000 F600
G0 Z-1.3500 F666
G01 Z-1.6000 F600
G01 Y19.0003 F800
G00 Z-1.4500 F666
G01 Z-1.7000 F600
G01 Y69.9997 F800
G00 Z-1.5500 F666
G01 Z-1.8000 F600
G01 Y19.0003 F800
G01 Z0.7000 F1000
G01 Z2.000
(End Operation: Profile Contouring.4)
G01 Z20.000 F500
G55
(Start Operation: Facing.1)
M03 S16000
G01 X69.5000 Y89.0000 Z-0.3000 F1400
G01 X139.000
G01 Y0.0000
G01 X0.0000
G01 Y89.0000
G01 X95.0000
G01 Y44.0000
G01 X44.0000
G01 Y45.0000
G01 X69.5000
G01 Z2.000
(End Operation: Facing.1)
(Start Operation: Profile Contouring.3)
M03 S16000
G01 X0.0000 Y19.0003 Z0.7000 F600
G01 Z-0.4000
G01 Y69.9997 F1000
G00 Z-0.2500 F666
G01 Z-0.5000 F600
G01 Y19.0003 F1000
G00 Z-0.3500 F666
G01 Y19.0003 F1000
G00 Z-1.5500 F666
G01 Z-1.8000 F600
G01 Y69.9997 F1000
G01 Z0.7000 F1000
G01 Z2.000
(End Operation: Profile Contouring.3)
(Start Operation: Profile Contouring.4)
M03 S16000
G01 X139.000 F600
G01 Z-0.4000
G01 Y19.0003 F800
G00 Z-0.2500 F666
G01 Z-0.5000 F600
G01 Y69.9997 F800
G00 Z-0.3500 F666
G01 Z-1.8000 F600
G01 Y19.0003 F800
G01 Z0.7000 F1000
G01 Z2.000
(End Operation: Profile Contouring.4)
G01 Z20.000 F500
G91 G28 X0 Y0 Z0 M05
G90
M30