using the Storage->isFilterOr() now to switch between AND and OR where clauses