Fixed organization editing