I agree that the site mapping I encountered here is overly complicated, and see my change of tagging to address the note resulted in a duplication.  Feel free to proceed as suggested, or I will get back to it later.  Based on US experience, I would favor amenity tagging the building over the site.