Add waypoint Groups for continuous and next/prev grouping