bug fixes in templates

Merge request reports

Loading