Edit filtering to account for empty values

* If field empty (not required), return entry anyway
* Account for checks against empty values in filters