ticket:6 some field reordering