Add "or" logic for the filter of set and collection

These are some of the related feature requests.