Sure, do it that way. And sorry for my changes in 'your' area. I'm working on a map with churches and chapels in Switzerland as extracts from OSM and the easiest way to classify the buildings ist the building= property, so i systematically changed the property on all buildings with Kapelle in the name.

Should we divide it into 2 parts?