Filters should not use multiple add_where clauses assuming AND

Because we can now use OR, we have to go thorugh all our filters and check for the use of multiple add_where() clauses.

If we're using multiples, we have to try to combine them into a single clause because we can no longer guarantee they will be ANDed together.