Thanks - I've updated it so that the different buildings are tagged as buildings and added the shop as a node so that it isn't duplicated. Hope that's ok.
https://www.openstreetmap.org/changeset/170577256