Moved the ecomm fields up as per the non-hive-format.q