Addresses in Map bubble not complete

I saw recently the new controls added to determine what is shown in the map bubble for different CPT and custom fields.

I would like to show address on the map bubble. I have selected this in the new settings (show it what locations? map bubble). However only the street shows up in the bubble not the city/state/country. The data is there as you can click the bubble and get to the full listing which shows the street/city/state/country, but the bubble is only showing street. Suggestions?

Also, my preference is to just show City and State in the bubble (not street or country), so is this possible? The settings seem to treat the Address as complete with all info.