It looks like these "buildings" should be turned in to rooms (https://wiki.openstreetmap.org/wiki/Key:room) or building_part=*. If the current way of mapping is correct, please point me to some reading in the wiki so I can brush up :-)