Fixes issues with multiple metrics in charts