NMS-6304 fix filtering to match 1.12