Fix fields order if was used only or exclude