Excavation site contract marker won't go away after completion

This is an update to the bug linked below which has not been fixed. I started a brand new game on 2.2.0.2002 and made it to the Excavation Site Contract. I realize now what's happening: to repro this bug, simply move to the collapsed tunnels before finishing the first 4 objectives. I did this the first couple times through, not realizing copper and compressors were available to finish everything before moving on. If you don't finish the Gearforge or the Drill in the first cave, move past the 3rd battery and start drilling through the collapsed tunnels, the Gearforge or Drill stay active, but now it also gives you markers for the tunnels. I think if you weld up the battery first also it will bug the contract. It's pretty easy to miss the copper mine in the first room or think there's not enough compressors and move on.

To fix this permanently, it would be good if all waypoints associated with a contract were cleared when finishing a contract. Even better would be more robust waypoints and contract system, so that it won't bug if they are finished out of order.

I also published my save game just in case it's needed:

Steam Workshop::Excavation Site Waypoint Broken

Prior bug:

Mission marker won't go away after completion | Space Engineers 2 Support