text: Hello,
  
  can you please check if the building should rather tagged as building=government
  
  Then, I suggest to have two POI: one for oecd and one of NEA. (have never been there, please check what is really there).
  
  For OECD tag:
  
  name = OECD Boulogne
  operator= OECD (or better use operator:wikidata)
  also set name:en=Organisation of Eco...
  name:fr = organisation de develop Boulogne
  short_name:fr=OCDE Boulogne
  office=government
  country=OECD (to allow searching all OECD entities, similar use to UN, EU)