fix references to deprecated classes
create OR filter with filters not calculators
Merge pull request #1027 from dimagi/fix-deprecation

fix references to deprecated classes