CurlingMan13
Hate to reactivate notes.  But yeah, I was hoping it would be an easy edit to the map.  I haven't seen a building yet where it had two different street addresses (numbers, sure, but not street names).

Your solution is perfect for these POIs.  :D