Restore fields after postcode before city. Closes #2293.