hotfix clone id > 10 in report
modularize