Looks like many "buildings" here should be mapped within a building as rooms or building_part=*. It also appears that the use of addr:housenumber=* should be changed to ref=*. If not, please point me to the wiki where I can learn about this type of mapping.