tosulliv: updates to custom ccm report to generate dynamic content for
report selection criteria. Also did a general refactor of packages.