fix some data presentation order