Note: For several existing shops, I changed the addr:city to match the address shown on the shop's web site, according to the guidance at https://wiki.openstreetmap.org/wiki/Key:addr:city#United_States .