Changes in report
Fixed the issues pointed by Natalia.