* Fix ignoring of filters when they are plain objects * Fix default filter merging behavior to account for "new" filter structure (named criteria) * Add tests for building/merging filters
