Make filter less dumb