add orderFields support