Tweak chart data, closes item:621