Fix DataNormalizationOperation with nested choices