In progress additions and changes to support cross-site indicator report