TBH tags like this that are specifically related to buildings should have a building:xyz tag so that they can more easily be known by software they should be for the building instead of related to the contents/use of the building like a shop or residential.
Perhaps a new system should be made so that it does not depend on the user editing to maintain these, the way I see it now is that it's both hard for a person and a computer to maintain these.