Merge pull request #16118 from deepeshgarg007/analytics-fix

Bug fixes for analytics report