Bug fixes, Improve data text formation