[#612] Fixed some spacing issues on long data list