replace organisation name with option;