Fetch everything when a new waypoint gets created.
Using a different way of fetching. Maybe this works.