Dc/Melanie| #3922 | Using ordered dict in chart view response