add context_organization short_name/logo support