Workaround for variable metric presence in waypoints during N+ upload