It's not so much a problem as a characteristic of the design. I have
suggested that the GOTO list separates out contest turnpoints from
other database points so that TP selection is easier on pilot selected
tasks. So far this fell on stony ground.

If you choose to use the "number before" database listing you can force
the GOTO points to be in the turnpoint list order and all turnpoints to
be grouped together. I don't like that solution as if has undesired
effects on the map display and I almost never use the GOTO list. I
prefer to select the next point from the map screen.

Andy