I suggested some time ago to use a new general key for such things (when it's not really an amenity, a shop or a leisure like for lawyers, architects, designers, etc) : office=notary Pieren