Fix "All of the above in one attempt"

Already finished "all of the above individually" how am I supposed to know what I have and haven't completed after respawning at waypoint? Ended up claiming what I've completed and reloading the challenge/mission and for it to reset my goals. Please add in a quick restart or something along the lines.