Swap field order as requested