Fix fields order when schemata is not the default one