S66833: RPB - Update filter to work with the entire board