HSI Batch report refactor