Added Support for Field Filters