[TASK] change field order