DataFilter fix