Reporting - bug fixes

Changes: https://github.com/fedorov/Reporting/compare/9b6ca6f...bce75a3