Edit filters to account for empty values

* If field isn't set, return entry anyway
* Account for checks against empty parameters in filters