OP-1592 New filtering method as requested in review