Show location as city and state instead of list of zip code

[Finishes #46782343]