
It's no problem to leave your tagging on the building because 'Het Waterlab' is also the historic buildingname.
I added the website.
I removed parking=yes from the building. 

You may add an amenity=parking outside on an area or a node.
Up to you.
Greetz,
eggie