well,  4b696d already knows how to solve the issue and work it our with Pavvv, but yeah, instead of giving out a solution, you hold it to yourself xD

IMHO whole thing could be one building, but without layer tag, tho then you gotta use tunnel=building_passage. 
tbh it should be used  even now
