issue #20715: improvements to charts