Treat filter values of null as if they were unset