only include the org key if org name exists