Further updates to report export template