properly resolve the report type
Merge branch 'fix_cites_trade_raw_report_type_exception' into develop