Split filterinArray to use filterAnd/filterOr. Fixes #23