swap placement of city and state fields