Ensure preset fields are consistently ordered (#1876)