waypoint catalog filter handling tried to improve