Chart data model order fix