tosulliv: Further work on CCM Custom Report