Reorder fields to fit in with new fieldset in oa_subspaces.