When keeping the connection when the intermittant element, make sure we keep the waypoints, too. closes #581