Improve number of fields in HTML exports