Tracks and waypoints

This may be a Garmin question rather than a Basecamp one, but I thought that I would start here.

I have a Montana 610 that we use for kayaking navigation. I create tracks with associated waypoints in Basecamp. Each track and its waypoints are in a separate list in Basecamp. Then, I copy them onto the Montana as needed. More often than not, I only load into the Montana the one track and the waypoints that I need for one day's paddling. Today, though we were paddling a lake for which I had created two tracks with their associated waypoints in Basecamp. I loaded both tracks and all the waypoints into the Montana. The tracks overlap in some spots on the lake. The plan was to paddle a section of each track, loading the second one when we were finished paddling the section of the first one that we wanted.

When I selected "where to" on the montana, I selected one of the tracks. But, I saw that, even though only that one track was on screen, the waypoints for both tracks were on the screen, confusing the heck out of me.

Is there a way to copy the tracks and their associated waypoints from Basecamp in such a way that, when I load a track, only the waypoints associated with that track are on screen?

Thank you