Hi, Welcome to OpenStreetMap.

OSM says "One feature, one OSM element" Thus I've reinstated the buildings original tags. The building serves more than one purpose so it's tagged in a general way. The business is only one use of the building. 

Please see:- https://wiki.openstreetmap.org/wiki/One_feature,_one_OSM_element

Regards Bernard.