template language map changes
fixing api queries to deal with cities and other county equiv areas
fixed display of county-equiv names to not include "County" suffix if city is present in string