Map Directory Display's Primary Address, even when a different address is selected in the profile.

I created a profile to display the addresses of our organizations public contacts.

However many of them have 2 different addresses, a 'Home' address which is their primary addresses, and a 'Public' address. Sometimes they have just a 'Home' address, but not a 'Public' address.

The profile specifies to show the fields for the 'Public' addresses, and on the directory listing page, that's what it does. However when you click on the 'map these contacts' button, it display's the 'Primary' Address for those contacts - which may or may not be the address that is the 'Public' address.

This is obviously a potential security issue. Is there a way to correct this? Or is this something that would need to be added to a future update of civicrm?