CMS-1373 Fixes for analytics tab