fixed admin charts
Merge branch 'hotfix/fix-admin-charts'