MANTA-128 more filtration logic fixes