Fix order accounts for chart
Finish 2.1.1