Better handling of some USFM fields in some exports