Optimize Waypoint PUBs

closes #268