Charts: Improve data consistency