Fix filter. Fix test.