fix #4336: better auto increase of waypoint name