make optional filter non-optional, but being able to use nil
small fixes