major fixes for chart refresh flow.