interacts with #10317 - also, fix an issue with double markers found by @jahorton
interacts with #10317