Hi. About your tagging of the closed Espresso House: In general, shops that don't exist anymore can be simply deleted. there's no value in keeping them around.

Depending on what's in the location now, it can make sense to tag it with a vacant shop: https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant