Listing Details – extra fields, mis-mapped fields

In the attached screenshot you can see that the CITY field is displayed twice and one contains the wrong information. From what I can tell, the second CITY field (the one that contains “New York” is actually pulling data from the field with db key ‘ map-state ‘. (See second attachment – areas highlighted in yellow.)

Country is duplicated – in the first case it’s entered from the custom fields on the Add Listings Page.

I want to display the map as a standard listing feature, but I do not want duplicate fields displayed in the listing itself. I added the custom fields for City/State/Country in case the person creating the listing did not set up the map.

1) Obviously, the mis-mapping of ‘ map-state ‘ -> to City needs to be changed in the basic theme package.
2) Is there a way to have only one State or City be displayed?
3) How do I hide both the ‘ distance ‘ (which needs to be capitalized, btw) and the Address fields from the listing display?

Thanks in advance.