CHEC-28 - Change report template + add template for filter