Revert "Bug fixing in Reports"

This reverts commit 3acb7750e32105f792d02086af5e37727a607e12.