more tweaks for subfield re-ordering