Fix mappings for attraction/city.
Fix incorrect city/attraction mapping.
Merge branch 'attraction_city_fix'