Merge pull request #1746 from nabinhait/v4-hotfix

Multiple issues
Fixes in trends report