ReportField refactor to use BaseReportFilter and corresponding subclasses