Worked on #517 in report template