updating filters to use correct BaseReportFilters, see commcare-hq/#686
merged with mutlireport upstream