Hi Bonboni...

It's no problem to leave it this way.
Only the consensus is to tag at the addressnode. 
Your tagging is not a wrong, but somthing is missing.
If I merge your info with the addressnode I have to know what the maintagging has to be of Het Waterlab..  
Otherwise no rendering on the map.
It's like Fletcher Hotel-Restaurant Marknesse... The maintag is tourism=hotel...

Now the question
name=Het Waterlab
?=?

https://wiki.openstreetmap.org/wiki/Tag:craft%3Datelier

tourism=gallery
shop=art  ?

That will render on the map with an icon.
Greetz,
eggie
