In Quebec, we usually map the POIs as nodes instead of within the building tags. It is easier to maintain and it allows for standard analysis when more than one POI is inside a buidling, which is often the case. Thanks!