Added support for filters, and SetNull filter