I think there's a good argument that the restaurant should be a POI  mainly because I don't know where within the building it belogs.  Also as far as I can tell, https://www.openstreetmap.org/way/155375475 and https://www.openstreetmap.org/way/155375457 are the same building now, with https://www.openstreetmap.org/way/459680691 next door to the south (looks like there's a gap between the buildings too)... hmm.  need more photos of the site..