How to display address instead of coordinates on map field?

Hello,

I have a Location field using the "Geocode from another field" widget. It is geocoding the address and displaying it on the map correctly, but when I click the marker, it shows the longitude/latitude coordinates instead of the property address. How can I force it to display the address instead?

Likewise, the Link above the map (I am using the "Address with map" display option) points to a Google Map for the long/lat; not the address. How can I modify that link to point to the Google Map for the address?