Removed delete and reinsert, to keep the Waypoint Ids stable. Fixes #2341