Correct ordering of fields after replaced date/time fields