waypoint import filter handling improved