@crystaldesign/web-planner-logic 25.10.0-beta.1 → 25.10.0-beta.10

package/build/cjs/{index-f1e5aa56.js → index-a366532b.js}

@@ -43,8 +43,8 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 })();
 
 var _excluded = ["type"];
-function ownKeys$l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$l(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$j(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$p = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var JsonDataCache = /*#__PURE__*/function () {
   function JsonDataCache() {
@@ -255,8 +255,8 @@ var DivaApiHandler = /*#__PURE__*/function () {
               if (this.getApplicationEnvironment() == 'WEB' && (_this$apiConfig2 = this.apiConfig) !== null && _this$apiConfig2 !== void 0 && _this$apiConfig2.api2.web) {
                 api2Url = this.apiConfig.api2.web;
               }
-              _context2.t0 = _objectSpread$l;
-              _context2.t1 = _objectSpread$l({}, init.config.headers);
+              _context2.t0 = _objectSpread$j;
+              _context2.t1 = _objectSpread$j({}, init.config.headers);
               _context2.t2 = {};
               _context2.next = 21;
               return this.getSessionGuid('V', undefined, this.OrganizationId, api2Url);
@@ -16498,6 +16498,9 @@ var OptionValueCatalogData = /*#__PURE__*/function () {
   }]);
 }();
 
+function _createForOfIteratorHelper$b(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$b(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$b(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$b(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$b(r, a) : void 0; } }
+function _arrayLikeToArray$b(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 //kaufmännischer Artikel
 var CatalogArticleData = /*#__PURE__*/function () {
   function CatalogArticleData(catalogArticle) {
@@ -17210,14 +17213,25 @@ var CatalogArticleData = /*#__PURE__*/function () {
     value: function getOptionValueFromOption(opt, opv) {
       if (this._catalogArticle.articleOptions[opt] && this._catalogArticle.articleOptions[opt].hasOPG) {
         var myOPGs = this._catalogArticle.articleOptions[opt].articleOptionValues;
-        for (var _key2 in myOPGs) {
-          var myOPVs = myOPGs[_key2].articleOptionValues;
-          if (myOPVs && myOPVs[opv]) {
-            return myOPVs[opv];
+        var _iterator = _createForOfIteratorHelper$b(myOPGs),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var _step$value = _slicedToArray__default["default"](_step.value, 2),
+              _key2 = _step$value[0],
+              value = _step$value[1];
+            var myOPVs = value.articleOptionValues;
+            if (myOPVs && myOPVs.get(opv)) {
+              return myOPVs.get(opv);
+            }
           }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
       } else {
-        return this._catalogArticle.articleOptions[opt].articleOptionValues[opv];
+        return this._catalogArticle.articleOptions[opt].articleOptionValues.get(opv);
       }
       return null;
     }
@@ -17252,8 +17266,11 @@ var CatalogArticleData = /*#__PURE__*/function () {
     key: "getOptionCodexFromOptionsValue",
     value: function getOptionCodexFromOptionsValue(opv) {
       if (this._catalogArticle.articleOptions) {
-        for (var _key3 in this._catalogArticle.articleOptions) {
-          if (this._catalogArticle.articleOptions[_key3].articleOptionValues[opv]) {
+        for (var _i = 0, _Object$entries = Object.entries(this._catalogArticle.articleOptions); _i < _Object$entries.length; _i++) {
+          var _Object$entries$_i = _slicedToArray__default["default"](_Object$entries[_i], 2),
+            _key3 = _Object$entries$_i[0],
+            value = _Object$entries$_i[1];
+          if (value.articleOptionValues.get(opv)) {
             return _key3;
           }
         }
@@ -18218,6 +18235,9 @@ var ArticleOptionValueData = /*#__PURE__*/function () {
   }]);
 }();
 
+function _createForOfIteratorHelper$a(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$a(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$a(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$a(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$a(r, a) : void 0; } }
+function _arrayLikeToArray$a(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var ArticleOptionData = /*#__PURE__*/function () {
   function ArticleOptionData(opt) {
     var _this$tabGroup;
@@ -18236,24 +18256,6 @@ var ArticleOptionData = /*#__PURE__*/function () {
     key: "initOPVsInOPT",
     value: function initOPVsInOPT(articleOptionValues) {
       this.opt.articleOptionValues = articleOptionValues;
-      for (var key in articleOptionValues) {
-        if (this.opt.hasOPG) {
-          var opg = articleOptionValues[key];
-          for (var key2 in opg.articleOptionValues) {
-            var opv = opg.articleOptionValues[key2];
-            if (opv.image || opv.hexColor) {
-              this.opt.hasImages = true;
-              break;
-            }
-          }
-        } else {
-          var _opv = articleOptionValues[key];
-          if (_opv.image || _opv.hexColor) {
-            this.opt.hasImages = true;
-          }
-        }
-        if (this.opt.hasImages) break;
-      }
     }
     /**************************************************GETTER ************************************************** */
   }, {
@@ -18330,17 +18332,28 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "getOpvByOcd",
     value: function getOpvByOcd(codex) {
-      for (var key in this.opt.articleOptionValues) {
-        var opv = this.opt.articleOptionValues[key];
-        if (opv.ocd == codex) {
-          return opv;
-        }
-        if (opv.isOPVG) {
-          var _opv$articleOptionVal;
-          return Object.values((_opv$articleOptionVal = opv.articleOptionValues) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : {}).find(function (v) {
-            return v.ocd === codex;
-          });
+      var _iterator = _createForOfIteratorHelper$a(this.opt.articleOptionValues),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = _slicedToArray__default["default"](_step.value, 2),
+            key = _step$value[0],
+            value = _step$value[1];
+          var opv = value;
+          if (opv.ocd == codex) {
+            return opv;
+          }
+          if (opv.isOPVG) {
+            var _opv$articleOptionVal, _opv$articleOptionVal2;
+            return Array.from((_opv$articleOptionVal = (_opv$articleOptionVal2 = opv.articleOptionValues) === null || _opv$articleOptionVal2 === void 0 ? void 0 : _opv$articleOptionVal2.values()) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : []).find(function (v) {
+              return v.ocd === codex;
+            });
+          }
         }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
       return undefined;
     }
@@ -18352,7 +18365,13 @@ var ArticleOptionData = /*#__PURE__*/function () {
   }, {
     key: "hasImages",
     get: function get() {
-      return this.opt.hasImages;
+      var _this$opt$articleOpti, _this$opt$articleOpti2;
+      return ((_this$opt$articleOpti = (_this$opt$articleOpti2 = this.opt.articleOptionValues) === null || _this$opt$articleOpti2 === void 0 ? void 0 : _this$opt$articleOpti2.values()) !== null && _this$opt$articleOpti !== void 0 ? _this$opt$articleOpti : []).some(function (v) {
+        var _v$articleOptionValue;
+        return (_v$articleOptionValue = v.articleOptionValues) === null || _v$articleOptionValue === void 0 ? void 0 : _v$articleOptionValue.values().some(function (v2) {
+          return v2.image || v2.hexColor;
+        });
+      });
     }
   }, {
     key: "parentOptionCodex",
@@ -18548,8 +18567,8 @@ function addSupplierColors(catalogArticleData, allOPVsOfOPT, supplierColors, cat
   var articleOPG = new ArticleOptionValueData(getArticleOptionValueType('OPVSUPPLIER_COLORS', {
     RUL: rule
   }, catalogOPG, catalogArticleData, false, newOPT, catalog.multiselectOptions));
-  allOPVsOfOPT['OPVSUPPLIER_COLORS'] = articleOPG;
-  var supplierColorsOpvs = {};
+  allOPVsOfOPT.set('OPVSUPPLIER_COLORS', articleOPG);
+  var supplierColorsOpvs = new Map();
   for (var i = 0; i < supplierColors.length; i++) {
     var col = supplierColors[i];
     var colorCatalogOpv = new OptionValueCatalogData(getCatalogOptionValueDataType('OPV' + col.OptionValueCodex, {
@@ -18558,7 +18577,7 @@ function addSupplierColors(catalogArticleData, allOPVsOfOPT, supplierColors, cat
       HexColor: col.HexColor,
       GroupName: 'Lieferantenfarben'
     }, catalog), catalog);
-    supplierColorsOpvs['OPV' + col.OptionValueCodex] = new ArticleOptionValueData(getArticleOptionValueType('OPV' + col.OptionValueCodex, {}, colorCatalogOpv, catalogArticleData, true, articleOPG, catalog.multiselectOptions));
+    supplierColorsOpvs.set('OPV' + col.OptionValueCodex, new ArticleOptionValueData(getArticleOptionValueType('OPV' + col.OptionValueCodex, {}, colorCatalogOpv, catalogArticleData, true, articleOPG, catalog.multiselectOptions)));
   }
   articleOPG.initOPVsInOPG(supplierColorsOpvs);
 }
@@ -18714,26 +18733,26 @@ function loadArticleOptions(json, catalogArticleData, set, onlyRunLogic) {
   if (json.OPT && json.OPT.length != 0) {
     for (var i = 0; i < json.OPT.length; i++) {
       var myOPT = json.OPT[i];
-      var allOPVsOfOPT = {};
+      var allOPVsOfOPT = new Map();
       var newOPT = new ArticleOptionData(getArticleOptionType(myOPT, set));
 
       //Items initalisieren
       if (newOPT.hasOPG) {
         var _myOPT$OPV;
         for (var j = 0; j < myOPT.OPG.length; j++) {
-          var allOPVsOfOPG = {};
+          var allOPVsOfOPG = new Map();
           var tmpOPG = myOPT.OPG[j],
             catOPG = set.CatalogData.getOptionValue(tmpOPG.OCD ? tmpOPG.OCD : tmpOPG.Codex);
           if (catOPG) {
             var newOPG = new ArticleOptionValueData(getArticleOptionValueType(tmpOPG.Codex, tmpOPG, catOPG, catalogArticleData, false, newOPT, multiselectOptions));
-            allOPVsOfOPT[tmpOPG.Codex] = newOPG;
+            allOPVsOfOPT.set(tmpOPG.Codex, newOPG);
             for (var m = 0; m < tmpOPG.OPV.length; m++) {
               var tmpOPV = tmpOPG.OPV[m],
                 catOPV = set.CatalogData.getOptionValue(tmpOPV.OCD ? tmpOPV.OCD : tmpOPV.Codex);
               if (catOPV) {
                 if (!(catOPV !== null && catOPV !== void 0 && catOPV.groupName) && catOPG) catOPV.groupName = catOPG.name;
                 var myOPV = new ArticleOptionValueData(getArticleOptionValueType(tmpOPV.Codex, tmpOPV, catOPV, catalogArticleData, true, newOPG, multiselectOptions));
-                allOPVsOfOPG[tmpOPV.Codex] = myOPV;
+                allOPVsOfOPG.set(tmpOPV.Codex, myOPV);
               }
             }
             newOPG.initOPVsInOPG(allOPVsOfOPG);
@@ -18741,16 +18760,16 @@ function loadArticleOptions(json, catalogArticleData, set, onlyRunLogic) {
         }
         if ((_myOPT$OPV = myOPT.OPV) !== null && _myOPT$OPV !== void 0 && _myOPT$OPV.length) {
           for (var _j = 0; _j < myOPT.OPV.length; _j++) {
-            var _allOPVsOfOPG = {};
+            var _allOPVsOfOPG = new Map();
             var _tmpOPG = myOPT.OPV[_j],
               _catOPG = set.CatalogData.getOptionValue(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex);
             if (_catOPG) {
               var _newOPG = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPG.Codex, _tmpOPG, _catOPG, catalogArticleData, false, newOPT, multiselectOptions));
-              allOPVsOfOPT[_tmpOPG.Codex] = _newOPG;
+              allOPVsOfOPT.set(_tmpOPG.Codex, _newOPG);
               var _catOPV = set.CatalogData.getOptionValue(_tmpOPG.OCD ? _tmpOPG.OCD : _tmpOPG.Codex);
               if (_catOPV) {
                 var _myOPV = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPG.Codex, _tmpOPG, _catOPV, catalogArticleData, true, _newOPG, multiselectOptions));
-                _allOPVsOfOPG[_tmpOPG.Codex] = _myOPV;
+                _allOPVsOfOPG.set(_tmpOPG.Codex, _myOPV);
               }
               _newOPG.initOPVsInOPG(_allOPVsOfOPG);
             }
@@ -18762,12 +18781,12 @@ function loadArticleOptions(json, catalogArticleData, set, onlyRunLogic) {
             _catOPV2 = set.CatalogData.getOptionValue(_tmpOPV.OCD ? _tmpOPV.OCD : _tmpOPV.Codex);
           if (_catOPV2) {
             var _myOPV2 = new ArticleOptionValueData(getArticleOptionValueType(_tmpOPV.Codex, _tmpOPV, _catOPV2, catalogArticleData, true, newOPT, multiselectOptions));
-            allOPVsOfOPT[_tmpOPV.Codex] = _myOPV2;
+            allOPVsOfOPT.set(_tmpOPV.Codex, _myOPV2);
           }
         }
       }
       if (set.supplierColors) {
-        var supplierColorFound = Object.values(allOPVsOfOPT).find(function (item) {
+        var supplierColorFound = Array.from(allOPVsOfOPT.values()).find(function (item) {
           var _item$codex;
           return (_item$codex = item.codex) === null || _item$codex === void 0 ? void 0 : _item$codex.endsWith('OPV_FARBE_BASIS');
         });
@@ -18883,7 +18902,7 @@ function getArticleOptionType(myOPT, set) {
   return {
     codex: myOPT.Codex,
     catalogOPT: catOPT,
-    articleOptionValues: {},
+    articleOptionValues: new Map(),
     pos: Number(myOPT.POS),
     tabGroup: myOPT.TabGroup,
     tabGroup_locales: myOPT.TabGroup_locales,
@@ -18892,7 +18911,6 @@ function getArticleOptionType(myOPT, set) {
     sendToSAP: myOPT.SendToSAP && myOPT.SendToSAP != '-1' ? myOPT.SendToSAP : undefined,
     articlePlaceholder: myOPT.ArticlePlaceholder,
     hasOPG: optHasOpg,
-    hasImages: false,
     invisible: myOPT.Invisible == 'True' ? true : myOPT.Invisible == 'False' ? false : undefined,
     parentOptionCodex: myOPT.ParentOptionCodex
   };
@@ -18992,8 +19010,8 @@ function getArticleOptionValueType(codex, jsonOPV, catalogOPV, myArticle, isPare
   return opv;
 }
 
-function ownKeys$k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$k(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$k = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 function loadMoreFromIDMArticles(_x, _x2) {
   return _loadMoreFromIDMArticles.apply(this, arguments);
@@ -19277,11 +19295,11 @@ var getPriceFeatureGroups = function getPriceFeatureGroups(catalogArticleDatas,
 var initializeDecision = function initializeDecision(decision, idmOptionGroups) {
   var _decision$optionCombi;
   var optionCombinations = (_decision$optionCombi = decision.optionCombinations) === null || _decision$optionCombi === void 0 ? void 0 : _decision$optionCombi.map(function (c) {
-    return _objectSpread$k(_objectSpread$k({}, c), {}, {
+    return _objectSpread$i(_objectSpread$i({}, c), {}, {
       projectOptionsSetRefs: parseOptionSetRef(c.projectOptionsSetRefs, idmOptionGroups)
     });
   });
-  return _objectSpread$k(_objectSpread$k({}, decision), {}, {
+  return _objectSpread$i(_objectSpread$i({}, decision), {}, {
     optionCombinations: optionCombinations === null || optionCombinations === void 0 ? void 0 : optionCombinations.sort(function (a, b) {
       return a.sequence - b.sequence;
     })
@@ -19290,11 +19308,11 @@ var initializeDecision = function initializeDecision(decision, idmOptionGroups)
 var initializePriceFeatureGroups = function initializePriceFeatureGroups(priceFeatureGroup, idmOptionGroups) {
   var _priceFeatureGroup$pr;
   var finishes = (_priceFeatureGroup$pr = priceFeatureGroup.projectFinishes) === null || _priceFeatureGroup$pr === void 0 ? void 0 : _priceFeatureGroup$pr.map(function (c) {
-    return _objectSpread$k(_objectSpread$k({}, c), {}, {
+    return _objectSpread$i(_objectSpread$i({}, c), {}, {
       projectOptionsSetRefs: c.optionsSetRef ? parseOptionSetRef(c.optionsSetRef, idmOptionGroups) : []
     });
   });
-  return _objectSpread$k(_objectSpread$k({}, priceFeatureGroup), {}, {
+  return _objectSpread$i(_objectSpread$i({}, priceFeatureGroup), {}, {
     projectFinishes: finishes === null || finishes === void 0 ? void 0 : finishes.sort(function (a, b) {
       return a.sequence - b.sequence;
     })
@@ -19410,11 +19428,10 @@ function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
   var opt = {
     codex: feature.featureNo,
     catalogOPT: catOPT,
-    articleOptionValues: {},
+    articleOptionValues: new Map(),
     pos: feature.sequenceNo,
     articlePlaceholder: false,
     hasOPG: false,
-    hasImages: false,
     invisible: !!(featureClass !== null && featureClass !== void 0 && featureClass.featureRefs[feature.featureNo]),
     tabGroup: tabgroup !== null && tabgroup !== void 0 && tabgroup.name ? DivaUtils__default["default"].getLocals(tabgroup.name, set.api.getLanguage()) : undefined,
     tabGroup_locales: tabgroup === null || tabgroup === void 0 ? void 0 : tabgroup.name
@@ -19440,7 +19457,7 @@ function getArticleFeatureType(feature, catalogArticleData, catOPT, set) {
 //option in IDM language so in Diva World its OptionValue
 function initOption(feature, articleFeature, catalogArticle, set) {
   var options = feature.options;
-  var allOptionsOfFeature = {};
+  var allOptionsOfFeature = new Map();
   //Items initalisieren
   var _loop2 = function _loop2() {
     var option = options[j];
@@ -19449,7 +19466,7 @@ function initOption(feature, articleFeature, catalogArticle, set) {
     });
     if (!catOption) catOption = getCatalogOptionType(option, set);
     var articleIDMOption = new ArticleOptionValueData(getArticleOption(option, catOption, articleFeature, catalogArticle));
-    allOptionsOfFeature[articleIDMOption.codex] = articleIDMOption;
+    allOptionsOfFeature.set(articleIDMOption.codex, articleIDMOption);
   };
   for (var j = 0; j < options.length; j++) {
     _loop2();
@@ -19832,8 +19849,8 @@ function initCatalogPlannerArticleView(catalogData, catPlanArticle, catalogProps
   });
 }
 
-function ownKeys$j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$j(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 /*
 Diese KLasse enthält Inforamtion zu einem Catalog (C)
@@ -20872,7 +20889,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
   }, {
     key: "setVariantsPriceByHash",
     value: function setVariantsPriceByHash(hash, data) {
-      this.variantsPriceHashObj[hash] = _objectSpread$j(_objectSpread$j({}, data), {}, {
+      this.variantsPriceHashObj[hash] = _objectSpread$h(_objectSpread$h({}, data), {}, {
         calcTime: -1
       });
     }
@@ -21371,7 +21388,7 @@ var DivaCatalogData = /*#__PURE__*/function () {
 var mapMask = function mapMask(mask) {
   var _mappedMask$catalog;
   if (!mask) return undefined;
-  var mappedMask = _objectSpread$j({}, mask);
+  var mappedMask = _objectSpread$h({}, mask);
   var mapProperties = function mapProperties(props) {
     if (Array.isArray(props)) return props;
     var mappedProps = [];
@@ -21400,8 +21417,8 @@ var mapMask = function mapMask(mask) {
   return mappedMask;
 };
 
-function ownKeys$i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 //import IDMCatalogData from '../model/Catalog/IDMCatalogData';
 
 var LOG$h = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
@@ -21619,7 +21636,7 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
               }
               throw new Error('Serie not found: ' + serieNo);
             case 11:
-              catalogData = new DivaCatalogData(_objectSpread$i(_objectSpread$i({}, serieData[0]), {}, {
+              catalogData = new DivaCatalogData(_objectSpread$g(_objectSpread$g({}, serieData[0]), {}, {
                 catalogData: catalogApiData
               }), serieNo, orderSet, state.api, itemsList, undefined, true, additionalModelInfos);
               return _context4.abrupt("return", catalogData);
@@ -21666,8 +21683,11 @@ var DivaCatalogHandler = /*#__PURE__*/function () {
 }();
 var catalogHandlerInstance = new DivaCatalogHandler();
 
-function ownKeys$h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$9(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$9(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray$9(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$9(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$9(r, a) : void 0; } }
+function _arrayLikeToArray$9(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var ArticleOptionStateData = /*#__PURE__*/function () {
   function ArticleOptionStateData(option, getIsConfigSingle, defaultOPV, useIsOptionDefinedWarning) {
     _classCallCheck__default["default"](this, ArticleOptionStateData);
@@ -21679,9 +21699,9 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
       name: '',
       origName: '',
       imageOPVs: {},
-      visibleOPVs: {},
+      visibleOPVs: new Map(),
       visibleOPVKeys: [],
-      visibleOPVsImages: {},
+      visibleOPVsImages: new Map(),
       favoriteOPVs: {},
       disabled: false,
       doShow: false,
@@ -21769,23 +21789,44 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
         return opv.codex;
       })) !== null && _this$articleOptionSt !== void 0 ? _this$articleOptionSt : [];
       var option = this.option;
-      for (var key in option.articleOptionValues) {
-        if (option.articleOptionValues[key].isOPVG) {
-          var _option$articleOption;
-          var opg = (_option$articleOption = option.articleOptionValues) === null || _option$articleOption === void 0 ? void 0 : _option$articleOption[key];
-          for (var opvCodex in (_opg$articleOptionVal = opg.articleOptionValues) !== null && _opg$articleOptionVal !== void 0 ? _opg$articleOptionVal : {}) {
+      var _iterator = _createForOfIteratorHelper$9(option.articleOptionValues),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = _slicedToArray__default["default"](_step.value, 2),
+            key = _step$value[0],
+            value = _step$value[1];
+          if (value.isOPVG) {
             var _opg$articleOptionVal;
-            var found = opvKeys.includes(opvCodex);
-            if (found) {
-              values.push(opg.articleOptionValues[opvCodex]);
+            var opg = value;
+            var _iterator2 = _createForOfIteratorHelper$9((_opg$articleOptionVal = opg.articleOptionValues) !== null && _opg$articleOptionVal !== void 0 ? _opg$articleOptionVal : new Map()),
+              _step2;
+            try {
+              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                var _step2$value = _slicedToArray__default["default"](_step2.value, 2),
+                  opvCodex = _step2$value[0],
+                  opvValue = _step2$value[1];
+                var found = opvKeys.includes(opvCodex);
+                if (found) {
+                  values.push(opvValue);
+                }
+              }
+            } catch (err) {
+              _iterator2.e(err);
+            } finally {
+              _iterator2.f();
+            }
+          } else {
+            var _found = opvKeys.includes(key);
+            if (_found) {
+              values.push(value);
             }
-          }
-        } else {
-          var _found = opvKeys.includes(key);
-          if (_found) {
-            values.push(option.articleOptionValues[key]);
           }
         }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
       return values;
     }
@@ -21896,7 +21937,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "updateVisibleOptionValues",
     value: function updateVisibleOptionValues(visibleOPVs) {
       this.articleOptionState.visibleOPVs = visibleOPVs;
-      this.articleOptionState.visibleOPVKeys = Object.keys(visibleOPVs);
+      this.articleOptionState.visibleOPVKeys = Array.from(visibleOPVs.keys());
     }
   }, {
     key: "visibleOPVKeys",
@@ -21906,19 +21947,19 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
   }, {
     key: "getVisibleOptionValue",
     value: function getVisibleOptionValue(codex) {
-      var searchValues = Object.values(this.visibleOptionValues);
+      var searchValues = Array.from(this.visibleOptionValues.values());
       if (this.option.hasOPG) {
         var opgs = searchValues;
         for (var i = 0; i < opgs.length; i++) {
-          var _opgs$i$articleOption;
-          var valuesInOpg = Object.values((_opgs$i$articleOption = opgs[i].articleOptionValues) !== null && _opgs$i$articleOption !== void 0 ? _opgs$i$articleOption : {});
+          var _opgs$i$articleOption, _opgs$i$articleOption2;
+          var valuesInOpg = Array.from((_opgs$i$articleOption = (_opgs$i$articleOption2 = opgs[i].articleOptionValues) === null || _opgs$i$articleOption2 === void 0 ? void 0 : _opgs$i$articleOption2.values()) !== null && _opgs$i$articleOption !== void 0 ? _opgs$i$articleOption : []);
           var found = valuesInOpg.find(function (opv) {
             return opv.codex == codex || opv.ocd === codex;
           });
           if (found) return found;
         }
       } else {
-        var visibleValues = Object.values(this.visibleOptionValues);
+        var visibleValues = Array.from(this.visibleOptionValues.values());
         var _found2 = visibleValues.find(function (opv) {
           return opv.codex == codex || opv.ocd === codex;
         });
@@ -21935,9 +21976,9 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "editVisibleOPVsImages",
     value: function editVisibleOPVsImages(codex, image) {
       if (image) {
-        this.visibleOPVsImages[codex] = image;
+        this.visibleOPVsImages.set(codex, image);
       } else {
-        delete this.visibleOPVsImages[codex];
+        this.visibleOPVsImages["delete"](codex);
       }
     }
   }, {
@@ -21948,7 +21989,7 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
       if (this.option.hasOPG) {
         return this.visibleOPVKeys.reduce(function (acc, key) {
           var _this$visibleOptionVa, _this$visibleOptionVa2, _this$visibleOptionVa3;
-          return acc + ((_this$visibleOptionVa = _this.visibleOptionValues[key]) !== null && _this$visibleOptionVa !== void 0 && _this$visibleOptionVa.isOPVG ? Object.keys((_this$visibleOptionVa2 = (_this$visibleOptionVa3 = _this.visibleOptionValues[key]) === null || _this$visibleOptionVa3 === void 0 ? void 0 : _this$visibleOptionVa3.articleOptionValues) !== null && _this$visibleOptionVa2 !== void 0 ? _this$visibleOptionVa2 : {}).length : 1);
+          return acc + ((_this$visibleOptionVa = _this.visibleOptionValues.get(key)) !== null && _this$visibleOptionVa !== void 0 && _this$visibleOptionVa.isOPVG ? (_this$visibleOptionVa2 = (_this$visibleOptionVa3 = _this.visibleOptionValues.get(key)) === null || _this$visibleOptionVa3 === void 0 || (_this$visibleOptionVa3 = _this$visibleOptionVa3.articleOptionValues) === null || _this$visibleOptionVa3 === void 0 ? void 0 : _this$visibleOptionVa3.size) !== null && _this$visibleOptionVa2 !== void 0 ? _this$visibleOptionVa2 : 0 : 1);
         }, 0);
       }
       return this.visibleOPVKeys.length;
@@ -22224,13 +22265,23 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     get: function get() {
       if (!this.option.onlyVisibleIfNotDocked) return undefined;
       var ret = {};
-      for (var key in this.visibleOptionValues) {
-        var dockingPoints = this.visibleOptionValues[key].onlyVisibleIfNotDocked;
-        if (dockingPoints) {
-          ret[key] = dockingPoints.split(';');
-        } else {
-          ret[key] = [];
+      var _iterator3 = _createForOfIteratorHelper$9(this.visibleOptionValues.keys()),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _this$visibleOptionVa4;
+          var key = _step3.value;
+          var dockingPoints = (_this$visibleOptionVa4 = this.visibleOptionValues.get(key)) === null || _this$visibleOptionVa4 === void 0 ? void 0 : _this$visibleOptionVa4.onlyVisibleIfNotDocked;
+          if (dockingPoints) {
+            ret[key] = dockingPoints.split(';');
+          } else {
+            ret[key] = [];
+          }
         }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
       }
       return Object.entries(ret).length ? ret : undefined;
     }
@@ -22370,19 +22421,17 @@ var ArticleOptionStateData = /*#__PURE__*/function () {
     key: "cloneOptionState",
     value: function cloneOptionState(getIsConfigSingle) {
       var clonedOps = new ArticleOptionStateData(this.option, getIsConfigSingle);
-      clonedOps.articleOptionState = _objectSpread$h(_objectSpread$h({}, this.articleOptionState), {}, {
-        imageOPVs: _objectSpread$h({}, this.articleOptionState.imageOPVs),
-        visibleOPVs: _objectSpread$h({}, this.articleOptionState.visibleOPVs),
-        visibleOPVsImages: _objectSpread$h({}, this.articleOptionState.visibleOPVsImages),
-        favoriteOPVs: _objectSpread$h({}, this.articleOptionState.favoriteOPVs)
+      clonedOps.articleOptionState = _objectSpread$f(_objectSpread$f({}, this.articleOptionState), {}, {
+        imageOPVs: _objectSpread$f({}, this.articleOptionState.imageOPVs),
+        visibleOPVs: new Map(this.articleOptionState.visibleOPVs),
+        visibleOPVsImages: new Map(this.articleOptionState.visibleOPVsImages),
+        favoriteOPVs: _objectSpread$f({}, this.articleOptionState.favoriteOPVs)
       });
       return clonedOps;
     }
   }]);
 }();
 
-function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$8(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$8(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$8(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$8(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$8(r, a) : void 0; } }
 function _arrayLikeToArray$8(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -22404,7 +22453,7 @@ var DivaEngine = /*#__PURE__*/function () {
       var maxPriceOfGroup = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
       var maxPriceOfGroupCodex = ['', '', '', '', '', '', '', '', '', ''];
       var previousVaraintValues = this.article.VariantValues;
-      var _iterator = _createForOfIteratorHelper$8(this.article.articleOptionStates),
+      var _iterator = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -22419,48 +22468,79 @@ var DivaEngine = /*#__PURE__*/function () {
 
           var foundFirstItem = false;
           var setDefaultOPV = ops.defaultOPV;
-          ops.updateVisibleOptionValues({});
-          var visibleOptionValues = {};
+          ops.updateVisibleOptionValues(new Map());
+          var visibleOptionValues = new Map();
           if (myOpt.hasOPG) {
             var myOPGs = myOpt.articleOptionValues;
-            for (var lKey in myOPGs) {
-              var myOPVsInOPG = myOPGs[lKey].articleOptionValues;
-              if (this.checkItemVisibility(myOPGs[lKey], ops) && myOPVsInOPG) {
-                visibleOptionValues[myOPGs[lKey].codex] = myOPGs[lKey];
-                for (var opvCodex in myOPVsInOPG) {
-                  var tmpOPV = myOPVsInOPG[opvCodex];
-                  if (tmpOPV.hiddenByMask) continue;
-                  visibleItems[OP + '#' + opvCodex] = tmpOPV;
-                  if (!ops.getConstructionRulesIsDisablingByOPVCodex(opvCodex)) {
-                    if (setDefaultOPV && setDefaultOPV == opvCodex) {
-                      firstVisibleItem = tmpOPV;
-                      foundFirstItem = true;
-                    } else if (!foundFirstItem) {
-                      firstVisibleItem = tmpOPV;
-                      foundFirstItem = true;
+            var _iterator2 = _createForOfIteratorHelper$8(myOPGs),
+              _step2;
+            try {
+              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                var _step2$value = _slicedToArray__default["default"](_step2.value, 2),
+                  lKey = _step2$value[0],
+                  value = _step2$value[1];
+                var myOPVsInOPG = value.articleOptionValues;
+                if (this.checkItemVisibility(value, ops) && myOPVsInOPG) {
+                  visibleOptionValues.set(value.codex, value);
+                  var _iterator3 = _createForOfIteratorHelper$8(myOPVsInOPG),
+                    _step3;
+                  try {
+                    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                      var _step3$value = _slicedToArray__default["default"](_step3.value, 2),
+                        opvCodex = _step3$value[0],
+                        tmpOPV = _step3$value[1];
+                      if (tmpOPV.hiddenByMask) continue;
+                      visibleItems[OP + '#' + opvCodex] = tmpOPV;
+                      if (!ops.getConstructionRulesIsDisablingByOPVCodex(opvCodex)) {
+                        if (setDefaultOPV && setDefaultOPV == opvCodex) {
+                          firstVisibleItem = tmpOPV;
+                          foundFirstItem = true;
+                        } else if (!foundFirstItem) {
+                          firstVisibleItem = tmpOPV;
+                          foundFirstItem = true;
+                        }
+                      }
                     }
+                  } catch (err) {
+                    _iterator3.e(err);
+                  } finally {
+                    _iterator3.f();
                   }
                 }
               }
+            } catch (err) {
+              _iterator2.e(err);
+            } finally {
+              _iterator2.f();
             }
           } else {
             var myOPVs = myOpt.articleOptionValues;
             if (myOPVs) {
-              for (var opvCodex in myOPVs) {
-                var tmpOPV = myOPVs[opvCodex];
-                if (!tmpOPV.hiddenByMask && this.checkItemVisibility(tmpOPV, ops)) {
-                  visibleOptionValues[tmpOPV.codex] = tmpOPV;
-                  visibleItems[OP + '#' + opvCodex] = tmpOPV;
-                  if (!ops.getConstructionRulesIsDisablingByOPVCodex(opvCodex)) {
-                    if (setDefaultOPV && setDefaultOPV == opvCodex) {
-                      firstVisibleItem = tmpOPV;
-                      foundFirstItem = true;
-                    } else if (!foundFirstItem) {
-                      firstVisibleItem = tmpOPV;
-                      foundFirstItem = true;
+              var _iterator4 = _createForOfIteratorHelper$8(myOPVs),
+                _step4;
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  var _step4$value = _slicedToArray__default["default"](_step4.value, 2),
+                    _opvCodex = _step4$value[0],
+                    _tmpOPV = _step4$value[1];
+                  if (!_tmpOPV.hiddenByMask && this.checkItemVisibility(_tmpOPV, ops)) {
+                    visibleOptionValues.set(_tmpOPV.codex, _tmpOPV);
+                    visibleItems[OP + '#' + _opvCodex] = _tmpOPV;
+                    if (!ops.getConstructionRulesIsDisablingByOPVCodex(_opvCodex)) {
+                      if (setDefaultOPV && setDefaultOPV == _opvCodex) {
+                        firstVisibleItem = _tmpOPV;
+                        foundFirstItem = true;
+                      } else if (!foundFirstItem) {
+                        firstVisibleItem = _tmpOPV;
+                        foundFirstItem = true;
+                      }
                     }
                   }
                 }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
               }
             }
           }
@@ -22503,7 +22583,7 @@ var DivaEngine = /*#__PURE__*/function () {
                     if (_ops !== null && _ops !== void 0 && _ops.valCodex) {
                       var foundItem = _this.article.checkOptionAndOptionValue(_ops.optionCodex, _ops.valCodex);
                       if ((foundItem === null || foundItem === void 0 ? void 0 : foundItem.opv) instanceof ArticleOptionValueData) {
-                        if (_ops.visibleOptionValues[foundItem.opv.codex] || _ops.visibleOptionValues[foundItem.opv.parentCodex]) {
+                        if (_ops.visibleOptionValues.get(foundItem.opv.codex) || _ops.visibleOptionValues.get(foundItem.opv.parentCodex)) {
                           myItem = foundItem.opv;
                         }
                       }
@@ -22518,8 +22598,8 @@ var DivaEngine = /*#__PURE__*/function () {
             //sonst myItem aus default sibling option versuchen zu verwenden
             if (myItem == null && ops.option.isDefaultSiblingOption) {
               var siblingsPreviousOpv = previousVaraintValues['OPT' + ops.option.isDefaultSiblingOption];
-              if (siblingsPreviousOpv && ops.visibleOptionValues[siblingsPreviousOpv]) {
-                myItem = ops.visibleOptionValues[siblingsPreviousOpv];
+              if (siblingsPreviousOpv && ops.visibleOptionValues.get(siblingsPreviousOpv)) {
+                myItem = ops.visibleOptionValues.get(siblingsPreviousOpv);
               }
             }
             if (myItem == null && !ops.defaultOPV) {
@@ -22602,8 +22682,19 @@ var DivaEngine = /*#__PURE__*/function () {
         //R (Anschlusstyp R) - AVR
         var newAVRFilter = [],
           visibleOPVs = ops.visibleOptionValues;
-        for (var key in visibleOPVs) {
-          newAVRFilter.push(visibleOPVs[key].codex.substring(3));
+        var _iterator5 = _createForOfIteratorHelper$8(visibleOPVs),
+          _step5;
+        try {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var _step5$value = _slicedToArray__default["default"](_step5.value, 2),
+              key = _step5$value[0],
+              value = _step5$value[1];
+            newAVRFilter.push(value.codex.substring(3));
+          }
+        } catch (err) {
+          _iterator5.e(err);
+        } finally {
+          _iterator5.f();
         }
         this.article.newPossibleAVRFilters = newAVRFilter;
       }
@@ -22611,8 +22702,19 @@ var DivaEngine = /*#__PURE__*/function () {
         //L (Anschlusstyp L) - AVL
         var newAVLFilter = [],
           _visibleOPVs = ops.visibleOptionValues;
-        for (var key in _visibleOPVs) {
-          newAVLFilter.push(_visibleOPVs[key].codex.substring(3));
+        var _iterator6 = _createForOfIteratorHelper$8(_visibleOPVs),
+          _step6;
+        try {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var _step6$value = _slicedToArray__default["default"](_step6.value, 2),
+              _key = _step6$value[0],
+              _value = _step6$value[1];
+            newAVLFilter.push(_value.codex.substring(3));
+          }
+        } catch (err) {
+          _iterator6.e(err);
+        } finally {
+          _iterator6.f();
         }
         this.article.newPossibleAVLFilters = newAVLFilter;
       }
@@ -22831,18 +22933,18 @@ var DivaEngine = /*#__PURE__*/function () {
         myDecisions[i].disableHistory = [];
         myDecisions[i].activeCombination = undefined;
       }
-      var _iterator2 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step2;
+      var _iterator7 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step7;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var ops = _step2.value;
-          ops.updateVisibleOptionValues(_objectSpread$g({}, ops.option.articleOptionValues));
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var ops = _step7.value;
+          ops.updateVisibleOptionValues(ops.option.articleOptionValues);
           ops.definedBySetFeatureFixed = false;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator2.f();
+        _iterator7.f();
       }
       this.decisionDebugStack = [];
       var beforeSnapshot = this.article.set.logDecisions ? this.article.snapshot : undefined;
@@ -22970,18 +23072,18 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator3 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step3;
+      var _iterator8 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step8;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var ops = _step3.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var ops = _step8.value;
           //when an option has no decisions the first visible optionValue has to be selected per default
           if (ops.val === undefined && ops.visibleCount && !this.article.CatalogData.useDiomexConfigLogic) {
             this.assignOptionValue(ops.optionCodex, ops.visibleOPVKeys[0]);
           }
           if (ops.visibleCount && ops.IsIDMSpecialFeature) {
             var _validOpv;
-            var validOpvs = Object.values(ops.visibleOptionValues);
+            var validOpvs = Array.from(ops.visibleOptionValues.values());
             if (ops.val) validOpvs.unshift(ops.val);
             var validOpv = undefined;
             for (var i = 0; i < validOpvs.length; i++) {
@@ -22995,9 +23097,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator3.f();
+        _iterator8.f();
       }
     }
   }, {
@@ -23160,201 +23262,219 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "evalType1Decision",
     value: function evalType1Decision(myDecision) {
+      var _this2 = this;
       var validOPVs = {};
       var doAlsoCheckOPTs = [];
-      if (myDecision.Options && myDecision.DOC) for (var p = 0; p < myDecision.Options.length; p++) {
-        var OPT = myDecision.Options[p];
-        var ops = this.article.getArticleOptionStateFlat(OPT);
-        if (!ops) break;
-        if (!validOPVs[OPT]) validOPVs[OPT] = {};
-        var possibleOPVs = ops.visibleOptionValues;
-        //welche Optionen sind auch zu prüfen?
+      if (myDecision.Options && myDecision.DOC) {
+        var _loop2 = function _loop2() {
+          var OPT = myDecision.Options[p];
+          var ops = _this2.article.getArticleOptionStateFlat(OPT);
+          if (!ops) return 1; // break
+          if (!validOPVs[OPT]) validOPVs[OPT] = new Map();
+          var possibleOPVs = new Map(ops.visibleOptionValues);
+          //welche Optionen sind auch zu prüfen?
 
-        for (var j = 0; j < myDecision.DOC.length; j++) {
-          //DecisionOptionCombination
-          //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
+          for (var j = 0; j < myDecision.DOC.length; j++) {
+            //DecisionOptionCombination
+            //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
 
-          var doUseDoc = true;
-          var myDoc = myDecision.DOC[j];
-          if (doAlsoCheckOPTs.length > 0) {
-            for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
+            var myDoc = myDecision.DOC[j];
+            var doUseDoc = _this2.checkIfDocIsValid(myDoc, doAlsoCheckOPTs);
+            if (doUseDoc) {
               var _myDoc$Row;
-              var checkOptX = doAlsoCheckOPTs[f];
-              var _ops3 = this.article.getArticleOptionState(checkOptX);
-              if (_ops3 && (_myDoc$Row = myDoc.Row) !== null && _myDoc$Row !== void 0 && _myDoc$Row[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
-                if (!myDoc.Row[checkOptX].find(function (o) {
-                  return !o.startsWith('!');
-                })) {
-                  //all is inverted
-                  if (myDoc.Row[checkOptX].includes('!' + _ops3.valCodex)) {
-                    doUseDoc = false;
-                    break;
-                  }
-                } else {
-                  doUseDoc = false;
-                  break;
-                }
-              }
-            }
-          }
-          if (doUseDoc) {
-            var _myDoc$Row2;
-            myDecision.activeCombination = j;
-            if ((_myDoc$Row2 = myDoc.Row) !== null && _myDoc$Row2 !== void 0 && _myDoc$Row2[OPT]) {
-              var ruleWasValidOnce = false;
-              for (var m = 0; m < myDoc.Row[OPT].length; m++) {
-                var opvCodex = myDoc.Row[OPT][m];
-                if (opvCodex.startsWith('!')) {
-                  //this should only delete the value when all the following options match the values
-                  //https://app.asana.com/0/search?q=nin&child=1203078926793962
-                  //https://app.asana.com/0/1203759050701666/1203780404115819
-
-                  var ruleValid = true;
-                  var _loop2 = function _loop2() {
-                      if (key === OPT) return 0; // continue
+              myDecision.activeCombination = j;
+              if ((_myDoc$Row = myDoc.Row) !== null && _myDoc$Row !== void 0 && _myDoc$Row[OPT]) {
+                var ruleWasValidOnce = false;
+                for (var m = 0; m < myDoc.Row[OPT].length; m++) {
+                  var opvCodex = myDoc.Row[OPT][m];
+                  if (opvCodex.startsWith('!')) {
+                    //this should only delete the value when all the following options match the values
+                    //https://app.asana.com/0/search?q=nin&child=1203078926793962
+                    //https://app.asana.com/0/1203759050701666/1203780404115819
 
-                      // Cache the row values array
-                      var rowValues = myDoc.Row[key];
+                    var ruleValid = true;
+                    for (var key in myDoc.Row) {
+                      if (key === OPT) continue;
 
-                      // Use some() to break early when match found
-                      var hasMatch = ops.visibleOPVKeys.some(function (opv) {
-                        return rowValues.includes(opv);
+                      // Converting array to Set is O(n) but only done once. Then each lookup is O(1) instead of O(n) for includes() (total O(n))
+                      var rowValuesSet = new Set(myDoc.Row[key]);
+                      var hasMatch = _toConsumableArray__default["default"](rowValuesSet).some(function (v) {
+                        return ops.visibleOptionValues.has(v);
                       });
                       if (!hasMatch) {
                         ruleValid = false;
-                        return 1; // break
+                        break;
                       }
-                    },
-                    _ret;
-                  for (var key in myDoc.Row) {
-                    _ret = _loop2();
-                    if (_ret === 0) continue;
-                    if (_ret === 1) break;
-                  }
-                  if (ruleValid) {
+                    }
+                    if (ruleValid) {
+                      ruleWasValidOnce = true;
+                      if (m == 0) validOPVs[OPT] = new Map(possibleOPVs);
+                      opvCodex = opvCodex.slice(1);
+                      if (possibleOPVs.get(opvCodex)) validOPVs[OPT]["delete"](opvCodex);
+                    }
+                  } else {
                     ruleWasValidOnce = true;
-                    if (m == 0) validOPVs[OPT] = _objectSpread$g({}, possibleOPVs);
-                    opvCodex = opvCodex.slice(1);
-                    if (possibleOPVs[opvCodex] != null) delete validOPVs[OPT][opvCodex];
+                    var opv = possibleOPVs.get(opvCodex);
+                    if (opv) validOPVs[OPT].set(opvCodex, opv);
                   }
-                } else {
-                  ruleWasValidOnce = true;
-                  if (possibleOPVs[opvCodex] != null) validOPVs[OPT][opvCodex] = possibleOPVs[opvCodex];
                 }
-              }
-              if (!ruleWasValidOnce) {
-                //add the rest
-                if (myDoc.Row[OPT][0].includes('!')) {
-                  for (var opv in ops.visibleOptionValues) {
-                    var doesNotExists = myDoc.Row[OPT].includes('!' + opv);
-                    if (!doesNotExists) validOPVs[OPT][opv] = ops.visibleOptionValues[opv];
+                if (!ruleWasValidOnce) {
+                  //add the rest
+                  if (myDoc.Row[OPT][0].includes('!')) {
+                    var negatedValues = new Set(myDoc.Row[OPT].map(function (v) {
+                      return v.slice(1);
+                    })); // remove the '!' from the value
+                    var _iterator9 = _createForOfIteratorHelper$8(ops.visibleOptionValues),
+                      _step9;
+                    try {
+                      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                        var _step9$value = _slicedToArray__default["default"](_step9.value, 2),
+                          opvKey = _step9$value[0],
+                          _opv = _step9$value[1];
+                        if (!negatedValues.has(opvKey)) {
+                          validOPVs[OPT].set(opvKey, _opv);
+                        }
+                      }
+                    } catch (err) {
+                      _iterator9.e(err);
+                    } finally {
+                      _iterator9.f();
+                    }
+                  } else {
+                    validOPVs[OPT] = new Map(ops.visibleOptionValues);
                   }
-                } else {
-                  validOPVs[OPT] = Object.assign({}, ops.visibleOptionValues);
                 }
+              } else {
+                validOPVs[OPT] = possibleOPVs;
               }
-            } else {
-              validOPVs[OPT] = possibleOPVs;
             }
           }
-        }
-        var schnittmenge = {};
-        for (var _key in possibleOPVs) {
-          if (validOPVs[OPT][_key]) {
-            schnittmenge[_key] = possibleOPVs[_key];
+          var schnittmenge = new Map(Array.from(possibleOPVs).filter(function (_ref2) {
+            var _ref3 = _slicedToArray__default["default"](_ref2, 1),
+              key = _ref3[0];
+            return validOPVs[OPT].has(key);
+          }));
+          ops.updateVisibleOptionValues(new Map(schnittmenge));
+          var valCodex = ops.valCodex;
+          if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
+            if (_this2.article.CatalogData.useDiomexConfigLogic) {
+              _this2.clearOP(OPT, true);
+            } else {
+              _this2.updateArtOPV(_this2.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+            }
           }
+          doAlsoCheckOPTs.push(OPT);
+          //Hier führende Optionen prüfen
+        };
+        for (var p = 0; p < myDecision.Options.length; p++) {
+          if (_loop2()) break;
         }
-        ops.updateVisibleOptionValues(_objectSpread$g({}, schnittmenge));
-        var valCodex = ops.valCodex;
-        if ((!valCodex || !schnittmenge[valCodex]) && ops.visibleOPVKeys.length > 0) {
-          if (this.article.CatalogData.useDiomexConfigLogic) {
-            this.clearOP(OPT, true);
+      }
+    }
+  }, {
+    key: "checkIfDocIsValid",
+    value: function checkIfDocIsValid(myDoc, doAlsoCheckOPTs) {
+      if (doAlsoCheckOPTs.length === 0) return true;
+      for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
+        var _myDoc$Row2;
+        var checkOptX = doAlsoCheckOPTs[f];
+        var ops = this.article.getArticleOptionState(checkOptX);
+        if (ops && (_myDoc$Row2 = myDoc.Row) !== null && _myDoc$Row2 !== void 0 && _myDoc$Row2[checkOptX] && ops.valCodex && !myDoc.Row[checkOptX].includes(ops.valCodex)) {
+          if (!myDoc.Row[checkOptX].find(function (o) {
+            return !o.startsWith('!');
+          })) {
+            //all is inverted
+            if (myDoc.Row[checkOptX].includes('!' + ops.valCodex)) {
+              return false;
+            }
           } else {
-            this.updateArtOPV(this.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+            return false;
           }
         }
-        doAlsoCheckOPTs.push(OPT);
-        //Hier führende Optionen prüfen
       }
+      return true;
     }
   }, {
     key: "evalType0Decision",
     value: function evalType0Decision(myDecision) {
+      var _this3 = this;
       var invalidOPVs = {},
         doAlsoCheckOPTs = [];
-      if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) for (var p = 0; p < myDecision.Options.length; p++) {
-        var OPT = myDecision.Options[p];
-        var ops = this.article.getArticleOptionStateFlat(OPT);
-        if (!ops) break;
-        if (!invalidOPVs[OPT]) invalidOPVs[OPT] = {};
-        var possibleOPVs = ops.visibleOptionValues;
-        //Erste Option ist immer eine Bedingung!
-        if (p === myDecision.Options.length - 1 && myDecision.DOC) {
-          for (var j = 0; j < myDecision.DOC.length; j++) {
-            //DecisionOptionCombination
-            //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
-            // z.B. bei OPT2 muss OPT1 stimmen
-            // und bei OPT3 muss OPT1 und OPT2 stimmen
-            var doUseDoc = true,
-              myDoc = myDecision.DOC[j];
-            if (doAlsoCheckOPTs.length > 0) {
-              for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
-                var _myDoc$Row3;
-                var checkOptX = doAlsoCheckOPTs[f];
-                var _ops4 = this.article.getArticleOptionState(checkOptX);
-                if (_ops4 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops4.valCodex && !myDoc.Row[checkOptX].includes(_ops4.valCodex)) {
-                  doUseDoc = false;
-                  break;
+      if (myDecision.Options && myDecision.Options.length > 1 && myDecision.DOC) {
+        var _loop3 = function _loop3() {
+          var OPT = myDecision.Options[p];
+          var ops = _this3.article.getArticleOptionStateFlat(OPT);
+          if (!ops) return 1; // break
+          if (!invalidOPVs[OPT]) invalidOPVs[OPT] = new Map();
+          var possibleOPVs = ops.visibleOptionValues;
+          //Erste Option ist immer eine Bedingung!
+          if (p === myDecision.Options.length - 1 && myDecision.DOC) {
+            for (var j = 0; j < myDecision.DOC.length; j++) {
+              //DecisionOptionCombination
+              //wenn diese Row mehrere Optionen hat, dann müssen die bisher gesetzten schon übereinstimmen
+              // z.B. bei OPT2 muss OPT1 stimmen
+              // und bei OPT3 muss OPT1 und OPT2 stimmen
+              var doUseDoc = true,
+                myDoc = myDecision.DOC[j];
+              if (doAlsoCheckOPTs.length > 0) {
+                for (var f = 0; f < doAlsoCheckOPTs.length; f++) {
+                  var _myDoc$Row3;
+                  var checkOptX = doAlsoCheckOPTs[f];
+                  var _ops3 = _this3.article.getArticleOptionState(checkOptX);
+                  if (_ops3 && (_myDoc$Row3 = myDoc.Row) !== null && _myDoc$Row3 !== void 0 && _myDoc$Row3[checkOptX] && _ops3.valCodex && !myDoc.Row[checkOptX].includes(_ops3.valCodex)) {
+                    doUseDoc = false;
+                    break;
+                  }
                 }
               }
-            }
-            if (doUseDoc && myDoc.Row) {
-              myDecision.activeCombination = j;
-              if (myDoc.Row[OPT]) {
-                for (var m = 0; m < myDoc.Row[OPT].length; m++) {
-                  var opvCodex = myDoc.Row[OPT][m];
-                  var myOPVData = possibleOPVs[opvCodex];
-                  if (myOPVData != null) {
-                    invalidOPVs[OPT][opvCodex] = myOPVData; //wenn es eine DecisionType 0 ist muss ich diese OPV von den gültigen entfernen
+              if (doUseDoc && myDoc.Row) {
+                myDecision.activeCombination = j;
+                if (myDoc.Row[OPT]) {
+                  for (var m = 0; m < myDoc.Row[OPT].length; m++) {
+                    var opvCodex = myDoc.Row[OPT][m];
+                    var myOPVData = possibleOPVs.get(opvCodex);
+                    if (myOPVData != null) {
+                      invalidOPVs[OPT].set(opvCodex, myOPVData); //wenn es eine DecisionType 0 ist muss ich diese OPV von den gültigen entfernen
+                    }
                   }
                 }
               }
             }
-          }
-          var schnittmenge = {};
-          for (var key in possibleOPVs) {
-            if (!invalidOPVs[OPT][key]) {
-              schnittmenge[key] = possibleOPVs[key];
-            }
-          }
-          // someDecisionExistsForOption = true;
-
-          ops.updateVisibleOptionValues(_objectSpread$g({}, schnittmenge));
-          var valCodex = ops.valCodex;
-          if ((!valCodex || !schnittmenge[valCodex]) && ops.visibleOPVKeys.length > 0) {
-            if (this.article.CatalogData.useDiomexConfigLogic) {
-              this.clearOP(OPT, true);
-            } else {
-              this.updateArtOPV(this.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+            var schnittmenge = new Map(Array.from(possibleOPVs).filter(function (_ref4) {
+              var _ref5 = _slicedToArray__default["default"](_ref4, 1),
+                key = _ref5[0];
+              return !invalidOPVs[OPT].has(key);
+            }));
+            ops.updateVisibleOptionValues(schnittmenge);
+            var valCodex = ops.valCodex;
+            if ((!valCodex || !schnittmenge.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
+              if (_this3.article.CatalogData.useDiomexConfigLogic) {
+                _this3.clearOP(OPT, true);
+              } else {
+                _this3.updateArtOPV(_this3.article.getDefaultOpv(schnittmenge), OPT, ops, undefined);
+              }
             }
+          } else if (p < myDecision.Options.length - 1) {
+            doAlsoCheckOPTs.push(OPT);
           }
-        } else if (p < myDecision.Options.length - 1) {
-          doAlsoCheckOPTs.push(OPT);
+        };
+        for (var p = 0; p < myDecision.Options.length; p++) {
+          if (_loop3()) break;
         }
       }
     }
   }, {
     key: "evalShowOnlyWhenHasPrice",
     value: function evalShowOnlyWhenHasPrice() {
-      var _iterator4 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step4;
+      var _iterator10 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step10;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var ops = _step4.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var ops = _step10.value;
           for (var jKey in ops.visibleOptionValues) {
-            var opv = ops.visibleOptionValues[jKey];
+            var opv = ops.visibleOptionValues.get(jKey);
             if (opv.showOnlyWhenHasPrice && opv.price == 0) {
-              delete ops.visibleOptionValues[opv.codex];
+              ops.visibleOptionValues["delete"](opv.codex);
               if (ops.valCodex === opv.codex) {
                 this.assignOptionValue(ops.optionCodex, ops.visibleOPVKeys[0]);
               }
@@ -23362,9 +23482,9 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator4.f();
+        _iterator10.f();
       }
     }
 
@@ -23479,8 +23599,8 @@ var DivaEngine = /*#__PURE__*/function () {
         firstItem = null;
       if (this.article.getArticleOptionState(checkOPT)) {
         var ops = this.article.getArticleOptionState(checkOPT);
-        firstItem = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues[ops.visibleOPVKeys[0]]; //hole ersten eintrag für aus den Dictionary
-        if (checkOPV && ops !== null && ops !== void 0 && ops.visibleOptionValues[checkOPV]) foundItem = ops.visibleOptionValues[checkOPV];
+        firstItem = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues.get(ops.visibleOPVKeys[0]); //hole ersten eintrag für aus den Dictionary
+        if (checkOPV && ops !== null && ops !== void 0 && ops.visibleOptionValues.get(checkOPV)) foundItem = ops.visibleOptionValues.get(checkOPV);
       }
       return {
         foundItem: foundItem,
@@ -23606,20 +23726,20 @@ var DivaEngine = /*#__PURE__*/function () {
     key: "addPartilstToPartlistArticlesToLoad",
     value: function addPartilstToPartlistArticlesToLoad(myPartListPos, partlistArticlesToLoad, partlistGroup, newConfigValues, myDecisionVal, groupDecisionVal, decisionNumber) {
       var _myPartListPos$Option,
-        _this2 = this;
+        _this4 = this;
       var allDecisions = this.article.catalogArticle.articleDecisions;
       var decisions = myPartListPos.PartListPosDecisionsAndPosCounts;
       var optionsForPrint = (_myPartListPos$Option = myPartListPos.OptionsForPrint) === null || _myPartListPos$Option === void 0 ? void 0 : _myPartListPos$Option.split(';');
       var optionImgForPrint = myPartListPos.OptionImgForPrint ? 'OPT' + myPartListPos.OptionImgForPrint : undefined;
-      var _loop3 = function _loop3() {
+      var _loop4 = function _loop4() {
         var myRuleDesc = '';
         var myRuleDesc_locales = undefined;
         var articleCodex = myPartListPos.ItemRefArticles[d].ArticleCodex;
         var catalogCodex = myPartListPos.ItemRefArticles[d].CatalogCodex;
         var retailArticleNr = myPartListPos.RetailArticleNr && myPartListPos.RetailArticleNr != '' ? myPartListPos.RetailArticleNr : undefined;
-        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this2.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
-          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this2.article.articleOptionStates, _this2.article.set.api.ruleDescSeperator());
-          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this2.article.articleOptionStates, _this2.article.set.api.ruleDescSeperator());
+        if (myDecisionVal && (myDecisionVal.Rule && myDecisionVal.Rule != '' && _this4.article.CatalogData.doUseRuleDescForPartListArticles() || myPartListPos.RetailArticleNr == 'CUST')) {
+          myRuleDesc = DivaUtils__default["default"].getRuleDescription(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
+          myRuleDesc_locales = DivaUtils__default["default"].getRuleDescription_locales(myDecisionVal.Rule, _this4.article.articleOptionStates, _this4.article.set.api.ruleDescSeperator());
         }
         var initDecisions = decisions.filter(function (decision) {
           return decision.RelationType !== 'PosCount';
@@ -23629,7 +23749,7 @@ var DivaEngine = /*#__PURE__*/function () {
           });
         });
         var quanitity = 1;
-        if (_this2.article.CatalogData.useDecisionPosCountValue) {
+        if (_this4.article.CatalogData.useDecisionPosCountValue) {
           var _decision$DOC;
           // get SetPosCountValue from decsion action if defined and else use myPartListPos.PosCountValue;
           var decision = decisionNumber ? allDecisions.find(function (d) {
@@ -23644,13 +23764,13 @@ var DivaEngine = /*#__PURE__*/function () {
             return a.SetPosCountValue !== undefined;
           })) === null || _decision$DOC === void 0 ? void 0 : _decision$DOC.SetPosCountValue;
           quanitity = setPosCountValue !== undefined ? setPosCountValue : myPartListPos.PosCountValue;
-        } else if (_this2.article.CatalogData.usePosCountValue) {
+        } else if (_this4.article.CatalogData.usePosCountValue) {
           quanitity = myPartListPos.PosCountValue;
         }
-        quanitity = quanitity * _this2.article.quantity;
-        var previousPartlistArticle = _this2.article.getPreviousPartlistArticle(articleCodex);
+        quanitity = quanitity * _this4.article.quantity;
+        var previousPartlistArticle = _this4.article.getPreviousPartlistArticle(articleCodex);
         var initDecisionsFiltered = [];
-        var _loop4 = function _loop4(i) {
+        var _loop5 = function _loop5(i) {
           if (initDecisions[i] && !initDecisionsFiltered.find(function (d) {
             return d.Number == initDecisions[i].Number;
           })) {
@@ -23658,18 +23778,18 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         };
         for (var i = 0; i < initDecisions.length; i++) {
-          _loop4(i);
+          _loop5(i);
         }
         if (quanitity >= 1) {
           var _myDecisionVal$Rule;
           partlistArticlesToLoad.push({
-            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this2.article.catalogCodex,
+            CatalogCodex: catalogCodex !== null && catalogCodex !== void 0 ? catalogCodex : _this4.article.catalogCodex,
             BasketID: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.basketId,
             ArticleCodex: articleCodex,
             RetailArticleNr: retailArticleNr,
             RetailPrefix: myPartListPos.RetailPrefix,
             Quantity: quanitity,
-            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this2.article.VariantValues) : undefined,
+            PartlistRule: (groupDecisionVal ? groupDecisionVal.Rule + ' && ' : '') + myDecisionVal ? DivaUtils__default["default"].getOptionValuePairsByRule((_myDecisionVal$Rule = myDecisionVal === null || myDecisionVal === void 0 ? void 0 : myDecisionVal.Rule) !== null && _myDecisionVal$Rule !== void 0 ? _myDecisionVal$Rule : '', _this4.article.VariantValues) : undefined,
             partlistDecisionNo: decisionNumber,
             SupplierOrderCodex: myPartListPos.SupplierOrderCodex,
             initDecisions: initDecisionsFiltered,
@@ -23678,7 +23798,7 @@ var DivaEngine = /*#__PURE__*/function () {
             RuleDesc_locales: myRuleDesc_locales,
             PosInvisibility: myPartListPos.PosInvisibility,
             ConfigurationMode: myPartListPos.ConfigurationMode,
-            VariantValues: _this2.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
+            VariantValues: _this4.article.variantValuesForPla(myPartListPos.ConfigurationMode, previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantValues, newConfigValues),
             VariantItemData: previousPartlistArticle === null || previousPartlistArticle === void 0 ? void 0 : previousPartlistArticle.VariantItemData,
             optionImgForPrint: optionImgForPrint,
             optionsForPrint: optionsForPrint
@@ -23687,7 +23807,7 @@ var DivaEngine = /*#__PURE__*/function () {
         }
       };
       for (var d = 0; d < myPartListPos.ItemRefArticles.length; d++) {
-        _loop3();
+        _loop4();
       }
       return partlistArticlesToLoad;
     }
@@ -23726,7 +23846,7 @@ var DivaEngine = /*#__PURE__*/function () {
   }, {
     key: "calcConfigPrice",
     value: function calcConfigPrice(maxPriceOfGroupCodex, digits) {
-      var _this3 = this,
+      var _this5 = this,
         _this$article$catalog4;
       //Wenn im Planer für dieses Shape mehere Rules gibt, müssen wir diese jetzt prüfen, ob jetzt ein anderes shape gültig ist.
       //wenn ja, hier neues shape übergeben
@@ -23759,12 +23879,12 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       //mengen und größenabhängige Preisberechungn.
-      var _iterator5 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step5;
+      var _iterator11 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step11;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
           var _ops$addToMeasure;
-          var ops = _step5.value;
+          var ops = _step11.value;
           var OP = ops.optionCodex;
           var mUnit = ops.measureUnit;
           var pUnit = ops.priceUnit;
@@ -23847,61 +23967,61 @@ var DivaEngine = /*#__PURE__*/function () {
         }
         //jetzt nochmal prozentuelle Preise mit TargetOption berechnen
       } catch (err) {
-        _iterator5.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator5.f();
+        _iterator11.f();
       }
-      var _iterator6 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step6;
+      var _iterator12 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step12;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _ops5 = _step6.value;
-          var targetPPGPrefixes = _ops5.targetPPGPrefixes;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _ops4 = _step12.value;
+          var targetPPGPrefixes = _ops4.targetPPGPrefixes;
           if (!targetPPGPrefixes) continue;
-          var _loop6 = function _loop6() {
+          var _loop7 = function _loop7() {
             var targetPrefix = targetPPGPrefixes[_i6];
-            var priceRef = _this3.article.priceRefs.find(function (item) {
+            var priceRef = _this5.article.priceRefs.find(function (item) {
               var _item$PPG;
               return ((_item$PPG = item.PPG) === null || _item$PPG === void 0 ? void 0 : _item$PPG.split('_')[0]) == targetPrefix;
             });
             if (priceRef) {
-              if (_ops5.isPercentage) {
-                priceRef.calcPrice = priceRef.Price * (1 + _ops5.calcPrice);
+              if (_ops4.isPercentage) {
+                priceRef.calcPrice = priceRef.Price * (1 + _ops4.calcPrice);
               }
             }
           };
           for (var _i6 = 0; _i6 < targetPPGPrefixes.length; _i6++) {
-            _loop6();
+            _loop7();
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator6.f();
+        _iterator12.f();
       }
       for (var _i3 = 0; _i3 < this.article.priceRefs.length; _i3++) {
         var basePriceRef = this.article.priceRefs[_i3];
         if (!basePriceRef.TargetPPGPrefixes) continue;
-        var _loop5 = function _loop5() {
+        var _loop6 = function _loop6() {
           var targetPrefix = basePriceRef.TargetPPGPrefixes[_j];
           var myArtOpv;
-          var priceRef = _this3.article.priceRefs.find(function (item) {
+          var priceRef = _this5.article.priceRefs.find(function (item) {
             return item.PPG && item.PPG.split('_')[0] == targetPrefix;
           });
           if (!priceRef) {
-            var _iterator7 = _createForOfIteratorHelper$8(_this3.article.articleOptionStates),
-              _step7;
+            var _iterator13 = _createForOfIteratorHelper$8(_this5.article.articleOptionStates.values()),
+              _step13;
             try {
-              for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                var ops = _step7.value;
+              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                var ops = _step13.value;
                 if (ops.ppg && ops.ppg.split('_')[0] == targetPrefix) {
                   myArtOpv = ops;
                 }
               }
             } catch (err) {
-              _iterator7.e(err);
+              _iterator13.e(err);
             } finally {
-              _iterator7.f();
+              _iterator13.f();
             }
           }
 
@@ -23917,7 +24037,7 @@ var DivaEngine = /*#__PURE__*/function () {
           }
         };
         for (var _j = 0; _j < basePriceRef.TargetPPGPrefixes.length; _j++) {
-          _loop5();
+          _loop6();
         }
       }
       for (var _i4 = 0; _i4 < this.article.priceRefs.length; _i4++) {
@@ -23927,36 +24047,36 @@ var DivaEngine = /*#__PURE__*/function () {
         myArticleBasePrice += priceRef.Price ? DivaUtils__default["default"].decimalAdjust('round', (_priceRef$calcPrice = priceRef.calcPrice) !== null && _priceRef$calcPrice !== void 0 ? _priceRef$calcPrice : priceRef.Price, digits) : 0.0;
       }
       var articleUsedCalcPrice = myArticleBasePrice;
-      var _iterator8 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step8;
+      var _iterator14 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step14;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var tmpOps = _step8.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var tmpOps = _step14.value;
           articleUsedCalcPrice = this.getOptionPrice(articleUsedCalcPrice, tmpOps.option, digits);
         }
 
         //jetzt nochmal prozentuelle Preise mit GLOBAL tarbetoption berechnen
         /* TODO ABklären mit Franz - ops hat nie die Optionen - targetPPGPrefixes - ich glaube hier sollte article.priceRefs durchlaufen werden. */
       } catch (err) {
-        _iterator8.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator8.f();
+        _iterator14.f();
       }
-      var _iterator9 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step9;
+      var _iterator15 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step15;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _ops6$targetPPGPrefix, _ops6$targetPPGPrefix2;
-          var _ops6 = _step9.value;
-          var targetOption = (_ops6$targetPPGPrefix = (_ops6$targetPPGPrefix2 = _ops6.targetPPGPrefixes) === null || _ops6$targetPPGPrefix2 === void 0 ? void 0 : _ops6$targetPPGPrefix2[0]) !== null && _ops6$targetPPGPrefix !== void 0 ? _ops6$targetPPGPrefix : _ops6.targetOption;
-          if (_ops6.isPercentage && targetOption == 'GLOBAL') {
-            articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops6.calcPrice);
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var _ops5$targetPPGPrefix, _ops5$targetPPGPrefix2;
+          var _ops5 = _step15.value;
+          var targetOption = (_ops5$targetPPGPrefix = (_ops5$targetPPGPrefix2 = _ops5.targetPPGPrefixes) === null || _ops5$targetPPGPrefix2 === void 0 ? void 0 : _ops5$targetPPGPrefix2[0]) !== null && _ops5$targetPPGPrefix !== void 0 ? _ops5$targetPPGPrefix : _ops5.targetOption;
+          if (_ops5.isPercentage && targetOption == 'GLOBAL') {
+            articleUsedCalcPrice = articleUsedCalcPrice * (1 + _ops5.calcPrice);
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator9.f();
+        _iterator15.f();
       }
       for (var _i5 = 0; _i5 < this.article.priceRefs.length; _i5++) {
         var _priceRef = this.article.priceRefs[_i5];
@@ -24098,22 +24218,22 @@ var DivaEngine = /*#__PURE__*/function () {
               if (a[i].trim() != '') {
                 var searchOpt = 'OPT' + a[i].trim();
                 //Optionsbaum des Artikels durchsuchen
-                var _iterator10 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-                  _step10;
+                var _iterator16 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+                  _step16;
                 try {
-                  for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                    var _ops7 = _step10.value;
-                    if (_ops7.ocd == searchOpt || _ops7.optionCodex == searchOpt) {
-                      if (_ops7 && _ops7.price > 0) {
-                        myPercBasePrice += _ops7.price * _ops7.quantity;
+                  for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+                    var _ops6 = _step16.value;
+                    if (_ops6.ocd == searchOpt || _ops6.optionCodex == searchOpt) {
+                      if (_ops6 && _ops6.price > 0) {
+                        myPercBasePrice += _ops6.price * _ops6.quantity;
                         break;
                       }
                     }
                   }
                 } catch (err) {
-                  _iterator10.e(err);
+                  _iterator16.e(err);
                 } finally {
-                  _iterator10.f();
+                  _iterator16.f();
                 }
               }
             }
@@ -24133,7 +24253,7 @@ var DivaEngine = /*#__PURE__*/function () {
     value: function updateConfigDependentMedia() {
       var _this$article$catalog5,
         _this$article$catalog6,
-        _this4 = this;
+        _this6 = this;
       var catalogData = this.article.CatalogData;
       //articlebild berechnung
 
@@ -24159,38 +24279,48 @@ var DivaEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator11 = _createForOfIteratorHelper$8(this.article.articleOptionStates),
-        _step11;
+      var _iterator17 = _createForOfIteratorHelper$8(this.article.articleOptionStates.values()),
+        _step17;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var ops = _step11.value;
-          for (var jKey in ops.visibleOptionValues) {
-            var opv = ops.visibleOptionValues[jKey];
-            if (opv.images) {
-              var imageFound = false;
-              for (var _i8 = 0; _i8 < opv.images.length; _i8++) {
-                var image = opv.images[_i8];
-                var rule = image.jsFormula;
-                if (rule.includes('ARTICLECODEX')) {
-                  rule = rule.replace(/ARTICLECODEX/g, "'" + this.article.articleCodex + "'");
-                }
-                if (rule && this.article.evalRule(rule)) {
-                  ops.editVisibleOPVsImages(opv.codex, catalogData.getCatImageURL(image.fileName, ''));
-                  imageFound = true;
-                  break;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var ops = _step17.value;
+          var _iterator18 = _createForOfIteratorHelper$8(ops.visibleOptionValues),
+            _step18;
+          try {
+            for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+              var _step18$value = _slicedToArray__default["default"](_step18.value, 2),
+                jKey = _step18$value[0],
+                opv = _step18$value[1];
+              if (opv.images) {
+                var imageFound = false;
+                for (var _i8 = 0; _i8 < opv.images.length; _i8++) {
+                  var image = opv.images[_i8];
+                  var rule = image.jsFormula;
+                  if (rule.includes('ARTICLECODEX')) {
+                    rule = rule.replace(/ARTICLECODEX/g, "'" + this.article.articleCodex + "'");
+                  }
+                  if (rule && this.article.evalRule(rule)) {
+                    ops.editVisibleOPVsImages(opv.codex, catalogData.getCatImageURL(image.fileName, ''));
+                    imageFound = true;
+                    break;
+                  }
                 }
+                if (!imageFound) ops.editVisibleOPVsImages(opv.codex);
               }
-              if (!imageFound) ops.editVisibleOPVsImages(opv.codex);
             }
+          } catch (err) {
+            _iterator18.e(err);
+          } finally {
+            _iterator18.f();
           }
         }
 
         // this function calculates an Svg to the current configuration if neccessary (SVG Tausch)
         // if the Article has no SVG Tausch nothing is done
       } catch (err) {
-        _iterator11.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator11.f();
+        _iterator17.f();
       }
       var newSVGFile = null;
       var svgChangedViaSvgTausch = false;
@@ -24252,7 +24382,7 @@ var DivaEngine = /*#__PURE__*/function () {
             code: 'WC_0011',
             custom: {
               formulas: (_plannerCatArt$topSvg = plannerCatArt.topSvgsWithFormula) === null || _plannerCatArt$topSvg === void 0 ? void 0 : _plannerCatArt$topSvg.map(function (item) {
-                return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this4.article.catalogCodex, catalogData.multiselectOptions);
+                return DivaUtils__default["default"].getRuleByFormula(item.JsFormula, _this6.article.catalogCodex, catalogData.multiselectOptions);
               }),
               catalogName: catalogData.catalogName,
               catalogCodex: this.article.catalogCodex,
@@ -24277,8 +24407,8 @@ var DivaEngine = /*#__PURE__*/function () {
   }]);
 }();
 
-function ownKeys$f(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$f(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$f(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$f(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$7(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$7(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$7(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$7(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$7(r, a) : void 0; } }
 function _arrayLikeToArray$7(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -24333,12 +24463,12 @@ var IDMEngine = /*#__PURE__*/function () {
         decisions[i].disableHistory = [];
         decisions[i].activeCombination = undefined;
       }
-      var _iterator = _createForOfIteratorHelper$7(this.article.articleOptionStates),
+      var _iterator = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var ops = _step.value;
-          ops.updateVisibleOptionValues(_objectSpread$f({}, ops.option.articleOptionValues));
+          ops.updateVisibleOptionValues(ops.option.articleOptionValues);
           if (!ops.val) this.updateArtOPV(this.article.getDefaultOpv(ops.visibleOptionValues), ops.optionCodex, ops, undefined);
           ops.definedBySetFeatureFixed = false;
         }
@@ -24404,14 +24534,15 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function sortFeatures(featureNos) {
       var _this = this;
       return featureNos.sort(function (a, b) {
-        var aIndex = _this.article.articleOptionStates.findIndex(function (ops) {
+        var opsArray = Array.from(_this.article.articleOptionStates.values());
+        var aIndex = opsArray.findIndex(function (ops) {
           return ops.optionCodex == a;
         });
-        var bIndex = _this.article.articleOptionStates.findIndex(function (ops) {
+        var bIndex = opsArray.findIndex(function (ops) {
           return ops.optionCodex == b;
         });
-        if (aIndex == -1) aIndex = _this.article.articleOptionStates.length;
-        if (bIndex == -1) bIndex = _this.article.articleOptionStates.length;
+        if (aIndex == -1) aIndex = opsArray.length;
+        if (bIndex == -1) bIndex = opsArray.length;
         return aIndex - bIndex;
       });
     }
@@ -24427,7 +24558,7 @@ var IDMEngine = /*#__PURE__*/function () {
       var _loop = function _loop() {
         var featureNo = sortedDeatureRefs[p];
         var ops = _this2.article.getArticleOptionState(featureNo);
-        if (!validOptions[featureNo]) validOptions[featureNo] = {};
+        if (!validOptions[featureNo]) validOptions[featureNo] = new Map();
         if (!ops) return 1; // break
         var possibleOPVs = ops.visibleOptionValues;
 
@@ -24489,12 +24620,12 @@ var IDMEngine = /*#__PURE__*/function () {
                   }
                   if (ruleValid) {
                     ruleWasValidOnce = true;
-                    validOptions[featureNo] = _objectSpread$f({}, possibleOPVs);
-                    if (possibleOPVs[optionNo] != null) delete validOptions[featureNo][optionNo];
+                    validOptions[featureNo] = new Map(possibleOPVs);
+                    if (possibleOPVs.get(optionNo) != null) validOptions[featureNo]["delete"](optionNo);
                   }
                 } else {
                   ruleWasValidOnce = true;
-                  if (possibleOPVs[optionNo] != null) validOptions[featureNo][optionNo] = possibleOPVs[optionNo];
+                  if (possibleOPVs.get(optionNo) != null) validOptions[featureNo].set(optionNo, possibleOPVs.get(optionNo));
                 }
               }
               if (!ruleWasValidOnce) {
@@ -24502,7 +24633,7 @@ var IDMEngine = /*#__PURE__*/function () {
                 for (var x = 0; x < ops.visibleOPVKeys.length; x++) {
                   var _opv = ops.visibleOPVKeys[x];
                   var doesNotExists = !!(ref.options.includes(_opv) && (ref.operator == 1 || ref.operator == 3));
-                  if (!doesNotExists) validOptions[featureNo][_opv] = ops.visibleOptionValues[_opv];
+                  if (!doesNotExists) validOptions[featureNo].set(_opv, ops.visibleOptionValues.get(_opv));
                 }
               }
             } else {
@@ -24510,16 +24641,15 @@ var IDMEngine = /*#__PURE__*/function () {
             }
           }
         }
-        var schnittmenge = {};
-        for (var _key in possibleOPVs) {
-          if (validOptions[featureNo][_key]) {
-            schnittmenge[_key] = possibleOPVs[_key];
-          }
-        }
+        var schnittmenge = new Map(Array.from(possibleOPVs).filter(function (_ref) {
+          var _ref2 = _slicedToArray__default["default"](_ref, 1),
+            key = _ref2[0];
+          return validOptions[featureNo].has(key);
+        }));
         possibleOPVs = schnittmenge;
-        ops.updateVisibleOptionValues(Object.assign({}, possibleOPVs));
+        ops.updateVisibleOptionValues(possibleOPVs);
         var valCodex = ops.valCodex;
-        if ((!valCodex || !ops.visibleOptionValues[valCodex]) && ops.visibleOPVKeys.length > 0) {
+        if ((!valCodex || !ops.visibleOptionValues.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
           if (_this2.article.CatalogData.useDiomexConfigLogic) {
             _this2.clearOP(featureNo, true);
           } else {
@@ -24548,7 +24678,7 @@ var IDMEngine = /*#__PURE__*/function () {
         var featureNo = sortedDeatureRefs[p];
         var ops = _this3.article.getArticleOptionStateFlat(featureNo);
         if (!ops) return 1; // break
-        if (!invalidOptions[featureNo]) invalidOptions[featureNo] = {};
+        if (!invalidOptions[featureNo]) invalidOptions[featureNo] = new Map();
         var possibleOPVs = ops.visibleOptionValues;
         //Erste Option ist immer eine Bedingung!
         if (p === sortedDeatureRefs.length - 1) {
@@ -24586,25 +24716,23 @@ var IDMEngine = /*#__PURE__*/function () {
               if (ref) {
                 for (var i = 0; i < ref.options.length; i++) {
                   var optionNo = ref.options[i];
-                  var myOPVData = possibleOPVs[optionNo];
+                  var myOPVData = possibleOPVs.get(optionNo);
                   if (myOPVData != null) {
-                    invalidOptions[featureNo][optionNo] = myOPVData; //wenn es eine DecisionType 0 ist muss ich diese OPV von den gültigen entfernen
+                    invalidOptions[featureNo].set(optionNo, myOPVData); //wenn es eine DecisionType 0 ist muss ich diese OPV von den gültigen entfernen
                   }
                 }
               }
             }
           }
-          var schnittmenge = {};
-          for (var key in possibleOPVs) {
-            if (!invalidOptions[featureNo][key]) {
-              schnittmenge[key] = possibleOPVs[key];
-            }
-          }
-          // someDecisionExistsForOption = true;
+          var schnittmenge = new Map(Array.from(possibleOPVs).filter(function (_ref3) {
+            var _ref4 = _slicedToArray__default["default"](_ref3, 1),
+              key = _ref4[0];
+            return !invalidOptions[featureNo].has(key);
+          }));
           possibleOPVs = schnittmenge;
-          ops.updateVisibleOptionValues(Object.assign({}, possibleOPVs));
+          ops.updateVisibleOptionValues(possibleOPVs);
           var valCodex = ops.valCodex;
-          if ((!valCodex || !ops.visibleOptionValues[valCodex]) && ops.visibleOPVKeys.length > 0) {
+          if ((!valCodex || !ops.visibleOptionValues.get(valCodex)) && ops.visibleOPVKeys.length > 0) {
             if (_this3.article.CatalogData.useDiomexConfigLogic) {
               _this3.clearOP(featureNo, true);
             } else {
@@ -24622,11 +24750,22 @@ var IDMEngine = /*#__PURE__*/function () {
   }, {
     key: "evalValueWithOperator",
     value: function evalValueWithOperator(op, value, check) {
-      if (op == 0 || op == 2) return value.includes(check);
-      if (op == 1 || op == 3) return !value.includes(check);
-      if (op == 4 || op == 5) throw new Error('gt and lt not implemented');
-      if (op == 6 || op == 7) throw new Error('ge and le not implemented');
-      throw new Error('decisions operator ' + op + ' not implemented');
+      switch (op) {
+        case 0:
+        case 2:
+          return value.includes(check);
+        case 1:
+        case 3:
+          return !value.includes(check);
+        case 4:
+        case 5:
+          throw new Error('gt and lt not implemented');
+        case 6:
+        case 7:
+          throw new Error('ge and le not implemented');
+        default:
+          throw new Error('decisions operator ' + op + ' not implemented');
+      }
     }
   }, {
     key: "evalType2Decision",
@@ -24634,9 +24773,9 @@ var IDMEngine = /*#__PURE__*/function () {
       var _decision$optionCombi2;
       var hasSetFeatureInvisible = {};
       if (!((_decision$optionCombi2 = decision.optionCombinations) !== null && _decision$optionCombi2 !== void 0 && _decision$optionCombi2.length)) return;
-      var _ref = this.getMatchingOptionCombination(decision.optionCombinations),
-        _ref2 = _slicedToArray__default["default"](_ref, 1),
-        combination = _ref2[0];
+      var _ref5 = this.getMatchingOptionCombination(decision.optionCombinations),
+        _ref6 = _slicedToArray__default["default"](_ref5, 1),
+        combination = _ref6[0];
       if (combination) decision.activeCombination = combination.sequence;
       if (combination !== null && combination !== void 0 && combination.projectActions) {
         if (combination.projectActions.disableDecision) this.evalDisableDecision(combination.projectActions.disableDecision, decision, allDecisions, true);
@@ -24777,7 +24916,7 @@ var IDMEngine = /*#__PURE__*/function () {
     value: function assignOptionValue(featureNo, optionNo, setBy, freeText) {
       var ops = this.article.getArticleOptionState(featureNo);
       if (!ops) throw new Error('myOptionState ' + featureNo + ' is undefined');
-      var option = ops.visibleOptionValues[optionNo];
+      var option = ops.visibleOptionValues.get(optionNo);
       if (option) {
         if (setBy == 'fix') ops.definedBySetFeatureFixed = true;
         ops.valueWasSet = true;
@@ -24883,7 +25022,7 @@ var IDMEngine = /*#__PURE__*/function () {
         nr: priceFeatureGroup.priceFeatureGroupNo,
         variantValues: this.article.VariantValues,
         text: DivaUtils__default["default"].getLocals(priceFeatureGroup.priceFeatureGroupText, this.article.set.api.getLanguage()) + ' ' + (finish ? (_this$article$catalog3 = this.article.catalogArticle.idmPrices) === null || _this$article$catalog3 === void 0 || (_this$article$catalog3 = _this$article$catalog3.prices['PRFG' + priceFeatureGroup.priceFeatureGroupNo + '_' + finish.priceField]) === null || _this$article$catalog3 === void 0 ? void 0 : _this$article$catalog3.toString() : ''),
-        priceFeatureGroup: _objectSpread$f(_objectSpread$f({}, priceFeatureGroup), {}, {
+        priceFeatureGroup: _objectSpread$e(_objectSpread$e({}, priceFeatureGroup), {}, {
           activeCombination: finish === null || finish === void 0 ? void 0 : finish.sequence
         })
       });
@@ -24990,9 +25129,9 @@ var IDMEngine = /*#__PURE__*/function () {
       if (myPartListPos.decisionPosCount) {
         // get SetPosCountValue from decsion action if defined and else use myPartListPos.PosCountValue;
         var decision = this.article.CatalogData.getDecisionsByNo([myPartListPos.decisionPosCount])[0];
-        var _ref3 = this.getMatchingOptionCombination(decision.optionCombinations),
-          _ref4 = _slicedToArray__default["default"](_ref3, 1),
-          combination = _ref4[0];
+        var _ref7 = this.getMatchingOptionCombination(decision.optionCombinations),
+          _ref8 = _slicedToArray__default["default"](_ref7, 1),
+          combination = _ref8[0];
         if (combination) {
           var _combination$projectA;
           var posCountValueAction = (_combination$projectA = combination.projectActions) === null || _combination$projectA === void 0 ? void 0 : _combination$projectA.setPosCountValue;
@@ -25111,7 +25250,7 @@ var IDMEngine = /*#__PURE__*/function () {
     key: "updateIDMSpecificFeatures",
     value: function updateIDMSpecificFeatures() {
       //updaten idm planner specific options
-      var _iterator6 = _createForOfIteratorHelper$7(this.article.articleOptionStates),
+      var _iterator6 = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -25122,7 +25261,7 @@ var IDMEngine = /*#__PURE__*/function () {
           }
           if (ops.visibleCount && ops.IsIDMSpecialFeature) {
             var _validOpv;
-            var validOpvs = Object.values(ops.visibleOptionValues);
+            var validOpvs = Array.from(ops.visibleOptionValues.values());
             if (ops.val) validOpvs.unshift(ops.val);
             var validOpv = undefined;
             for (var i = 0; i < validOpvs.length; i++) {
@@ -25156,27 +25295,27 @@ var IDMEngine = /*#__PURE__*/function () {
       }
       if ([97, 1097].includes((_myArtOPS$option$idmV3 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV3 !== void 0 ? _myArtOPS$option$idmV3 : 0)) {
         try {
-          var _ref5, _myArtOPS$measureValu;
+          var _ref9, _myArtOPS$measureValu;
           this.article.doUpdatePlannerSize = true;
-          this.article.calcHeight = Math.round((Number((_ref5 = (_myArtOPS$measureValu = myArtOPS.measureValue) !== null && _myArtOPS$measureValu !== void 0 ? _myArtOPS$measureValu : myArtOPS.value) !== null && _ref5 !== void 0 ? _ref5 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
+          this.article.calcHeight = Math.round((Number((_ref9 = (_myArtOPS$measureValu = myArtOPS.measureValue) !== null && _myArtOPS$measureValu !== void 0 ? _myArtOPS$measureValu : myArtOPS.value) !== null && _ref9 !== void 0 ? _ref9 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
         } catch (e) {
           LOG$f.warn('Invalid Planungdepth - IDMVariantenArt 97: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
       if ([96, 1096].includes((_myArtOPS$option$idmV4 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV4 !== void 0 ? _myArtOPS$option$idmV4 : 0) || myArtOPS.option.diameter) {
         try {
-          var _ref6, _myArtOPS$measureValu2;
+          var _ref10, _myArtOPS$measureValu2;
           this.article.doUpdatePlannerSize = true;
-          this.article.calcDepth = Math.round((Number((_ref6 = (_myArtOPS$measureValu2 = myArtOPS.measureValue) !== null && _myArtOPS$measureValu2 !== void 0 ? _myArtOPS$measureValu2 : myArtOPS.value) !== null && _ref6 !== void 0 ? _ref6 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
+          this.article.calcDepth = Math.round((Number((_ref10 = (_myArtOPS$measureValu2 = myArtOPS.measureValue) !== null && _myArtOPS$measureValu2 !== void 0 ? _myArtOPS$measureValu2 : myArtOPS.value) !== null && _ref10 !== void 0 ? _ref10 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
         } catch (e) {
           LOG$f.warn('Invalid Planungdepth - IDMVariantenArt 96: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
       }
       if ([95, 1095].includes((_myArtOPS$option$idmV5 = myArtOPS.option.idmVariantenArt) !== null && _myArtOPS$option$idmV5 !== void 0 ? _myArtOPS$option$idmV5 : 0) || myArtOPS.option.diameter) {
         try {
-          var _ref7, _myArtOPS$measureValu3;
+          var _ref11, _myArtOPS$measureValu3;
           this.article.doUpdatePlannerSize = true;
-          this.article.calcWidth = Math.round((Number((_ref7 = (_myArtOPS$measureValu3 = myArtOPS.measureValue) !== null && _myArtOPS$measureValu3 !== void 0 ? _myArtOPS$measureValu3 : myArtOPS.value) !== null && _ref7 !== void 0 ? _ref7 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
+          this.article.calcWidth = Math.round((Number((_ref11 = (_myArtOPS$measureValu3 = myArtOPS.measureValue) !== null && _myArtOPS$measureValu3 !== void 0 ? _myArtOPS$measureValu3 : myArtOPS.value) !== null && _ref11 !== void 0 ? _ref11 : myArtOPS.valueFromName) + Number.EPSILON) * 100) / 100;
         } catch (e) {
           LOG$f.warn('Invalid Planungdepth - IDMVariantenArt 95: ' + myArtOPS.option.name + ' ' + myArtOPS.valName, e);
         }
@@ -25241,9 +25380,9 @@ var IDMEngine = /*#__PURE__*/function () {
       while (allKeys.find(function (key) {
         return formula.includes(key);
       })) {
-        var _key2 = allKeys.shift();
-        if (_key2 === undefined) break;
-        origFormula = origFormula.replaceAll(_key2, keysMap[_key2].toString());
+        var _key = allKeys.shift();
+        if (_key === undefined) break;
+        origFormula = origFormula.replaceAll(_key, keysMap[_key].toString());
       }
       try {
         return eval(origFormula);
@@ -25295,40 +25434,50 @@ var IDMEngine = /*#__PURE__*/function () {
       }
 
       // this functions updates the images of OPVs that depend on rules
-      var _iterator8 = _createForOfIteratorHelper$7(this.article.articleOptionStates),
+      var _iterator8 = _createForOfIteratorHelper$7(this.article.articleOptionStates.values()),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var ops = _step8.value;
-          for (var jKey in ops.visibleOptionValues) {
-            var opv = ops.visibleOptionValues[jKey];
-            if (opv.images) {
-              var imageFound = false;
-              for (var _i2 = 0; _i2 < opv.images.length; _i2++) {
-                var _image$decisionNos2, _image$decisionNos3;
-                var _image = opv.images[_i2];
-                var _doUse = !((_image$decisionNos2 = _image.decisionNos) !== null && _image$decisionNos2 !== void 0 && _image$decisionNos2.length);
-                if ((_image$decisionNos3 = _image.decisionNos) !== null && _image$decisionNos3 !== void 0 && _image$decisionNos3.length) {
-                  for (var _j2 = 0; _j2 < _image.decisionNos.length; _j2++) {
-                    var _decision2 = catalogData.getDecisionByNo(_image.decisionNos[_j2]);
-                    if (!_decision2) throw new Error('decision ' + _image.decisionNos[_j2] + ' not found');
-                    var _this$getMatchingOpti9 = this.getMatchingOptionCombination(_decision2.optionCombinations),
-                      _this$getMatchingOpti10 = _slicedToArray__default["default"](_this$getMatchingOpti9, 1),
-                      _combination2 = _this$getMatchingOpti10[0];
-                    if (_combination2) {
-                      _doUse = true;
-                      break;
+          var _iterator9 = _createForOfIteratorHelper$7(ops.visibleOptionValues),
+            _step9;
+          try {
+            for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+              var _step9$value = _slicedToArray__default["default"](_step9.value, 2),
+                jKey = _step9$value[0],
+                opv = _step9$value[1];
+              if (opv.images) {
+                var imageFound = false;
+                for (var _i2 = 0; _i2 < opv.images.length; _i2++) {
+                  var _image$decisionNos2, _image$decisionNos3;
+                  var _image = opv.images[_i2];
+                  var _doUse = !((_image$decisionNos2 = _image.decisionNos) !== null && _image$decisionNos2 !== void 0 && _image$decisionNos2.length);
+                  if ((_image$decisionNos3 = _image.decisionNos) !== null && _image$decisionNos3 !== void 0 && _image$decisionNos3.length) {
+                    for (var _j2 = 0; _j2 < _image.decisionNos.length; _j2++) {
+                      var _decision2 = catalogData.getDecisionByNo(_image.decisionNos[_j2]);
+                      if (!_decision2) throw new Error('decision ' + _image.decisionNos[_j2] + ' not found');
+                      var _this$getMatchingOpti9 = this.getMatchingOptionCombination(_decision2.optionCombinations),
+                        _this$getMatchingOpti10 = _slicedToArray__default["default"](_this$getMatchingOpti9, 1),
+                        _combination2 = _this$getMatchingOpti10[0];
+                      if (_combination2) {
+                        _doUse = true;
+                        break;
+                      }
                     }
                   }
+                  if (_doUse) {
+                    ops.editVisibleOPVsImages(opv.codex, _image.url);
+                    imageFound = true;
+                    break;
+                  }
                 }
-                if (_doUse) {
-                  ops.editVisibleOPVsImages(opv.codex, _image.url);
-                  imageFound = true;
-                  break;
-                }
+                if (!imageFound) ops.editVisibleOPVsImages(opv.codex);
               }
-              if (!imageFound) ops.editVisibleOPVsImages(opv.codex);
             }
+          } catch (err) {
+            _iterator9.e(err);
+          } finally {
+            _iterator9.f();
           }
         }
 
@@ -25434,8 +25583,8 @@ var IDMEngine = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$6(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$6(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$6(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$6(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$6(r, a) : void 0; } }
 function _arrayLikeToArray$6(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$e = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaArticle = /*#__PURE__*/function () {
   function DivaArticle(set, _basketId, initParams, articleData, catalogData) {
@@ -25526,7 +25675,7 @@ var DivaArticle = /*#__PURE__*/function () {
       this.doorPlannerData = this.shelfPlanData.DoorPlannerData;
     }
     this.initPlannerData(articleData);
-    this.articleOptionStatesData = []; //Dieses Objekt speichert den aktuellen Werte, Zustand eines Optionsbaumes und Preise
+    this.articleOptionStatesData = new Map(); //Dieses Objekt speichert den aktuellen Werte, Zustand eines Optionsbaumes und Preise
   }
   return _createClass__default["default"](DivaArticle, [{
     key: "initEngine",
@@ -25675,7 +25824,7 @@ var DivaArticle = /*#__PURE__*/function () {
         var partlistArticle = this.partlistArticles[basketId];
         if (!onlyVisible || partlistArticle.partlistArticleVisibleInTree || !excludeStandalonePla && partlistArticle.partlistArticleStandalone) partlistArticles[basketId] = partlistArticle;
         if (partlistArticle.hasPartlistArticle) {
-          partlistArticles = _objectSpread$e(_objectSpread$e({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible, excludeStandalonePla));
+          partlistArticles = _objectSpread$d(_objectSpread$d({}, partlistArticles), partlistArticle.getRecursivePartlistArticles(onlyVisible, excludeStandalonePla));
         }
       }
       return partlistArticles;
@@ -25684,8 +25833,8 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "variantValuesForPla",
     value: function variantValuesForPla(configurationMode, previousPartlistArticleVariantValues, newConfigValues) {
       //if configurationMode is true its previous values are more important than the values of the parentelement because its standalone configurable
-      if (configurationMode) return _objectSpread$e(_objectSpread$e({}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {});
-      return _objectSpread$e(_objectSpread$e({}, previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {});
+      if (configurationMode) return _objectSpread$d(_objectSpread$d({}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {});
+      return _objectSpread$d(_objectSpread$d({}, previousPartlistArticleVariantValues !== null && previousPartlistArticleVariantValues !== void 0 ? previousPartlistArticleVariantValues : {}), newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {});
     }
   }, {
     key: "partlistArticlesAsArray",
@@ -25917,7 +26066,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getTabgroupsAsString",
     get: function get() {
       var ret = '';
-      var _iterator = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -25939,7 +26088,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "articleVariantValues",
     get: function get() {
       var ret = '';
-      var _iterator2 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator2 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -26015,26 +26164,18 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getArticleOptionStatesWithOptionsForPrint",
     value: function getArticleOptionStatesWithOptionsForPrint() {
-      var _this2 = this;
-      var opsArray = _toConsumableArray__default["default"](this.articleOptionStates);
+      var opsMap = new Map(this.articleOptionStates);
       var optionsForPrint = this.optionsForPrint;
       if (optionsForPrint) {
-        var _loop = function _loop() {
-          var ops = _this2.getArticleOptionState(optionsForPrint[i]);
+        for (var i = 0; i < optionsForPrint.length; i++) {
+          var ops = this.getArticleOptionState(optionsForPrint[i]);
           if (ops) {
-            if (opsArray.find(function (o) {
-              return o.optionCodex == ops.optionCodex;
-            })) opsArray.splice(opsArray.findIndex(function (o) {
-              return o.optionCodex == ops.optionCodex;
-            }));
-            opsArray.push(ops);
+            if (opsMap.has(ops.optionCodex)) opsMap["delete"](ops.optionCodex);
+            opsMap.set(ops.optionCodex, ops);
           }
-        };
-        for (var i = 0; i < optionsForPrint.length; i++) {
-          _loop();
         }
       }
-      return opsArray;
+      return opsMap;
     }
   }, {
     key: "articleVariantDesc",
@@ -26042,7 +26183,7 @@ var DivaArticle = /*#__PURE__*/function () {
       var newLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ', ';
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
       var ret = '';
-      var _iterator3 = _createForOfIteratorHelper$6(articleOptions),
+      var _iterator3 = _createForOfIteratorHelper$6(articleOptions.values()),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -26075,7 +26216,7 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function articleVariantDesc_locales() {
       var newLine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ', ';
       var ret = {};
-      var _iterator4 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator4 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -26281,8 +26422,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "hasArticleOptionStates",
     get: function get() {
-      var _this$articleOptionSt;
-      return !!((_this$articleOptionSt = this.articleOptionStatesData) !== null && _this$articleOptionSt !== void 0 && _this$articleOptionSt.length);
+      return this.articleOptionStatesData.size > 0;
     }
   }, {
     key: "articleOptionStates",
@@ -26292,25 +26432,23 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "articleOptionStatesKeys",
     get: function get() {
-      return this.articleOptionStatesData.map(function (ops) {
-        return ops.optionCodex;
-      });
+      return Array.from(this.articleOptionStatesData.keys());
     }
   }, {
     key: "articleOptionStatesWithParents",
     get: function get() {
-      return [].concat(_toConsumableArray__default["default"](this.getReqursiveArticleOptionStates()), _toConsumableArray__default["default"](this.articleOptionStatesData));
+      return [].concat(_toConsumableArray__default["default"](this.getReqursiveArticleOptionStates()), _toConsumableArray__default["default"](this.articleOptionStates.values()));
     }
   }, {
     key: "getReqursiveArticleOptionStates",
     value: function getReqursiveArticleOptionStates() {
       var _this$partListParentA5, _this$partListParentA6, _this$partListParentA7, _this$partListParentA8, _this$accessoireParen3, _this$accessoireParen4, _this$accessoireParen5, _this$accessoireParen6;
-      return [].concat(_toConsumableArray__default["default"]((_this$partListParentA5 = (_this$partListParentA6 = this.partListParentArticle) === null || _this$partListParentA6 === void 0 ? void 0 : _this$partListParentA6.articleOptionStatesData) !== null && _this$partListParentA5 !== void 0 ? _this$partListParentA5 : []), _toConsumableArray__default["default"]((_this$partListParentA7 = (_this$partListParentA8 = this.partListParentArticle) === null || _this$partListParentA8 === void 0 ? void 0 : _this$partListParentA8.getReqursiveArticleOptionStates()) !== null && _this$partListParentA7 !== void 0 ? _this$partListParentA7 : []), _toConsumableArray__default["default"]((_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStatesData) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : []), _toConsumableArray__default["default"]((_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : []));
+      return [].concat(_toConsumableArray__default["default"]((_this$partListParentA5 = (_this$partListParentA6 = this.partListParentArticle) === null || _this$partListParentA6 === void 0 ? void 0 : _this$partListParentA6.articleOptionStates.values()) !== null && _this$partListParentA5 !== void 0 ? _this$partListParentA5 : []), _toConsumableArray__default["default"]((_this$partListParentA7 = (_this$partListParentA8 = this.partListParentArticle) === null || _this$partListParentA8 === void 0 ? void 0 : _this$partListParentA8.getReqursiveArticleOptionStates()) !== null && _this$partListParentA7 !== void 0 ? _this$partListParentA7 : []), _toConsumableArray__default["default"]((_this$accessoireParen3 = (_this$accessoireParen4 = this.accessoireParentArticle) === null || _this$accessoireParen4 === void 0 ? void 0 : _this$accessoireParen4.articleOptionStates.values()) !== null && _this$accessoireParen3 !== void 0 ? _this$accessoireParen3 : []), _toConsumableArray__default["default"]((_this$accessoireParen5 = (_this$accessoireParen6 = this.accessoireParentArticle) === null || _this$accessoireParen6 === void 0 ? void 0 : _this$accessoireParen6.getReqursiveArticleOptionStates()) !== null && _this$accessoireParen5 !== void 0 ? _this$accessoireParen5 : []));
     }
   }, {
     key: "getAllArticleOptionsStates",
     value: function getAllArticleOptionsStates() {
-      var opss = _toConsumableArray__default["default"](this.articleOptionStates);
+      var opss = _toConsumableArray__default["default"](this.articleOptionStates.values());
       for (var key in this.partlistArticles) {
         opss = [].concat(_toConsumableArray__default["default"](opss), _toConsumableArray__default["default"](this.partlistArticles[key].getAllArticleOptionsStates()));
       }
@@ -26319,7 +26457,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "clearArticleOptionStates",
     value: function clearArticleOptionStates() {
-      this.articleOptionStatesData = [];
+      this.articleOptionStatesData.clear();
     }
   }, {
     key: "articleGUID",
@@ -26334,17 +26472,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getArticleOptionStateFlat",
     value: function getArticleOptionStateFlat(codex) {
-      return this.articleOptionStatesData.find(function (ops) {
-        return ops.optionCodex == codex;
-      });
+      return this.articleOptionStatesData.get(codex);
     }
   }, {
     key: "getArticleOptionState",
     value: function getArticleOptionState(codex, from, checkOnAccessoireParent) {
       var _this$partlistArticle3;
-      var firstMatch = this.articleOptionStatesData.find(function (ops) {
-        return ops.optionCodex == codex;
-      });
+      var firstMatch = this.articleOptionStatesData.get(codex);
       if (firstMatch) return firstMatch;
       var parentArticle = this.partListParentArticle;
       if (from !== (parentArticle === null || parentArticle === void 0 ? void 0 : parentArticle.basketId) && parentArticle !== null && parentArticle !== void 0 && parentArticle.getArticleOptionState(codex, undefined, checkOnAccessoireParent)) {
@@ -26359,7 +26493,7 @@ var DivaArticle = /*#__PURE__*/function () {
           if (_ops) return _ops;
         }
       }
-      var _iterator5 = _createForOfIteratorHelper$6(this.articleOptionStatesData),
+      var _iterator5 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -26391,7 +26525,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getValueByMeasureKey",
     value: function getValueByMeasureKey(measureKey) {
-      var _iterator6 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator6 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -26416,10 +26550,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "uploadOptionState",
     value: function uploadOptionState(articleOptionState) {
-      var oldIndex = this.articleOptionStatesData.findIndex(function (ops) {
-        return ops.optionCodex == articleOptionState.optionCodex;
-      });
-      if (oldIndex !== -1) this.articleOptionStatesData[oldIndex] = articleOptionState;else this.articleOptionStatesData.push(articleOptionState);
+      this.articleOptionStatesData.set(articleOptionState.optionCodex, articleOptionState);
     }
   }, {
     key: "partlistArticlesRules",
@@ -26478,7 +26609,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "typeNr",
     get: function get() {
       if (this.supplierOrderCodex) return this.supplierOrderCodex;
-      var _iterator7 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator7 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -27046,7 +27177,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValues",
     get: function get() {
       var ret = {};
-      var _iterator8 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator8 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -27069,7 +27200,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "snapshot",
     get: function get() {
       var ret = {};
-      var _iterator9 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator9 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step9;
       try {
         for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -27147,7 +27278,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutFreetext",
     get: function get() {
       var ret = {};
-      var _iterator12 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator12 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step12;
       try {
         for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
@@ -27167,7 +27298,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesParentOption",
     get: function get() {
       var ret = {};
-      var _iterator13 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator13 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step13;
       try {
         for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
@@ -27202,7 +27333,7 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "setDifferentOptions",
     value: function setDifferentOptions(options) {
-      var _iterator14 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator14 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step14;
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
@@ -27236,7 +27367,7 @@ var DivaArticle = /*#__PURE__*/function () {
     get: function get() {
       var hash = this.catalogCodex + '_' + this.articleCodex + '_' + this.quantity + '_';
       var variantValues = [];
-      var _iterator15 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator15 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step15;
       try {
         for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
@@ -27257,7 +27388,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "VariantValuesWithoutOPTandOPV",
     get: function get() {
       var ret = {};
-      var _iterator16 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator16 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step16;
       try {
         for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
@@ -27291,7 +27422,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getVariantValuesTillOPT",
     value: function getVariantValuesTillOPT(opt) {
       var ret = {};
-      var _iterator17 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator17 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step17;
       try {
         for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
@@ -27315,14 +27446,14 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "areAllOptionsDefined",
     get: function get() {
       if (this.CatalogData.ignoreIsDefinedCheck) return true;
-      return !this.articleOptionStates.find(function (ops) {
+      return !Array.from(this.articleOptionStates.values()).find(function (ops) {
         return !ops.isDefined;
       });
     }
   }, {
     key: "optionStatesWithAddToMeasure",
     value: function optionStatesWithAddToMeasure(opt) {
-      return this.articleOptionStates.filter(function (ops) {
+      return Array.from(this.articleOptionStates.values()).filter(function (ops) {
         var _ops$addToMeasure, _ops$addToMeasure2;
         return ((_ops$addToMeasure = ops.addToMeasure) === null || _ops$addToMeasure === void 0 ? void 0 : _ops$addToMeasure.find(function (o) {
           return o.opt == opt;
@@ -27333,7 +27464,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "requiredUserInputOptions",
     get: function get() {
       var options = [];
-      var _iterator18 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator18 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step18;
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
@@ -27433,7 +27564,7 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getMetaData",
     value: function getMetaData(locales) {
       var metaDatas = locales ? this.article.catalogArticle.metaData_locales : this.article.catalogArticle.metaData;
-      var _iterator19 = _createForOfIteratorHelper$6(this.articleOptionStates),
+      var _iterator19 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
         _step19;
       try {
         for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
@@ -27505,46 +27636,67 @@ var DivaArticle = /*#__PURE__*/function () {
                 opvDoesExist = false;
               var opvsInOption = refOptData.articleOptionValues;
               if (refOptData.hasOPG && opvsInOption) {
-                for (var iKey in opvsInOption) {
-                  if (opvIsValid && anyDoShowFound) break;
-                  var opg = opvsInOption[iKey];
-                  var opvsFromOpg = opg.articleOptionValues;
-                  if (!opvsFromOpg) continue;
-                  if (refOps.visibleOptionValues[iKey]) {
-                    anyDoShowFound = true;
-                  }
-                  for (var jKey in opvsFromOpg) {
-                    if (refOps.visibleOptionValues[iKey]) {
-                      var parentName = opvsFromOpg[jKey].parentName;
-                      if (parentName) {
-                        alternativeOPV[jKey] = parentName;
-                      } else {
-                        alternativeOPV[jKey] = opvsFromOpg[jKey].name;
-                      }
+                var _iterator20 = _createForOfIteratorHelper$6(opvsInOption),
+                  _step20;
+                try {
+                  for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+                    var _step20$value = _slicedToArray__default["default"](_step20.value, 2),
+                      iKey = _step20$value[0],
+                      opg = _step20$value[1];
+                    if (opvIsValid && anyDoShowFound) break;
+                    var opvsFromOpg = opg.articleOptionValues;
+                    if (!opvsFromOpg) continue;
+                    if (refOps.visibleOptionValues.get(iKey)) {
+                      anyDoShowFound = true;
                     }
-                    if (jKey == curOpvValue) {
-                      //Der Artikel darf den Optionswert von der BaseOption übernehmen
-                      opvDoesExist = true;
-                      if (refOps.visibleOptionValues[iKey]) {
-                        refOps.defaultOPV = curOpvValue;
-                        optToChange[refOptCodex] = curOpvValue;
-                        opvIsValid = true;
+                    var _iterator21 = _createForOfIteratorHelper$6(opvsFromOpg),
+                      _step21;
+                    try {
+                      for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+                        var _step21$value = _slicedToArray__default["default"](_step21.value, 2),
+                          jKey = _step21$value[0],
+                          opv = _step21$value[1];
+                        if (refOps.visibleOptionValues.get(iKey)) {
+                          var parentName = opv.parentName;
+                          if (parentName) {
+                            alternativeOPV[jKey] = parentName;
+                          } else {
+                            alternativeOPV[jKey] = opv.name;
+                          }
+                        }
+                        if (jKey == curOpvValue) {
+                          //Der Artikel darf den Optionswert von der BaseOption übernehmen
+                          opvDoesExist = true;
+                          if (refOps.visibleOptionValues.get(iKey)) {
+                            refOps.defaultOPV = curOpvValue;
+                            optToChange[refOptCodex] = curOpvValue;
+                            opvIsValid = true;
+                          }
+                          break;
+                        }
                       }
-                      break;
+                    } catch (err) {
+                      _iterator21.e(err);
+                    } finally {
+                      _iterator21.f();
                     }
                   }
+                } catch (err) {
+                  _iterator20.e(err);
+                } finally {
+                  _iterator20.f();
                 }
               } else if (opvsInOption) {
                 for (var _iKey in opvsInOption) {
                   if (opvIsValid && anyDoShowFound) break;
-                  if (refOps.visibleOptionValues[_iKey]) {
+                  if (refOps.visibleOptionValues.get(_iKey)) {
                     anyDoShowFound = true;
-                    alternativeOPV[_iKey] = opvsInOption[_iKey].name;
+                    alternativeOPV[_iKey] = opvsInOption.get(_iKey).name;
                   }
                   if (_iKey == curOpvValue || this.hasType1Dependencies && curOpvValue.replace('OPV' + opt.substring(3), '') == _iKey.replace('OPV' + refOps.optionCodex.substring(3), '')) {
                     //Der Artikel darf den Optionswert von der BaseOption  übernehmen
                     opvDoesExist = true;
-                    if (refOps.visibleOptionValues[_iKey]) {
+                    if (refOps.visibleOptionValues.get(_iKey)) {
                       refOps.defaultOPV = _iKey;
                       optToChange[refOptCodex] = _iKey;
                       if (optToChange[opt + '_val']) {
@@ -27603,11 +27755,11 @@ var DivaArticle = /*#__PURE__*/function () {
           for (var _i3 = 0; _i3 < articles.length; _i3++) {
             var variantValues = {};
             var accessoire = articles[_i3];
-            var _iterator20 = _createForOfIteratorHelper$6(accessoire.articleOptionStates),
-              _step20;
+            var _iterator22 = _createForOfIteratorHelper$6(accessoire.articleOptionStates.values()),
+              _step22;
             try {
-              for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-                var ops = _step20.value;
+              for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+                var ops = _step22.value;
                 if (singleOpts.includes(ops.optionCodex)) {
                   if (accessoire.hasType1Dependencies) {
                     variantValues[ops.optionCodex] = curOpvValue.replace('OPV' + opt.substring(3), 'OPV' + ops.optionCodex.substring(3));
@@ -27617,9 +27769,9 @@ var DivaArticle = /*#__PURE__*/function () {
                 }
               }
             } catch (err) {
-              _iterator20.e(err);
+              _iterator22.e(err);
             } finally {
-              _iterator20.f();
+              _iterator22.f();
             }
             if (Object.entries(variantValues).length > 0) accessoiresToUpdate[accessoire.basketId] = {
               accessoire: accessoire,
@@ -27635,11 +27787,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getGlobalOptions() {
       var ret = {};
       var opss = this.articleOptionStatesWithParents;
-      var _iterator21 = _createForOfIteratorHelper$6(opss),
-        _step21;
+      var _iterator23 = _createForOfIteratorHelper$6(opss),
+        _step23;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var ops = _step21.value;
+        for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+          var ops = _step23.value;
           var value = ops.option.isDefaultValueForOptions;
           if (value) {
             var entires = value.split(';');
@@ -27648,9 +27800,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator23.e(err);
       } finally {
-        _iterator21.f();
+        _iterator23.f();
       }
       return ret;
     }
@@ -27690,34 +27842,34 @@ var DivaArticle = /*#__PURE__*/function () {
         }
         if (Object.keys(ret.opt).length === 0) {
           //nicht gefunden - jetzt OCD kontrollieren
-          var _iterator22 = _createForOfIteratorHelper$6(this.articleOptionStates),
-            _step22;
+          var _iterator24 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+            _step24;
           try {
-            for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-              var _ops4 = _step22.value;
+            for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
+              var _ops4 = _step24.value;
               if (_ops4.option.ocd == optionCodex && _ops4.isDoShow && (parentOptionCodex == '' || parentOptionCodex == _ops4.option.parentOptionCodex)) {
                 ret = this.checkOptionSearchOPV(_ops4.option, optionValueCodex, ret);
               }
             }
             //fallback for pfister classification usecase
           } catch (err) {
-            _iterator22.e(err);
+            _iterator24.e(err);
           } finally {
-            _iterator22.f();
+            _iterator24.f();
           }
-          var _iterator23 = _createForOfIteratorHelper$6(this.articleOptionStates),
-            _step23;
+          var _iterator25 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+            _step25;
           try {
-            for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-              var _ops5 = _step23.value;
+            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
+              var _ops5 = _step25.value;
               if (_ops5.option.ocd == optionCodex && optionCodex !== null && optionCodex !== void 0 && optionCodex.startsWith('OPTOPT') && (parentOptionCodex == '' || parentOptionCodex == _ops5.option.parentOptionCodex)) {
                 return this.checkOptionSearchOPV(_ops5.option, optionValueCodex, ret);
               }
             }
           } catch (err) {
-            _iterator23.e(err);
+            _iterator25.e(err);
           } finally {
-            _iterator23.f();
+            _iterator25.f();
           }
         }
       }
@@ -27733,46 +27885,89 @@ var DivaArticle = /*#__PURE__*/function () {
       }
       if (myOPT.hasOPG) {
         var myOPGs = myOPT.articleOptionValues;
-        for (var iKey in myOPGs) {
-          var myOPVs = myOPGs[iKey].articleOptionValues;
-          if (myOPVs && myOPVs[optionValueCodex]) {
-            ret.opv = myOPVs[optionValueCodex];
-            found = true;
-          }
-          if (!found) {
-            for (var jKey in myOPVs) {
-              if (myOPVs[jKey].ocd == optionValueCodex || myOPVs[jKey].codex == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && jKey.startsWith('OPVOPV_NICHT_RELEVANT')) {
-                ret.opv = myOPVs[jKey];
-                found = true;
-                break;
+        var _iterator26 = _createForOfIteratorHelper$6(myOPGs),
+          _step26;
+        try {
+          for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
+            var _step26$value = _slicedToArray__default["default"](_step26.value, 2),
+              iKey = _step26$value[0],
+              opg = _step26$value[1];
+            var myOPVs = opg.articleOptionValues;
+            if (myOPVs && myOPVs.get(optionValueCodex)) {
+              ret.opv = myOPVs.get(optionValueCodex);
+              found = true;
+            }
+            if (!found) {
+              var _iterator27 = _createForOfIteratorHelper$6(myOPVs),
+                _step27;
+              try {
+                for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
+                  var _step27$value = _slicedToArray__default["default"](_step27.value, 2),
+                    jKey = _step27$value[0],
+                    opv = _step27$value[1];
+                  if (opv.ocd == optionValueCodex || opv.codex == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && jKey.startsWith('OPVOPV_NICHT_RELEVANT')) {
+                    ret.opv = opv;
+                    found = true;
+                    break;
+                  }
+                }
+              } catch (err) {
+                _iterator27.e(err);
+              } finally {
+                _iterator27.f();
               }
             }
-          }
-          if (!found && myOPT.parentOptionCodex) {
-            for (var _jKey in myOPVs) {
-              var opv = myOPVs[_jKey];
-              if (opv.ocd && opv.ocd.startsWith(optionValueCodex) || opv.codex.startsWith(optionValueCodex)) {
-                ret.opv = myOPVs[_jKey];
-                found = true;
-                break;
+            if (!found && myOPT.parentOptionCodex) {
+              var _iterator28 = _createForOfIteratorHelper$6(myOPVs),
+                _step28;
+              try {
+                for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
+                  var _step28$value = _slicedToArray__default["default"](_step28.value, 2),
+                    _jKey = _step28$value[0],
+                    _opv = _step28$value[1];
+                  if (_opv.ocd && _opv.ocd.startsWith(optionValueCodex) || _opv.codex.startsWith(optionValueCodex)) {
+                    ret.opv = _opv;
+                    found = true;
+                    break;
+                  }
+                }
+              } catch (err) {
+                _iterator28.e(err);
+              } finally {
+                _iterator28.f();
               }
             }
+            if (ret.opv && Object.entries(ret.opv).length != 0) break;
           }
-          if (ret.opv && Object.entries(ret.opv).length != 0) break;
+        } catch (err) {
+          _iterator26.e(err);
+        } finally {
+          _iterator26.f();
         }
       } else {
         var _myOPVs = myOPT.articleOptionValues;
-        if (_myOPVs && _myOPVs[optionValueCodex]) {
-          ret.opv = _myOPVs[optionValueCodex];
+        if (_myOPVs && _myOPVs.get(optionValueCodex)) {
+          ret.opv = _myOPVs.get(optionValueCodex);
           found = true;
         }
         if (!found) {
-          for (var _jKey2 in _myOPVs) {
-            if (_myOPVs[_jKey2].ocd == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && _jKey2.startsWith('OPVOPV_NICHT_RELEVANT')) {
-              ret.opv = _myOPVs[_jKey2];
-              found = true;
-              break;
+          var _iterator29 = _createForOfIteratorHelper$6(_myOPVs),
+            _step29;
+          try {
+            for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
+              var _step29$value = _slicedToArray__default["default"](_step29.value, 2),
+                _jKey2 = _step29$value[0],
+                _opv2 = _step29$value[1];
+              if (_opv2.ocd == optionValueCodex || optionValueCodex === 'OPVOPV_NICHT_RELEVANT' && _jKey2.startsWith('OPVOPV_NICHT_RELEVANT')) {
+                ret.opv = _opv2;
+                found = true;
+                break;
+              }
             }
+          } catch (err) {
+            _iterator29.e(err);
+          } finally {
+            _iterator29.f();
           }
         }
       }
@@ -27782,11 +27977,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getArticleJsonVariantValues",
     value: function getArticleJsonVariantValues() {
       var retval = {};
-      var _iterator24 = _createForOfIteratorHelper$6(this.articleOptionStates),
-        _step24;
+      var _iterator30 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+        _step30;
       try {
-        for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var ops = _step24.value;
+        for (_iterator30.s(); !(_step30 = _iterator30.n()).done;) {
+          var ops = _step30.value;
           if (ops.valCodex) {
             retval[ops.optionCodex] = ops.valCodex;
             var opsVal = this.getArticleOptionStateFlat(ops.optionCodex + '_val');
@@ -27799,9 +27994,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator24.e(err);
+        _iterator30.e(err);
       } finally {
-        _iterator24.f();
+        _iterator30.f();
       }
       return retval;
     }
@@ -27819,13 +28014,13 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "handleMultiselect",
     value: function handleMultiselect(ops, newConfigValues, key) {
-      var _this3 = this;
+      var _this2 = this;
       var _this$parentOptionCod3 = this.parentOptionCodex(key),
         optionCodex = _this$parentOptionCod3.optionCodex,
         partenOptionCodex = _this$parentOptionCod3.partenOptionCodex;
       var codexes = newConfigValues[key].split(';');
       var values = codexes.map(function (c) {
-        return _this3.checkOptionAndOptionValue(optionCodex, c, partenOptionCodex);
+        return _this2.checkOptionAndOptionValue(optionCodex, c, partenOptionCodex);
       }).filter(function (c) {
         return Object.keys(c.opv).length;
       });
@@ -27848,10 +28043,11 @@ var DivaArticle = /*#__PURE__*/function () {
         if (codexes[0] === 'EMPTY_MULTISELECT') {
           var firstOPV;
           if (ops.option.hasOPG) {
-            var opg = ops.option.articleOptionValues[Object.keys(ops.option.articleOptionValues)[0]];
-            firstOPV = opg.articleOptionValues[Object.keys(opg.articleOptionValues)[0]];
+            var _opg$articleOptionVal, _opg$articleOptionVal2;
+            var opg = Array.from(ops.option.articleOptionValues.values())[0];
+            firstOPV = Array.from((_opg$articleOptionVal = (_opg$articleOptionVal2 = opg.articleOptionValues) === null || _opg$articleOptionVal2 === void 0 ? void 0 : _opg$articleOptionVal2.values()) !== null && _opg$articleOptionVal !== void 0 ? _opg$articleOptionVal : [])[0];
           } else {
-            firstOPV = ops.option.articleOptionValues[Object.keys(ops.option.articleOptionValues)[0]];
+            firstOPV = Array.from(ops.option.articleOptionValues.values())[0];
           }
           ops.multiSelects = [firstOPV];
           newConfigValues[ops.option.codex] = firstOPV.codex;
@@ -27885,28 +28081,47 @@ var DivaArticle = /*#__PURE__*/function () {
         var _this$checkOptionAndO = this.checkOptionAndOptionValue(optionCodex, newConfigValues[key], partenOptionCodex),
           opv = _this$checkOptionAndO.opv;
         if (!Object.keys(opv).length) {
-          var _opv = this.findFreeTextOpv(ops);
-          if (_opv) newConfigValues[key] = _opv.codex;
+          var _opv3 = this.findFreeTextOpv(ops);
+          if (_opv3) newConfigValues[key] = _opv3.codex;
         }
       }
     }
   }, {
     key: "findFreeTextOpv",
     value: function findFreeTextOpv(ops) {
-      for (var key in ops.visibleOptionValues) {
-        var opv = ops.visibleOptionValues[key];
-        if (opv.isFreeText) {
-          return opv;
+      var _iterator31 = _createForOfIteratorHelper$6(ops.visibleOptionValues),
+        _step31;
+      try {
+        for (_iterator31.s(); !(_step31 = _iterator31.n()).done;) {
+          var _step31$value = _slicedToArray__default["default"](_step31.value, 2),
+            key = _step31$value[0],
+            opv = _step31$value[1];
+          if (opv.isFreeText) {
+            return opv;
+          }
         }
+      } catch (err) {
+        _iterator31.e(err);
+      } finally {
+        _iterator31.f();
       }
       return undefined;
     }
   }, {
     key: "defineAllOptions",
     value: function defineAllOptions() {
-      this.articleOptionStates.map(function (ops) {
-        return ops.isDefined = true;
-      });
+      var _iterator32 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+        _step32;
+      try {
+        for (_iterator32.s(); !(_step32 = _iterator32.n()).done;) {
+          var ops = _step32.value;
+          ops.isDefined = true;
+        }
+      } catch (err) {
+        _iterator32.e(err);
+      } finally {
+        _iterator32.f();
+      }
     }
   }, {
     key: "defineOP",
@@ -27917,22 +28132,32 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "getDefaultOpv",
     value: function getDefaultOpv(visibleOptionValues) {
-      for (var iKey in visibleOptionValues) {
-        var opv = visibleOptionValues[iKey];
-        if (opv.isOPVG) {
-          var _opv$articleOptionVal;
-          var defaultOPV = Object.values((_opv$articleOptionVal = opv.articleOptionValues) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : {}).find(function (opv) {
-            return opv.defaultValue;
-          });
-          if (defaultOPV) {
-            return defaultOPV;
+      var _iterator33 = _createForOfIteratorHelper$6(visibleOptionValues),
+        _step33;
+      try {
+        for (_iterator33.s(); !(_step33 = _iterator33.n()).done;) {
+          var _step33$value = _slicedToArray__default["default"](_step33.value, 2),
+            iKey = _step33$value[0],
+            opv = _step33$value[1];
+          if (opv.isOPVG) {
+            var _opv$articleOptionVal, _opv$articleOptionVal2;
+            var defaultOPV = Array.from((_opv$articleOptionVal = (_opv$articleOptionVal2 = opv.articleOptionValues) === null || _opv$articleOptionVal2 === void 0 ? void 0 : _opv$articleOptionVal2.values()) !== null && _opv$articleOptionVal !== void 0 ? _opv$articleOptionVal : []).find(function (opv) {
+              return opv.defaultValue;
+            });
+            if (defaultOPV) {
+              return defaultOPV;
+            }
+          }
+          if (opv.defaultValue) {
+            return opv;
           }
         }
-        if (opv.defaultValue) {
-          return opv;
-        }
+      } catch (err) {
+        _iterator33.e(err);
+      } finally {
+        _iterator33.f();
       }
-      return visibleOptionValues[Object.keys(visibleOptionValues)[0]];
+      return Array.from(visibleOptionValues.values())[0];
     }
   }, {
     key: "getVariantValuesInfluencingOptions",
@@ -27959,7 +28184,7 @@ var DivaArticle = /*#__PURE__*/function () {
               var newVvs2 = this.engine.getValuesInfluencingOPT(key, vv[key]);
               if (newVvs2.length) {
                 for (var j = 0; j < newVvs2.length; j++) {
-                  newVvs[j] = _objectSpread$e(_objectSpread$e({}, vv), newVvs2[j]);
+                  newVvs[j] = _objectSpread$d(_objectSpread$d({}, vv), newVvs2[j]);
                 }
               }
             }
@@ -28038,7 +28263,7 @@ var DivaArticle = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 4;
-              return Promise.resolve().then(function () { return require('./ShelfPlanner-33014e25.js'); });
+              return Promise.resolve().then(function () { return require('./ShelfPlanner-d409ac3e.js'); });
             case 4:
               _yield$import = _context.sent;
               ShelfPlanner = _yield$import["default"];
@@ -28115,11 +28340,19 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function afterInit() {
       if (!this.CatalogData.useDiomexConfigLogic) return {};
       var variantValues = {};
-      for (var i = 0; i < this.articleOptionStates.length; i++) {
-        var ops = this.articleOptionStates[i];
-        if (ops.val === undefined && ops.visibleOPVKeys.length && !ops.isInvisible) {
-          variantValues[ops.optionCodex] = ops.visibleOPVKeys[0];
+      var _iterator34 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+        _step34;
+      try {
+        for (_iterator34.s(); !(_step34 = _iterator34.n()).done;) {
+          var ops = _step34.value;
+          if (ops.val === undefined && ops.visibleOPVKeys.length && !ops.isInvisible) {
+            variantValues[ops.optionCodex] = ops.visibleOPVKeys[0];
+          }
         }
+      } catch (err) {
+        _iterator34.e(err);
+      } finally {
+        _iterator34.f();
       }
       return variantValues;
     }
@@ -28143,30 +28376,40 @@ var DivaArticle = /*#__PURE__*/function () {
       for (var _key in myValues) {
         var ops = this.getArticleOptionState(_key);
         if (!ops) continue;
-        var opv = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues[myValues[_key]];
+        var opv = ops === null || ops === void 0 ? void 0 : ops.visibleOptionValues.get(myValues[_key]);
         if (opv) {
           var value = opv.setConfig;
           if (value) {
             for (var _i4 = 0; _i4 < value.split(';').length; _i4++) {
               var opt = (!this.CatalogData.isIDMFormat ? 'OPT' : '') + value.split(';')[_i4].split(':')[0];
-              var _opv2 = (!this.CatalogData.isIDMFormat ? 'OPV' : '') + value.split(';')[_i4].split(':')[1];
+              var _opv4 = (!this.CatalogData.isIDMFormat ? 'OPV' : '') + value.split(';')[_i4].split(':')[1];
               if (!myValues[opt] || setConfigDoesOverWrite) {
-                myValues[opt] = _opv2;
+                myValues[opt] = _opv4;
               }
             }
           }
         }
-        var catalogopv = ops.option.articleOptionValues[myValues[_key]];
+        var catalogopv = ops.option.articleOptionValues.get(myValues[_key]);
         if (catalogopv !== null && catalogopv !== void 0 && catalogopv.sameopv) {
           var opvs = ops.option.articleOptionValues;
-          for (var opvKey in opvs) {
-            var checkingOpv = opvs[opvKey];
-            if (opvKey === catalogopv.codex) continue;
-            if (checkingOpv !== null && checkingOpv !== void 0 && checkingOpv.sameopv && catalogopv.sameopv == checkingOpv.sameopv) {
-              if (!ops.visibleOptionValues[catalogopv.codex] && ops.visibleOptionValues[checkingOpv.codex]) {
-                myValues[_key] = checkingOpv.codex;
+          var _iterator35 = _createForOfIteratorHelper$6(opvs),
+            _step35;
+          try {
+            for (_iterator35.s(); !(_step35 = _iterator35.n()).done;) {
+              var _step35$value = _slicedToArray__default["default"](_step35.value, 2),
+                opvKey = _step35$value[0],
+                checkingOpv = _step35$value[1];
+              if (opvKey === catalogopv.codex) continue;
+              if (checkingOpv !== null && checkingOpv !== void 0 && checkingOpv.sameopv && catalogopv.sameopv == checkingOpv.sameopv) {
+                if (!ops.visibleOptionValues.get(catalogopv.codex) && ops.visibleOptionValues.get(checkingOpv.codex)) {
+                  myValues[_key] = checkingOpv.codex;
+                }
               }
             }
+          } catch (err) {
+            _iterator35.e(err);
+          } finally {
+            _iterator35.f();
           }
         }
       }
@@ -28177,20 +28420,20 @@ var DivaArticle = /*#__PURE__*/function () {
         } else if (_key2.endsWith('_val') && this.getArticleOptionState(_key2.replace(/_val/g, ''))) {
           validValues[_key2] = myValues[_key2];
         } else {
-          var _iterator25 = _createForOfIteratorHelper$6(this.articleOptionStates),
-            _step25;
+          var _iterator36 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+            _step36;
           try {
-            for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
-              var _ops7 = _step25.value;
+            for (_iterator36.s(); !(_step36 = _iterator36.n()).done;) {
+              var _ops7 = _step36.value;
               if (_ops7.optionOcd == _key2) {
                 var values = this.checkOptionSearchOPV(_ops7.option, myValues[_key2], {});
                 if (values !== null && values !== void 0 && values.opv) validValues[_ops7.optionCodex] = values.opv.codex;
               }
             }
           } catch (err) {
-            _iterator25.e(err);
+            _iterator36.e(err);
           } finally {
-            _iterator25.f();
+            _iterator36.f();
           }
         }
         //for classification usecase when suboption and option have the same name like OPTOPT_MATERIAL_1_00 and OPTOPT_MATERIAL_1_00.OPTOPT_MATERIAL_1_00
@@ -28254,17 +28497,17 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "addOptionStateFromArticleToPlannerData",
     value: function addOptionStateFromArticleToPlannerData(ret, alternateRenderInfo) {
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator26 = _createForOfIteratorHelper$6(articleOptions),
-        _step26;
+      var _iterator37 = _createForOfIteratorHelper$6(articleOptions.values()),
+        _step37;
       try {
-        for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
-          var ops = _step26.value;
+        for (_iterator37.s(); !(_step37 = _iterator37.n()).done;) {
+          var ops = _step37.value;
           this.addOptionStateToPlannerData(ret, ops, alternateRenderInfo);
         }
       } catch (err) {
-        _iterator26.e(err);
+        _iterator37.e(err);
       } finally {
-        _iterator26.f();
+        _iterator37.f();
       }
       for (var key in this.article.partlistArticles) {
         var partlistArticle = this.article.partlistArticles[key];
@@ -28316,11 +28559,11 @@ var DivaArticle = /*#__PURE__*/function () {
     key: "getAccessoireMATData",
     value: function getAccessoireMATData(onString) {
       var MAT = [];
-      var _iterator27 = _createForOfIteratorHelper$6(this.articleOptionStates),
-        _step27;
+      var _iterator38 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+        _step38;
       try {
-        for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-          var ops = _step27.value;
+        for (_iterator38.s(); !(_step38 = _iterator38.n()).done;) {
+          var ops = _step38.value;
           var opt = void 0;
           if (!ops.val) continue;
           opt = ops.optionCodex;
@@ -28333,9 +28576,9 @@ var DivaArticle = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator27.e(err);
+        _iterator38.e(err);
       } finally {
-        _iterator27.f();
+        _iterator38.f();
       }
       return MAT;
     }
@@ -28377,11 +28620,11 @@ var DivaArticle = /*#__PURE__*/function () {
     value: function getVariantBasketData() {
       var variantBasketData = [];
       var articleOptions = this.getArticleOptionStatesWithOptionsForPrint();
-      var _iterator28 = _createForOfIteratorHelper$6(articleOptions),
-        _step28;
+      var _iterator39 = _createForOfIteratorHelper$6(articleOptions.values()),
+        _step39;
       try {
-        for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
-          var ops = _step28.value;
+        for (_iterator39.s(); !(_step39 = _iterator39.n()).done;) {
+          var ops = _step39.value;
           var OP = ops.optionCodex;
           if (ops) {
             var _ops$idmVariantenArt2;
@@ -28448,9 +28691,9 @@ var DivaArticle = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator28.e(err);
+        _iterator39.e(err);
       } finally {
-        _iterator28.f();
+        _iterator39.f();
       }
       return variantBasketData;
     }
@@ -28619,19 +28862,19 @@ var DivaArticle = /*#__PURE__*/function () {
   }, {
     key: "cloneArticle",
     value: function cloneArticle(set) {
-      var clonedArticle = new DivaArticle(set, this.basketId, _objectSpread$e({}, this.article), this.article.catalogArticle, set.CatalogData);
-      clonedArticle.articleOptionStatesData = [];
-      var _iterator29 = _createForOfIteratorHelper$6(this.articleOptionStates),
-        _step29;
+      var clonedArticle = new DivaArticle(set, this.basketId, _objectSpread$d({}, this.article), this.article.catalogArticle, set.CatalogData);
+      clonedArticle.articleOptionStatesData = new Map();
+      var _iterator40 = _createForOfIteratorHelper$6(this.articleOptionStates.values()),
+        _step40;
       try {
-        for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
-          var ops = _step29.value;
-          clonedArticle.articleOptionStatesData.push(ops.cloneOptionState(clonedArticle.getIsConfigSingle));
+        for (_iterator40.s(); !(_step40 = _iterator40.n()).done;) {
+          var ops = _step40.value;
+          clonedArticle.articleOptionStatesData.set(ops.optionCodex, ops.cloneOptionState(clonedArticle.getIsConfigSingle));
         }
       } catch (err) {
-        _iterator29.e(err);
+        _iterator40.e(err);
       } finally {
-        _iterator29.f();
+        _iterator40.f();
       }
       clonedArticle.initEngine();
       clonedArticle.article.partlistArticles = {};
@@ -28647,8 +28890,8 @@ var DivaArticle = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$5(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$5(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$5(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$5(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$5(r, a) : void 0; } }
 function _arrayLikeToArray$5(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$d(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$d(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$d(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$d(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$d = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 
 //Diese Klasse verwaltet den Optionsbaum und ladelogik etc. eines Artikels
@@ -28667,7 +28910,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return this.preLoadArticles(set, [_objectSpread$d(_objectSpread$d({}, initParams), {}, {
+              return this.preLoadArticles(set, [_objectSpread$c(_objectSpread$c({}, initParams), {}, {
                 articleCodex: articleCodex
               })]);
             case 2:
@@ -28927,7 +29170,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               return _context6.abrupt("continue", 37);
             case 12:
               if (targetArticlesWithNewValues.includes(targetArticlesToUpdate[i])) {
-                valuesArray[i] = actArticle.getValidValues(_objectSpread$d({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
+                valuesArray[i] = actArticle.getValidValues(_objectSpread$c({}, myValues), actArticle.CatalogData.mergeOptionsToSameOption);
               }
 
               //only set config if valuesArray are not empty or the article is initializing
@@ -29131,7 +29374,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         for (var key in articles) {
           var checkArticle = articles[key];
           //und jetzt in allen Optionsbäumen nach GroupedUsedOPVs suchen
-          var _iterator = _createForOfIteratorHelper$5(checkArticle.articleOptionStates),
+          var _iterator = _createForOfIteratorHelper$5(checkArticle.articleOptionStates.values()),
             _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -29180,7 +29423,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       for (var i = keys.length - 1; i >= 0; i--) {
         var article = articles[keys[i]];
         if (article.hasArticleOptionStates) {
-          var _iterator2 = _createForOfIteratorHelper$5(article.articleOptionStates),
+          var _iterator2 = _createForOfIteratorHelper$5(article.articleOptionStates.values()),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -29209,50 +29452,24 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       var _initCfgValues = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9(article, variantValues,
       // Werte aus einem Basiskonfigurat,
       variantItems) {
-        var myCatalogArticleOptions, _loop2, i, attr, foundItem, _foundItem$opt, freeText, opss, _i, ops, opv, _iterator3, _step3, _ops, value, optionValueCodex, _i2, variantItem, possibleValues, j, possibleValue, _i3, _variantItem, val;
-        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        var myCatalogArticleOptions, i, _article$set$ViewConf, attr, foundItem, _foundItem$opt, freeText, opss, _i, ops, opv, _iterator3, _step3, _ops, value, optionValueCodex, _i2, variantItem, possibleValues, j, possibleValue, _i3, _variantItem, val;
+        return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               myCatalogArticleOptions = Object.values(article.catalogArticleOptions).sort(function (a, b) {
                 var _a$sequenceNo, _b$sequenceNo;
                 return ((_a$sequenceNo = a.sequenceNo) !== null && _a$sequenceNo !== void 0 ? _a$sequenceNo : 0) - ((_b$sequenceNo = b.sequenceNo) !== null && _b$sequenceNo !== void 0 ? _b$sequenceNo : 0);
               });
-              if (!myCatalogArticleOptions) {
-                _context11.next = 9;
-                break;
-              }
-              _loop2 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop2(i) {
-                var _article$set$ViewConf, optionState;
-                return _regeneratorRuntime__default["default"].wrap(function _loop2$(_context10) {
-                  while (1) switch (_context10.prev = _context10.next) {
-                    case 0:
-                      //Hier wird mal geschaut, ob der aktuelle Artikel alle Optionen schon initialisiert hat.
-                      if (!article.articleOptionStates.find(function (ops) {
-                        return ops.optionCodex == myCatalogArticleOptions[i].codex;
-                      })) {
-                        optionState = new ArticleOptionStateData(myCatalogArticleOptions[i], article.getIsConfigSingle, undefined, (_article$set$ViewConf = article.set.ViewConfig) === null || _article$set$ViewConf === void 0 ? void 0 : _article$set$ViewConf.useIsOptionDefinedWarning);
-                        article.uploadOptionState(optionState); //alle Optionen erstellen
-                      }
-                    case 1:
-                    case "end":
-                      return _context10.stop();
+              if (myCatalogArticleOptions) {
+                for (i = 0; i < myCatalogArticleOptions.length; i++) {
+                  //Hier wird mal geschaut, ob der aktuelle Artikel alle Optionen schon initialisiert hat.
+                  if (!article.articleOptionStates.has(myCatalogArticleOptions[i].codex)) {
+                    article.uploadOptionState(new ArticleOptionStateData(myCatalogArticleOptions[i], article.getIsConfigSingle, undefined, (_article$set$ViewConf = article.set.ViewConfig) === null || _article$set$ViewConf === void 0 ? void 0 : _article$set$ViewConf.useIsOptionDefinedWarning)); //alle Optionen erstellen
                   }
-                }, _loop2);
-              });
-              i = 0;
-            case 4:
-              if (!(i < myCatalogArticleOptions.length)) {
-                _context11.next = 9;
-                break;
+                }
               }
-              return _context11.delegateYield(_loop2(i), "t0", 6);
-            case 6:
-              i++;
-              _context11.next = 4;
-              break;
-            case 9:
-              if (!article.articleOptionStates.length) {
-                _context11.next = 33;
+              if (!article.articleOptionStates.size) {
+                _context10.next = 26;
                 break;
               }
               //infos eines Basisconfigurats initialisieren
@@ -29281,23 +29498,23 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }
 
               //defaultValues for FreeText
-              _iterator3 = _createForOfIteratorHelper$5(article.articleOptionStates);
-              _context11.prev = 12;
+              _iterator3 = _createForOfIteratorHelper$5(article.articleOptionStates.values());
+              _context10.prev = 5;
               _iterator3.s();
-            case 14:
+            case 7:
               if ((_step3 = _iterator3.n()).done) {
-                _context11.next = 25;
+                _context10.next = 18;
                 break;
               }
               _ops = _step3.value;
               if (!variantValues[_ops.optionCodex + '_val']) {
-                _context11.next = 18;
+                _context10.next = 11;
                 break;
               }
-              return _context11.abrupt("continue", 23);
-            case 18:
+              return _context10.abrupt("continue", 16);
+            case 11:
               value = undefined;
-              optionValueCodex = Object.keys(_ops.option.articleOptionValues)[0];
+              optionValueCodex = Array.from(_ops.option.articleOptionValues.values())[0].codex;
               if (variantItems && _ops.isFreeText && _ops.measureUnit) {
                 for (_i2 = 0; _i2 < variantItems.length && value == undefined; _i2++) {
                   variantItem = variantItems[_i2];
@@ -29334,28 +29551,28 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   _ops.freeText = val;
                 }
               }
-              if (value != undefined) article.engine.setOP(_ops.option.codex, _ops.option.articleOptionValues[optionValueCodex], value, true);
-            case 23:
-              _context11.next = 14;
+              if (value != undefined) article.engine.setOP(_ops.option.codex, _ops.option.articleOptionValues.get(optionValueCodex), value, true);
+            case 16:
+              _context10.next = 7;
               break;
-            case 25:
-              _context11.next = 30;
+            case 18:
+              _context10.next = 23;
               break;
-            case 27:
-              _context11.prev = 27;
-              _context11.t1 = _context11["catch"](12);
-              _iterator3.e(_context11.t1);
-            case 30:
-              _context11.prev = 30;
+            case 20:
+              _context10.prev = 20;
+              _context10.t0 = _context10["catch"](5);
+              _iterator3.e(_context10.t0);
+            case 23:
+              _context10.prev = 23;
               _iterator3.f();
-              return _context11.finish(30);
-            case 33:
+              return _context10.finish(23);
+            case 26:
               if (article.plannerData) article.plannerData.varaintValuesInfluencingAVLAVRFilter = article.getVariantValuesInfluencingOptions([(!article.CatalogData.isIDMFormat ? 'OPT' : '') + '89', (!article.CatalogData.isIDMFormat ? 'OPT' : '') + '90']);
-            case 34:
+            case 27:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
-        }, _callee9, null, [[12, 27, 30, 33]]);
+        }, _callee9, null, [[5, 20, 23, 26]]);
       }));
       function initCfgValues(_x24, _x25, _x26) {
         return _initCfgValues.apply(this, arguments);
@@ -29377,8 +29594,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: (function () {
       var _updateCfgValues = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(article, newConfigValues, alreadyInitializedValues, dontCalcPrice, dontLoadPartlist, calcVariantPrice, onlyUpdateOnce) {
         var maxPriceOfGroupCodex, setByFeatureVariantValues, key, partlistArticlesToLoad;
-        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               if (!!article.CatalogData.bundleRules) dontLoadPartlist = true;
               //es wird versucht die neuen Optionswerte zu setzten
@@ -29404,24 +29621,24 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 article.engine.evalDecisions(onlyUpdateOnce);
               }
               if (calcVariantPrice) {
-                _context12.next = 9;
+                _context11.next = 9;
                 break;
               }
-              _context12.next = 9;
+              _context11.next = 9;
               return article.updateShelfPlannerState(newConfigValues);
             case 9:
               if (!(!dontCalcPrice && !calcVariantPrice)) {
-                _context12.next = 12;
+                _context11.next = 12;
                 break;
               }
-              _context12.next = 12;
+              _context11.next = 12;
               return this.updateLastElement(article);
             case 12:
-              _context12.next = 14;
+              _context11.next = 14;
               return this.evalAndLoadPartlistArticles(article, dontLoadPartlist, newConfigValues);
             case 14:
-              partlistArticlesToLoad = _context12.sent;
-              _context12.next = 17;
+              partlistArticlesToLoad = _context11.sent;
+              _context11.next = 17;
               return this.evalOpvsOnOpvsConstructionRules(article);
             case 17:
               //danach Preise berechnen
@@ -29432,10 +29649,10 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   article.engine.updateConfigDependentMedia();
                 }
               }
-              return _context12.abrupt("return", partlistArticlesToLoad);
+              return _context11.abrupt("return", partlistArticlesToLoad);
             case 19:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
         }, _callee10, this);
       }));
@@ -29449,17 +29666,17 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function () {
       var _updateLastElement = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee11(article) {
         var isIDM, opsLastElement, lastElement, opsLastPlannedAccessoire, opsFirstAccessoire, _article$accessoirePa, _article$accessoirePa2, accessoires, i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee11$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               isIDM = article.CatalogData.isIDMFormat;
               opsLastElement = article.getArticleOptionState((!isIDM ? 'OPT' : '') + 'ELEMENTPOSITION');
               if (opsLastElement) {
                 lastElement = setHandlerInstance.getLastElementInGroup(article);
                 if (lastElement && lastElement.elementId == article.elementId) {
-                  opsLastElement.val = opsLastElement.visibleOptionValues[(!isIDM ? 'OPV' : '') + 'LASTELEMENT'];
+                  opsLastElement.val = opsLastElement.visibleOptionValues.get((!isIDM ? 'OPV' : '') + 'LASTELEMENT');
                 } else {
-                  opsLastElement.val = opsLastElement.visibleOptionValues[(!isIDM ? 'OPV' : '') + 'NOTLASTELEMENT'];
+                  opsLastElement.val = opsLastElement.visibleOptionValues.get((!isIDM ? 'OPV' : '') + 'NOTLASTELEMENT');
                 }
               }
               opsLastPlannedAccessoire = article.getArticleOptionState((!isIDM ? 'OPT' : '') + 'LASTSTACKEDARTICLE');
@@ -29467,32 +29684,32 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 if (Object.values(article.accessoires).find(function (accessoire) {
                   return accessoire.hasCatalogPlannerArticle;
                 })) {
-                  opsLastPlannedAccessoire.val = opsLastPlannedAccessoire.visibleOptionValues[(!isIDM ? 'OPV' : '') + 'NOTLASTSTACKEDARTICLE'];
+                  opsLastPlannedAccessoire.val = opsLastPlannedAccessoire.visibleOptionValues.get((!isIDM ? 'OPV' : '') + 'NOTLASTSTACKEDARTICLE');
                 } else {
-                  opsLastPlannedAccessoire.val = opsLastPlannedAccessoire.visibleOptionValues[(!isIDM ? 'OPV' : '') + 'LASTSTACKEDARTICLE'];
+                  opsLastPlannedAccessoire.val = opsLastPlannedAccessoire.visibleOptionValues.get((!isIDM ? 'OPV' : '') + 'LASTSTACKEDARTICLE');
                 }
               }
               opsFirstAccessoire = article.getArticleOptionState((!isIDM ? 'OPT' : '') + 'FIRSTACCESSOIRE');
               if (!opsFirstAccessoire) {
-                _context13.next = 15;
+                _context12.next = 15;
                 break;
               }
               accessoires = (_article$accessoirePa = (_article$accessoirePa2 = article.accessoireParentArticle) === null || _article$accessoirePa2 === void 0 ? void 0 : _article$accessoirePa2.getAccessoireByArticleCodex(article.articleCodex)) !== null && _article$accessoirePa !== void 0 ? _article$accessoirePa : [];
               i = 0;
             case 9:
               if (!(i < accessoires.length)) {
-                _context13.next = 15;
+                _context12.next = 15;
                 break;
               }
-              _context13.next = 12;
+              _context12.next = 12;
               return this.updateOption(accessoires[i], (!isIDM ? 'OPT' : '') + 'FIRSTACCESSOIRE', (!isIDM ? 'OPV' : '') + (i + 1).toString(), i === 0 ? (!isIDM ? 'OPV' : '') + 'FIRSTACCESSOIRE' : (!isIDM ? 'OPV' : '') + 'NOTFIRSTACCESSOIRE');
             case 12:
               i++;
-              _context13.next = 9;
+              _context12.next = 9;
               break;
             case 15:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
         }, _callee11, this);
       }));
@@ -29507,34 +29724,34 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       var _updateOption = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(article, optionCodex, newCodex, fallbackNewCodex) {
         var _ops$val, _ops$visibleOptionVal;
         var ops, oldCodex, newVal;
-        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               ops = article.getArticleOptionState(optionCodex);
               if (ops) {
-                _context14.next = 3;
+                _context13.next = 3;
                 break;
               }
-              return _context14.abrupt("return");
+              return _context13.abrupt("return");
             case 3:
               oldCodex = (_ops$val = ops.val) === null || _ops$val === void 0 ? void 0 : _ops$val.codex;
-              newVal = (_ops$visibleOptionVal = ops.visibleOptionValues[newCodex]) !== null && _ops$visibleOptionVal !== void 0 ? _ops$visibleOptionVal : fallbackNewCodex ? ops.visibleOptionValues[fallbackNewCodex] : undefined;
+              newVal = (_ops$visibleOptionVal = ops.visibleOptionValues.get(newCodex)) !== null && _ops$visibleOptionVal !== void 0 ? _ops$visibleOptionVal : fallbackNewCodex ? ops.visibleOptionValues.get(fallbackNewCodex) : undefined;
               if (!(oldCodex === (newVal === null || newVal === void 0 ? void 0 : newVal.codex))) {
-                _context14.next = 7;
+                _context13.next = 7;
                 break;
               }
-              return _context14.abrupt("return");
+              return _context13.abrupt("return");
             case 7:
               if (!newVal) {
-                _context14.next = 11;
+                _context13.next = 11;
                 break;
               }
               ops.val = newVal;
-              _context14.next = 11;
+              _context13.next = 11;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(article.set, {}, []);
             case 11:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
         }, _callee12);
       }));
@@ -29550,12 +29767,12 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: (function () {
       var _evalAndLoadPartlistArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee13(article, dontLoadPartlist, newConfigValues) {
         var partlistArticlesToLoad;
-        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee13$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               partlistArticlesToLoad = [];
               if (!article.hasPartlistArticle) {
-                _context15.next = 9;
+                _context14.next = 9;
                 break;
               }
               article.deletePartlistArticles(); //alle aktellen PartlistArticles des Articles löschen!
@@ -29565,10 +29782,10 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 return ((_a$sequenceNo2 = a.sequenceNo) !== null && _a$sequenceNo2 !== void 0 ? _a$sequenceNo2 : 0) - ((_b$sequenceNo2 = b.sequenceNo) !== null && _b$sequenceNo2 !== void 0 ? _b$sequenceNo2 : 0);
               });
               if (dontLoadPartlist) {
-                _context15.next = 9;
+                _context14.next = 9;
                 break;
               }
-              _context15.next = 8;
+              _context14.next = 8;
               return this.loadPartlistArticles(partlistArticlesToLoad, article, article.VariantValues);
             case 8:
               partlistArticlesToLoad = [];
@@ -29577,10 +29794,10 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, article.bundleRules, _defineProperty__default["default"]({}, article.basketId, article));
               }
               article.hasPartlistArticleInitialized = true;
-              return _context15.abrupt("return", partlistArticlesToLoad);
+              return _context14.abrupt("return", partlistArticlesToLoad);
             case 12:
             case "end":
-              return _context15.stop();
+              return _context14.stop();
           }
         }, _callee13, this);
       }));
@@ -29595,10 +29812,10 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       var _loadPartlistArticles = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee14(partlistArticlesToLoad, article, newConfigValues) {
         var _this = this;
         var i;
-        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee14$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context16.next = 2;
+              _context15.next = 2;
               return this.preLoadArticles(article.set, partlistArticlesToLoad.map(function (p) {
                 return _this.partlistArticleInitData(article, p);
               }));
@@ -29606,20 +29823,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               i = 0;
             case 3:
               if (!(i < partlistArticlesToLoad.length)) {
-                _context16.next = 9;
+                _context15.next = 9;
                 break;
               }
-              _context16.next = 6;
+              _context15.next = 6;
               return this.loadPartlistArticle(partlistArticlesToLoad[i], article, newConfigValues);
             case 6:
               i++;
-              _context16.next = 3;
+              _context15.next = 3;
               break;
             case 9:
               article.sortPartlistArticles(partlistArticlesToLoad);
             case 10:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
         }, _callee14, this);
       }));
@@ -29634,25 +29851,25 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function () {
       var _loadPartlistArticle = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee15(doLoadItem, article, newConfigValues) {
         var nArticle, _doLoadItem$VariantVa;
-        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee15$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context17.next = 2;
+              _context16.next = 2;
               return this.loadArticle(article.set, doLoadItem.ArticleCodex, this.partlistArticleInitData(article, doLoadItem));
             case 2:
-              nArticle = _context17.sent;
+              nArticle = _context16.sent;
               if (!nArticle) {
-                _context17.next = 8;
+                _context16.next = 8;
                 break;
               }
               doLoadItem.BasketID = nArticle.basketId;
-              _context17.next = 7;
+              _context16.next = 7;
               return this.toDoAfterArticleLoaded(nArticle, {}, nArticle.variantValuesForPla(nArticle.partlistArticleStandalone, (_doLoadItem$VariantVa = doLoadItem.VariantValues) !== null && _doLoadItem$VariantVa !== void 0 ? _doLoadItem$VariantVa : {}, newConfigValues !== null && newConfigValues !== void 0 ? newConfigValues : {}), 'initializingPartlist', doLoadItem.VariantItemData);
             case 7:
               article.addPartlistArticle(nArticle);
             case 8:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
         }, _callee15, this);
       }));
@@ -29698,9 +29915,9 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: (function () {
       var _evalOpvsOnOpvsConstructionRules = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(article) {
         var _article$CatalogData$;
-        var somethingChanged, previousRules, _key, actRules, item, _iterator4, _step4, ops, myOPVs, key2, opv, opvGroupName, _article$catalogArtic, _article$catalogArtic2, disable, onOpv, onOpvArr, invaliOPVs, invalidOPVArr, j, opvRule, ops2, i, invalidOpv, ops3, key, constructionRule, notifications, _i4, _item;
-        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        var somethingChanged, previousRules, _key, actRules, item, _iterator4, _step4, ops, myOPVs, _iterator5, _step5, _step5$value, key2, opv, opvGroupName, _article$catalogArtic, _article$catalogArtic2, disable, onOpv, onOpvArr, invaliOPVs, invalidOPVArr, j, opvRule, ops2, i, invalidOpv, ops3, key, constructionRule, notifications, _i4, _item;
+        return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               somethingChanged = false;
               previousRules = {};
@@ -29719,52 +29936,59 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                   }
                 }
               }
-              _iterator4 = _createForOfIteratorHelper$5(article.articleOptionStates);
+              _iterator4 = _createForOfIteratorHelper$5(article.articleOptionStates.values());
               try {
                 for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
                   ops = _step4.value;
                   if (ops.optionCodex.toUpperCase().endsWith('OPTCONSTRUCTIONRULES')) {
                     myOPVs = ops.option.articleOptionValues;
-                    for (key2 in myOPVs) {
-                      opv = myOPVs[key2];
-                      opvGroupName = opv.groupName;
-                      if (opvGroupName && opvGroupName.startsWith('ON_OPV_SET_OPV')) {
-                        disable = false;
-                        if (opvGroupName.endsWith('DISABLE')) {
-                          disable = true;
-                        }
-                        onOpv = (_article$catalogArtic = article.catalogArticle.onConfigOption) !== null && _article$catalogArtic !== void 0 ? _article$catalogArtic : '';
-                        onOpvArr = onOpv.split(',');
-                        invaliOPVs = (_article$catalogArtic2 = article.catalogArticle.onSetConfigOtpion) !== null && _article$catalogArtic2 !== void 0 ? _article$catalogArtic2 : '';
-                        invalidOPVArr = invaliOPVs.split(',');
-                        for (j = 0; j < onOpvArr.length; j++) {
-                          //alle OPVs auf welche zu prüfen ist durchlaufen
-                          opvRule = onOpvArr[j].split(':');
-                          ops2 = article.getArticleOptionStateFlat(opvRule[0]);
-                          if (ops2) {
-                            if (ops2.valCodex == opvRule[1]) {
-                              for (i = 0; i < invalidOPVArr.length; i++) {
-                                //alle zu deaktivierende OPVs durchgehen
-                                invalidOpv = invalidOPVArr[i].split(':');
-                                ops3 = article.getArticleOptionStateFlat(invalidOpv[0]);
-                                if (ops3) {
-                                  key = onOpvArr[j];
-                                  constructionRule = {
-                                    message: {
-                                      DE: opv.name,
-                                      IT: opv.name,
-                                      FR: opv.name
-                                    },
-                                    type: disable ? 'DISABLE' : 'WARNING'
-                                  };
-                                  article.addUpdatedOPVbyOPVConstructionRules(key, article.updateOPVConstruction(invalidOpv[0], invalidOpv[1], constructionRule));
-                                  somethingChanged = true;
+                    _iterator5 = _createForOfIteratorHelper$5(myOPVs);
+                    try {
+                      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                        _step5$value = _slicedToArray__default["default"](_step5.value, 2), key2 = _step5$value[0], opv = _step5$value[1];
+                        opvGroupName = opv.groupName;
+                        if (opvGroupName && opvGroupName.startsWith('ON_OPV_SET_OPV')) {
+                          disable = false;
+                          if (opvGroupName.endsWith('DISABLE')) {
+                            disable = true;
+                          }
+                          onOpv = (_article$catalogArtic = article.catalogArticle.onConfigOption) !== null && _article$catalogArtic !== void 0 ? _article$catalogArtic : '';
+                          onOpvArr = onOpv.split(',');
+                          invaliOPVs = (_article$catalogArtic2 = article.catalogArticle.onSetConfigOtpion) !== null && _article$catalogArtic2 !== void 0 ? _article$catalogArtic2 : '';
+                          invalidOPVArr = invaliOPVs.split(',');
+                          for (j = 0; j < onOpvArr.length; j++) {
+                            //alle OPVs auf welche zu prüfen ist durchlaufen
+                            opvRule = onOpvArr[j].split(':');
+                            ops2 = article.getArticleOptionStateFlat(opvRule[0]);
+                            if (ops2) {
+                              if (ops2.valCodex == opvRule[1]) {
+                                for (i = 0; i < invalidOPVArr.length; i++) {
+                                  //alle zu deaktivierende OPVs durchgehen
+                                  invalidOpv = invalidOPVArr[i].split(':');
+                                  ops3 = article.getArticleOptionStateFlat(invalidOpv[0]);
+                                  if (ops3) {
+                                    key = onOpvArr[j];
+                                    constructionRule = {
+                                      message: {
+                                        DE: opv.name,
+                                        IT: opv.name,
+                                        FR: opv.name
+                                      },
+                                      type: disable ? 'DISABLE' : 'WARNING'
+                                    };
+                                    article.addUpdatedOPVbyOPVConstructionRules(key, article.updateOPVConstruction(invalidOpv[0], invalidOpv[1], constructionRule));
+                                    somethingChanged = true;
+                                  }
                                 }
                               }
                             }
                           }
                         }
                       }
+                    } catch (err) {
+                      _iterator5.e(err);
+                    } finally {
+                      _iterator5.f();
                     }
                   }
                 }
@@ -29774,26 +29998,26 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                 _iterator4.f();
               }
               if (!((_article$CatalogData$ = article.CatalogData.warningRules) !== null && _article$CatalogData$ !== void 0 && _article$CatalogData$.length)) {
-                _context18.next = 20;
+                _context17.next = 20;
                 break;
               }
               notifications = this.checkNotificationRules(article.CatalogData.warningRules, _defineProperty__default["default"]({}, article.basketId, article), {});
               if (!(notifications !== null && notifications !== void 0 && notifications.length)) {
-                _context18.next = 20;
+                _context17.next = 20;
                 break;
               }
               _i4 = 0;
             case 11:
               if (!(_i4 < notifications.length)) {
-                _context18.next = 19;
+                _context17.next = 19;
                 break;
               }
               _item = notifications[_i4];
               if (_item.showAsWarning) {
-                _context18.next = 15;
+                _context17.next = 15;
                 break;
               }
-              return _context18.abrupt("continue", 16);
+              return _context17.abrupt("continue", 16);
             case 15:
               article.addUpdatedOPVbyOPVConstructionRules(_item.showAsWarning.option + ';' + _item.showAsWarning.optionValue, article.updateOPVConstruction((!article.CatalogData.isIDMFormat ? 'OPT' : '') + _item.showAsWarning.option, (!article.CatalogData.isIDMFormat ? 'OPV' : '') + _item.showAsWarning.optionValue, {
                 message: _item.message,
@@ -29801,20 +30025,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
               }));
             case 16:
               _i4++;
-              _context18.next = 11;
+              _context17.next = 11;
               break;
             case 19:
               somethingChanged = true;
             case 20:
               if (!(somethingChanged && JSON.stringify(previousRules) != JSON.stringify(article.updatedOPVbyOPVConstructionRules))) {
-                _context18.next = 23;
+                _context17.next = 23;
                 break;
               }
-              _context18.next = 23;
+              _context17.next = 23;
               return this.updateCfgValues(article, {}, {});
             case 23:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
         }, _callee16, this);
       }));
@@ -29853,7 +30077,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           if (ruleValid) break;
         }
         if (ruleValid) {
-          returnValue.push(_objectSpread$d(_objectSpread$d({}, entry), {}, {
+          returnValue.push(_objectSpread$c(_objectSpread$c({}, entry), {}, {
             index: i
           }));
           break;
@@ -29926,7 +30150,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function checkIfAllOptionsAreDefined(articles) {
       var articleNames = [];
       var options = [];
-      var _loop3 = function _loop3(baksetId) {
+      var _loop2 = function _loop2(baksetId) {
         var article = articles[baksetId];
         if (!article.areAllOptionsDefined) {
           var requiredUserInputOptions = article.requiredUserInputOptions;
@@ -29942,7 +30166,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         }
       };
       for (var baksetId in articles) {
-        _loop3(baksetId);
+        _loop2(baksetId);
       }
       return {
         articleNames: articleNames,
@@ -29970,8 +30194,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             var filter = article.plannerData.AVLFilter[i];
             if (dockedToArticle.plannerData.AVRFilter.includes(filter)) {
               var ops = article.getArticleOptionState((!article.CatalogData.isIDMFormat ? 'OPT' : '') + '89');
-              if (ops !== null && ops !== void 0 && ops.visibleOptionValues[(!article.CatalogData.isIDMFormat ? 'OPV' : '') + filter]) {
-                article.engine.setOP(ops.optionCodex, ops.visibleOptionValues[(!article.CatalogData.isIDMFormat ? 'OPV' : '') + filter]);
+              if (ops !== null && ops !== void 0 && ops.visibleOptionValues.get((!article.CatalogData.isIDMFormat ? 'OPV' : '') + filter)) {
+                article.engine.setOP(ops.optionCodex, ops.visibleOptionValues.get((!article.CatalogData.isIDMFormat ? 'OPV' : '') + filter));
                 somethingChanged = true;
                 break;
               }
@@ -29983,8 +30207,8 @@ var DivaArticleHandler = /*#__PURE__*/function () {
             var _filter = article.plannerData.AVRFilter[_i5];
             if (dockedToArticle.plannerData.AVLFilter.includes(_filter)) {
               var _ops2 = article.getArticleOptionState((!article.CatalogData.isIDMFormat ? 'OPT' : '') + '90');
-              if (_ops2 !== null && _ops2 !== void 0 && _ops2.visibleOptionValues[(!article.CatalogData.isIDMFormat ? 'OPV' : '') + _filter]) {
-                article.engine.setOP(_ops2.optionCodex, _ops2.visibleOptionValues[(!article.CatalogData.isIDMFormat ? 'OPV' : '') + _filter]);
+              if (_ops2 !== null && _ops2 !== void 0 && _ops2.visibleOptionValues.get((!article.CatalogData.isIDMFormat ? 'OPV' : '') + _filter)) {
+                article.engine.setOP(_ops2.optionCodex, _ops2.visibleOptionValues.get((!article.CatalogData.isIDMFormat ? 'OPV' : '') + _filter));
                 somethingChanged = true;
                 break;
               }
@@ -29999,25 +30223,25 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function () {
       var _triggerShelfplannerVisibility = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee17(artices, gridGroup) {
         var key, _artice$shelfPlanner, artice;
-        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime__default["default"].wrap(function _callee17$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context19.t0 = _regeneratorRuntime__default["default"].keys(artices);
+              _context18.t0 = _regeneratorRuntime__default["default"].keys(artices);
             case 1:
-              if ((_context19.t1 = _context19.t0()).done) {
-                _context19.next = 8;
+              if ((_context18.t1 = _context18.t0()).done) {
+                _context18.next = 8;
                 break;
               }
-              key = _context19.t1.value;
+              key = _context18.t1.value;
               artice = artices[key];
-              _context19.next = 6;
+              _context18.next = 6;
               return (_artice$shelfPlanner = artice.shelfPlanner) === null || _artice$shelfPlanner === void 0 ? void 0 : _artice$shelfPlanner.triggerVisibility(gridGroup);
             case 6:
-              _context19.next = 1;
+              _context18.next = 1;
               break;
             case 8:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
         }, _callee17);
       }));
@@ -30043,7 +30267,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
       var hasFavorites = arguments.length > 3 ? arguments[3] : undefined;
       var ret = [];
       if (Object.values(articles).length == 0) return ret;
-      var _loop4 = function _loop4() {
+      var _loop3 = function _loop3() {
         var _article$shelfPlanner3, _article$shelfPlanner4, _article$doorPlanner;
         var article = articles[key];
         var catalogData = article.CatalogData;
@@ -30127,7 +30351,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         ret = ret.concat(_this2.getOptiontreeAccessoiresArr(article.set.getSetId(), article));
       };
       for (var key in articles) {
-        _loop4();
+        _loop3();
       }
       return ret;
     }
@@ -30172,11 +30396,11 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     value: function getOptiontreeAccessoiresArr(setId, article) {
       var s = 0;
       var accessoires = [];
-      var _iterator5 = _createForOfIteratorHelper$5(article.articleOptionStates),
-        _step5;
+      var _iterator6 = _createForOfIteratorHelper$5(article.articleOptionStates.values()),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var ops = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var ops = _step6.value;
           if (ops.option.articlePlaceholder) {
             //ArticlePlaceholder bestimmt, ob Optionswert als eigene SAPOrderline ausgegeben wird
             if (ops.isAccessoirArtNr && ops.isAccessoirArtNr != '') {
@@ -30192,9 +30416,9 @@ var DivaArticleHandler = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
       return accessoires;
     }
@@ -30293,20 +30517,20 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "correctPartlistArticlesByGlobalRules",
     value: (function () {
       var _correctPartlistArticlesByGlobalRules = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee18(set, partlistArticlesToLoad, bundleRules, doChangeRetailArticleNumbers) {
-        var _loop5, i, article;
-        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        var _loop4, i, article;
+        return _regeneratorRuntime__default["default"].wrap(function _callee18$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               if (bundleRules) partlistArticlesToLoad = this.bundlePartlistArticles(partlistArticlesToLoad, bundleRules, set.getDivaArticles());
               //Correct RetailArticleNumbers
               if (!(doChangeRetailArticleNumbers !== null && doChangeRetailArticleNumbers !== void 0 && doChangeRetailArticleNumbers.doChange && doChangeRetailArticleNumbers.retailArticleRules)) {
-                _context21.next = 9;
+                _context20.next = 9;
                 break;
               }
-              _loop5 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop5(i) {
+              _loop4 = /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _loop4(i) {
                 var rule;
-                return _regeneratorRuntime__default["default"].wrap(function _loop5$(_context20) {
-                  while (1) switch (_context20.prev = _context20.next) {
+                return _regeneratorRuntime__default["default"].wrap(function _loop4$(_context19) {
+                  while (1) switch (_context19.prev = _context19.next) {
                     case 0:
                       //Run through articleCodexes to repair:
                       rule = doChangeRetailArticleNumbers.retailArticleRules.find(function (item) {
@@ -30318,30 +30542,30 @@ var DivaArticleHandler = /*#__PURE__*/function () {
                       }
                     case 2:
                     case "end":
-                      return _context20.stop();
+                      return _context19.stop();
                   }
-                }, _loop5);
+                }, _loop4);
               });
               i = 0;
             case 4:
               if (!(i < partlistArticlesToLoad.length)) {
-                _context21.next = 9;
+                _context20.next = 9;
                 break;
               }
-              return _context21.delegateYield(_loop5(i), "t0", 6);
+              return _context20.delegateYield(_loop4(i), "t0", 6);
             case 6:
               i++;
-              _context21.next = 4;
+              _context20.next = 4;
               break;
             case 9:
               article = Object.values(set.getDivaArticles()).find(function (article) {
                 return article.hasPartlistArticle && !article.deleted;
               });
-              _context21.next = 12;
+              _context20.next = 12;
               return this.loadPartlistArticles(partlistArticlesToLoad, article, {});
             case 12:
             case "end":
-              return _context21.stop();
+              return _context20.stop();
           }
         }, _callee18, this);
       }));
@@ -30354,7 +30578,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
     key: "bundlePartlistArticles",
     value: function bundlePartlistArticles(partlistArticlesToLoad, bundleRules, articles) {
       var partlistArticlesToLoadGrouped = [];
-      var _loop6 = function _loop6(i) {
+      var _loop5 = function _loop5(i) {
         var index = partlistArticlesToLoadGrouped.findIndex(function (item, j) {
           if (item.CatalogCodex == partlistArticlesToLoad[i].CatalogCodex && item.ArticleCodex == partlistArticlesToLoad[i].ArticleCodex && item.RetailArticleNr == partlistArticlesToLoad[i].RetailArticleNr && item.RetailPrefix == partlistArticlesToLoad[i].RetailPrefix) {
             return true;
@@ -30368,7 +30592,7 @@ var DivaArticleHandler = /*#__PURE__*/function () {
         }
       };
       for (var i = 0; i < partlistArticlesToLoad.length; i++) {
-        _loop6(i);
+        _loop5(i);
       }
       //bundle Partlistarticles
       for (var _i6 = 0; _i6 < bundleRules.length; _i6++) {
@@ -31233,8 +31457,8 @@ var DivaConfigTreeData = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$4(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$4(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$4(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$4(r, a) : void 0; } }
 function _arrayLikeToArray$4(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$b = DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 //plz delete me
 var DivaSet = /*#__PURE__*/function () {
@@ -31334,7 +31558,7 @@ var DivaSet = /*#__PURE__*/function () {
                         _context.next = 10;
                         break;
                       }
-                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$c({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
+                      validValues = repairVariantValuesAndPlanner ? article.getValidValues(_objectSpread$b({}, variantValues), article.CatalogData.mergeOptionsToSameOption) : {};
                       _context.t0 = partlistArticlesToLoad;
                       _context.next = 8;
                       return articleHandlerInstance.updateCfgValues(article, repairVariantValuesAndPlanner ? validValues : variantValues, {}, undefined, loadPlas);
@@ -31904,8 +32128,8 @@ var DivaSet = /*#__PURE__*/function () {
       var articles = {};
       for (var basketId in this.divaArticles) {
         articles[basketId] = this.divaArticles[basketId];
-        if (allPartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles());
-        if (visiblePartlistArticlesAlso) articles = _objectSpread$c(_objectSpread$c({}, articles), articles[basketId].getRecursivePartlistArticles(true));
+        if (allPartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles());
+        if (visiblePartlistArticlesAlso) articles = _objectSpread$b(_objectSpread$b({}, articles), articles[basketId].getRecursivePartlistArticles(true));
       }
       return articles;
     }
@@ -32065,7 +32289,7 @@ var DivaSet = /*#__PURE__*/function () {
       var cleanedDimensions = [];
       for (var basketId in articles) {
         var artice = articles[basketId];
-        var _iterator3 = _createForOfIteratorHelper$4(artice.articleOptionStates),
+        var _iterator3 = _createForOfIteratorHelper$4(artice.articleOptionStates.values()),
           _step3;
         try {
           var _loop2 = function _loop2() {
@@ -32276,7 +32500,7 @@ var DivaSet = /*#__PURE__*/function () {
       var options = [];
       for (var key in this.divaArticles) {
         var article = this.divaArticles[key];
-        var _iterator4 = _createForOfIteratorHelper$4(article.articleOptionStates),
+        var _iterator4 = _createForOfIteratorHelper$4(article.articleOptionStates.values()),
           _step4;
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -32537,7 +32761,7 @@ var DivaSet = /*#__PURE__*/function () {
                 break;
               }
               _context5.next = 3;
-              return Promise.resolve().then(function () { return require('./DoorPlanner-10e97f07.js'); });
+              return Promise.resolve().then(function () { return require('./DoorPlanner-f5c079a9.js'); });
             case 3:
               _yield$import = _context5.sent;
               DoorPlanner = _yield$import["default"];
@@ -32726,8 +32950,8 @@ var DivaSet = /*#__PURE__*/function () {
   }, {
     key: "cloneSet",
     value: function cloneSet() {
-      var clonedSet = new DivaSet(this.CatalogData, this.setId, {}, _objectSpread$c({}, this.setState));
-      clonedSet.setData = _objectSpread$c({}, this.setData);
+      var clonedSet = new DivaSet(this.CatalogData, this.setId, {}, _objectSpread$b({}, this.setState));
+      clonedSet.setData = _objectSpread$b({}, this.setData);
       clonedSet.configSingle = this.configSingle;
       clonedSet.logTotalStateForVariants = this.logTotalStateForVariants;
       var articles = this.getDivaArticles();
@@ -32760,7 +32984,7 @@ var SummaryHandler = /*#__PURE__*/function () {
       for (var basketId in articles) {
         //add config Steps
         var article = articles[basketId];
-        var _iterator = _createForOfIteratorHelper$3(article.articleOptionStates),
+        var _iterator = _createForOfIteratorHelper$3(article.articleOptionStates.values()),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -33574,8 +33798,8 @@ var SummaryHandler = /*#__PURE__*/function () {
 }();
 var summaryHandlerInstance = new SummaryHandler();
 
-function ownKeys$b(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$b(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$b(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 DivaUtils__default["default"].initLog('Planner', 'WEB-PLANNER-LOGIC');
 var DivaFavoritesHandler = /*#__PURE__*/function () {
   function DivaFavoritesHandler() {
@@ -34264,7 +34488,7 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
                   if (targetArticle[opt] && !variantValues[opt]) variantValues[opt] = targetArticle[opt];
                 }
               }
-              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$b(_objectSpread$b({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
+              configVariant = new basketModel.ConfigVariantData(variant.id, set.setName, set.setName_locales, setImage, (_hQRenderScript = hQRenderScript) === null || _hQRenderScript === void 0 ? void 0 : _hQRenderScript._id, DivaUtils__default["default"].encodeBase64(set.plannerHandler.getProject3D(set.getSetId())), set.getVariantsDescription(), set.SetArticleNr, set.getSetPrice(), set.setHash, 1, set.getVariantBasketData(), articleHandlerInstance.getCompactOrderLine(_objectSpread$a(_objectSpread$a({}, set.getDivaArticles()), set.getPartlistArticlesOfSet())), variantValues, summaryHandlerInstance.convertSummaryItemsToSummaryInfo(set), plannerData != undefined ? DivaUtils__default["default"].encodeBase64(JSON.stringify(plannerData)) : '', urlToPlanning2D, setHandlerInstance.getBBoxObject(set, dimensions), set.getBruttoSetPrice(), undefined, undefined, set.MetaData, set.MetaData_locales, DivaUtils__default["default"].stripTagsFromDict(set.getVariantsDescription_locales()), (_basket$OrderSets$set = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set === void 0 || (_basket$OrderSets$set = _basket$OrderSets$set[set.basketConfigVariants.length]) === null || _basket$OrderSets$set === void 0 ? void 0 : _basket$OrderSets$set.SetOrderText, (_basket$OrderSets$set2 = basket.OrderSets[setindex].ConfigVariants) === null || _basket$OrderSets$set2 === void 0 || (_basket$OrderSets$set2 = _basket$OrderSets$set2[set.basketConfigVariants.length]) === null || _basket$OrderSets$set2 === void 0 ? void 0 : _basket$OrderSets$set2.SetOrderText_locales);
               set.basketConfigVariants.push(configVariant);
             case 31:
             case "end":
@@ -34359,8 +34583,6 @@ var DivaFavoritesHandler = /*#__PURE__*/function () {
 }();
 var favoritesHandlerInstance = new DivaFavoritesHandler();
 
-function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$a(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$2(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$2(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$2(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$2(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$2(r, a) : void 0; } }
 function _arrayLikeToArray$2(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -34460,7 +34682,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var basketId in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[basketId];
-        var _iterator = _createForOfIteratorHelper$2(optionsStates),
+        var _iterator = _createForOfIteratorHelper$2(optionsStates.values()),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -34699,7 +34921,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           if (o && !!o.isDifferentOption && !((_o$valCodex = o.valCodex) !== null && _o$valCodex !== void 0 && _o$valCodex.includes('OPVSUB'))) {
             return true;
           }
-          var rul = (_ops$visibleOptionVal = ops.visibleOptionValues[ops.visibleOPVKeys[0]]) === null || _ops$visibleOptionVal === void 0 ? void 0 : _ops$visibleOptionVal.rul;
+          var rul = (_ops$visibleOptionVal = ops.visibleOptionValues.get(ops.visibleOPVKeys[0])) === null || _ops$visibleOptionVal === void 0 ? void 0 : _ops$visibleOptionVal.rul;
           if (rul) {
             var parentOptions = DivaUtils__default["default"].getOptionsByRule(rul);
             return !!parentOptions.find(function (o) {
@@ -34767,7 +34989,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     key: "getConifgItemsForView",
     value: function () {
       var _getConifgItemsForView = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(set, configStepKey) {
-        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, key, _configItem$parent$oc, configItem, configItemsInOPG, retVal, _retVal, totalTime, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _key, _set$favorites$Varian, _set$favorites, startTime, alreadyCalcedVisibleOPVs, i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, _i, timeDiff, _configItems;
+        var articles, step, retValues, optionCodex, configItems, selectedItems, optionState, _iterator2, _step2, _configItem$parent$oc, key, configItem, configItemsInOPG, retVal, _retVal, totalTime, configStepOPG, configStepOPV, targetArticle, opg, ops, selectedOpv, originalVariantValues, seomethingChanged, variantValues, _iterator3, _step3, _set$favorites$Varian, _set$favorites, _key, startTime, alreadyCalcedVisibleOPVs, _i, _ops$optionOcd2, _retVal2, clonedConfigItemsForView, i, timeDiff;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -34776,7 +34998,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               retValues = this.getConfigItems(configStepKey, articles, set.configTree);
               optionCodex = undefined;
               if (!(retValues && step != null)) {
-                _context.next = 65;
+                _context.next = 95;
                 break;
               }
               configItems = [];
@@ -34790,115 +35012,157 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             case 10:
               optionCodex = optionState.optionCodex;
               if (!retValues.isOPG) {
-                _context.next = 15;
+                _context.next = 35;
                 break;
               }
-              for (key in retValues.configItems) {
-                configItem = retValues.configItems[key];
-                optionCodex = (_configItem$parent$oc = configItem.parent.ocd) !== null && _configItem$parent$oc !== void 0 ? _configItem$parent$oc : configItem.parent.codex;
-                configItemsInOPG = configItem.articleOptionValues;
-                if (configItemsInOPG) {
-                  retVal = this.prepareConfigItemsForView(set, optionState, configItemsInOPG, retValues.constructionRules, selectedItems, step.configStep.targetArticles, optionCodex);
-                  configItems = configItems.concat(retVal.myConfigItemsForView);
-                }
+              _iterator2 = _createForOfIteratorHelper$2(retValues.configItems.keys());
+              _context.prev = 13;
+              _iterator2.s();
+            case 15:
+              if ((_step2 = _iterator2.n()).done) {
+                _context.next = 25;
+                break;
+              }
+              key = _step2.value;
+              configItem = retValues.configItems.get(key);
+              if (configItem) {
+                _context.next = 20;
+                break;
               }
-              _context.next = 62;
+              throw new Error('configItem ' + key + ' not found in retValues.configItems');
+            case 20:
+              optionCodex = (_configItem$parent$oc = configItem.parent.ocd) !== null && _configItem$parent$oc !== void 0 ? _configItem$parent$oc : configItem.parent.codex;
+              configItemsInOPG = configItem.articleOptionValues;
+              if (configItemsInOPG) {
+                retVal = this.prepareConfigItemsForView(set, optionState, configItemsInOPG, retValues.constructionRules, selectedItems, step.configStep.targetArticles, optionCodex);
+                configItems = configItems.concat(retVal.myConfigItemsForView);
+              }
+            case 23:
+              _context.next = 15;
               break;
-            case 15:
+            case 25:
+              _context.next = 30;
+              break;
+            case 27:
+              _context.prev = 27;
+              _context.t0 = _context["catch"](13);
+              _iterator2.e(_context.t0);
+            case 30:
+              _context.prev = 30;
+              _iterator2.f();
+              return _context.finish(30);
+            case 33:
+              _context.next = 92;
+              break;
+            case 35:
               if (!(step.optionStep.mergesToOPG == undefined)) {
-                _context.next = 20;
+                _context.next = 40;
                 break;
               }
               _retVal = this.prepareConfigItemsForView(set, optionState, retValues.configItems, retValues.constructionRules, selectedItems, step.configStep.targetArticles, undefined, undefined, undefined, undefined, retValues.freeTextValue, retValues.freeTextLang);
               configItems = _retVal.myConfigItemsForView;
-              _context.next = 62;
+              _context.next = 92;
               break;
-            case 20:
+            case 40:
               if (!(typeof step.optionStep.mergesToOPG == 'string' && step.tabGroup.options[step.optionStep.mergesToOPG])) {
-                _context.next = 62;
+                _context.next = 92;
                 break;
               }
               //IDM Bezugschritte werden zusammengefasst zu OPG und OPV
               totalTime = Date.now();
               configStepOPG = step.configStep, configStepOPV = set.configTree.getConfigStepBasketIdAndOptionCodex(configStepOPG.targetArticles[0], step.optionStep.mergesToOPG); //falls mehrere Artikel im Schritt sind werden trotzdem nur die Values des erster verwendet um die z.B. OPT2 und OPT3 zu vereinen
               if (!configStepOPV) {
-                _context.next = 62;
+                _context.next = 92;
                 break;
               }
               targetArticle = articles[configStepOPG.targetArticles[0]];
               opg = targetArticle.getArticleOptionState(configStepOPG.option);
               ops = targetArticle.getArticleOptionState(configStepOPV.option);
               if (opg) {
-                _context.next = 29;
+                _context.next = 49;
                 break;
               }
               throw new Error('myOptionState ' + configStepOPG.option + ' is undefined');
-            case 29:
+            case 49:
               if (ops) {
-                _context.next = 31;
+                _context.next = 51;
                 break;
               }
               throw new Error('myOptionState ' + configStepOPV.option + ' is undefined');
-            case 31:
+            case 51:
               selectedOpv = ops.val;
               originalVariantValues = targetArticle.VariantValues;
               seomethingChanged = false;
               variantValues = {};
-              _context.t0 = _regeneratorRuntime__default["default"].keys(opg.visibleOptionValues);
-            case 36:
-              if ((_context.t1 = _context.t0()).done) {
-                _context.next = 56;
+              _iterator3 = _createForOfIteratorHelper$2(opg.visibleOptionValues.keys());
+              _context.prev = 56;
+              _iterator3.s();
+            case 58:
+              if ((_step3 = _iterator3.n()).done) {
+                _context.next = 78;
                 break;
               }
-              _key = _context.t1.value;
+              _key = _step3.value;
               startTime = Date.now(); //die sichtbaren gruppen werden nun nacheinander beim Artikel gesetzt und die Validen bezüge jeder gruppe geholt -> visibleOptionValues;
-              variantValues[opg.optionCodex] = opg.visibleOptionValues[_key].codex;
-              alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
+              variantValues[opg.optionCodex] = opg.visibleOptionValues.get(_key).codex;
+              alreadyCalcedVisibleOPVs = targetArticle.getMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues.get(_key).codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)));
               if (!(alreadyCalcedVisibleOPVs != undefined && Object.keys((_set$favorites$Varian = (_set$favorites = set.favorites) === null || _set$favorites === void 0 ? void 0 : _set$favorites.VariantValues) !== null && _set$favorites$Varian !== void 0 ? _set$favorites$Varian : {}).length == 0)) {
-                _context.next = 46;
+                _context.next = 68;
                 break;
               }
               //die merged OPG wurde bereist ausgerechnet und kann wiederverwendet werden. nur die Selected value muss repariert werden
-              if ((originalVariantValues === null || originalVariantValues === void 0 ? void 0 : originalVariantValues[opg.optionCodex]) == opg.visibleOptionValues[_key].codex) {
-                for (i = 0; i < alreadyCalcedVisibleOPVs.length; i++) {
-                  if (alreadyCalcedVisibleOPVs[i].codex == ops.valCodex) {
-                    alreadyCalcedVisibleOPVs[i].sel = true;
+              if ((originalVariantValues === null || originalVariantValues === void 0 ? void 0 : originalVariantValues[opg.optionCodex]) == opg.visibleOptionValues.get(_key).codex) {
+                for (_i = 0; _i < alreadyCalcedVisibleOPVs.length; _i++) {
+                  if (alreadyCalcedVisibleOPVs[_i].codex == ops.valCodex) {
+                    alreadyCalcedVisibleOPVs[_i].sel = true;
                   }
                 }
               }
               configItems = configItems.concat(alreadyCalcedVisibleOPVs);
-              _context.next = 53;
+              _context.next = 75;
               break;
-            case 46:
+            case 68:
               seomethingChanged = true;
-              _context.next = 49;
+              _context.next = 71;
               return articleHandlerInstance.updateCfgValues(targetArticle, variantValues, {}, true, true, true, true);
-            case 49:
-              _retVal2 = this.prepareConfigItemsForView(set, optionState, targetArticle.getArticleOptionState(ops.optionCodex).visibleOptionValues, retValues.constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opg.visibleOptionValues[_key].name, opg.visibleOptionValues[_key].codex, opg.optionCodex);
+            case 71:
+              _retVal2 = this.prepareConfigItemsForView(set, optionState, targetArticle.getArticleOptionState(ops.optionCodex).visibleOptionValues, retValues.constructionRules, [], step.configStep.targetArticles, (_ops$optionOcd2 = ops.optionOcd) !== null && _ops$optionOcd2 !== void 0 ? _ops$optionOcd2 : ops.optionCodex, opg.visibleOptionValues.get(_key).name, opg.visibleOptionValues.get(_key).codex, opg.optionCodex);
               configItems = configItems.concat(_retVal2.myConfigItemsForView);
               clonedConfigItemsForView = JSON.parse(JSON.stringify(_retVal2.myConfigItemsForView));
-              targetArticle.addMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues[_key].codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)), clonedConfigItemsForView);
-            case 53:
+              targetArticle.addMergesToOPG(opg.optionCodex + '_' + opg.visibleOptionValues.get(_key).codex, JSON.stringify(targetArticle.getVariantValuesTillOPT(opg.optionCodex)), clonedConfigItemsForView);
+            case 75:
               LOG$a.debug('calculating for merge to opg', _key, Date.now() - startTime + 'ms');
-              _context.next = 36;
+            case 76:
+              _context.next = 58;
               break;
-            case 56:
+            case 78:
+              _context.next = 83;
+              break;
+            case 80:
+              _context.prev = 80;
+              _context.t1 = _context["catch"](56);
+              _iterator3.e(_context.t1);
+            case 83:
+              _context.prev = 83;
+              _iterator3.f();
+              return _context.finish(83);
+            case 86:
               if (!seomethingChanged) {
-                _context.next = 59;
+                _context.next = 89;
                 break;
               }
-              _context.next = 59;
+              _context.next = 89;
               return setHandlerInstance.updateArticlesOptionStatesOfActSet(set, originalVariantValues, [targetArticle.basketId], true, 'calcVariant');
-            case 59:
-              for (_i = 0; _i < configItems.length; _i++) {
-                if (configItems[_i].codex == (selectedOpv === null || selectedOpv === void 0 ? void 0 : selectedOpv.codex)) {
+            case 89:
+              for (i = 0; i < configItems.length; i++) {
+                if (configItems[i].codex == (selectedOpv === null || selectedOpv === void 0 ? void 0 : selectedOpv.codex)) {
                   selectedItems = [selectedOpv.codex];
-                  configItems[_i].sel = true;
+                  configItems[i].sel = true;
                 }
               }
               timeDiff = Date.now() - totalTime;
               LOG$a.debug('calculating for merge to opg', 'totalTime', timeDiff + 'ms');
-            case 62:
+            case 92:
               return _context.abrupt("return", {
                 configItems: configItems,
                 option: optionCodex ? set.CatalogData.getOption(optionCodex) : undefined,
@@ -34909,17 +35173,16 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }),
                 notTotallyMatichingOPVs: !set.CatalogData.articleConfigAll ? retValues.notTotallyMatichingOPVs : undefined
               });
-            case 65:
-              _configItems = [];
+            case 95:
               return _context.abrupt("return", {
-                configItems: _configItems,
+                configItems: [],
                 selectedItems: []
               });
-            case 67:
+            case 96:
             case "end":
               return _context.stop();
           }
-        }, _callee, this);
+        }, _callee, this, [[13, 27, 30, 33], [56, 80, 83, 86]]);
       }));
       function getConifgItemsForView(_x, _x2) {
         return _getConifgItemsForView.apply(this, arguments);
@@ -34931,7 +35194,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     value: function getConfigItems(key, articles, configTree) {
       var step = configTree.getAllByKey(key);
       if (step != null) {
-        var configItems = {},
+        var configItems = new Map(),
           visibleOptionValuesOfArticles = [],
           constructionRules = {},
           selectedVals = [],
@@ -34959,28 +35222,37 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             //get schnittmenge of all the articles
             if (i === 0) {
               constructionRules = myOptionState.constructionRules;
-              configItems = _objectSpread$a({}, myOptionState.visibleOptionValues);
+              configItems = new Map(myOptionState.visibleOptionValues);
             } else {
-              for (var _key2 in configItems) {
-                if (!myOptionState.visibleOptionValues[_key2]) {
-                  delete configItems[_key2];
+              var _iterator4 = _createForOfIteratorHelper$2(configItems.keys()),
+                _step4;
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  var _key2 = _step4.value;
+                  if (!myOptionState.visibleOptionValues.get(_key2)) {
+                    configItems["delete"](_key2);
+                  }
                 }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
               }
             }
           } else if (i == 0 && configStep.targetArticles.length == 1) {
             constructionRules = myOptionState.constructionRules;
-            configItems = myOptionState.visibleOptionValues;
+            configItems = new Map(myOptionState.visibleOptionValues);
           } else {
             visibleOptionValuesOfArticles.push(myOptionState.visibleOptionValues);
           }
         }
         if (visibleOptionValuesOfArticles.length > 0) {
-          configItems = Object.assign({}, visibleOptionValuesOfArticles[0]);
+          configItems = new Map(visibleOptionValuesOfArticles[0]);
           var _loop4 = function _loop4(_i2) {
             var _articles$configStep$;
             if ((_articles$configStep$ = articles[configStep.targetArticles[_i2]].getArticleOptionStateFlat(configStep.option)) !== null && _articles$configStep$ !== void 0 && _articles$configStep$.definedBySetFeatureFixed) return 1; // continue
-            var keys = Object.keys(configItems);
-            var newKeys = Object.keys(visibleOptionValuesOfArticles[_i2]);
+            var keys = Array.from(configItems.keys());
+            var newKeys = Array.from(visibleOptionValuesOfArticles[_i2].keys());
             var opvsOnlyInA = keys.filter(function (x) {
               return !newKeys.includes(x);
             });
@@ -34989,9 +35261,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             });
             if (opvsOnlyInA.length && opvsOnlyInB.length) {
               var _loop5 = function _loop5() {
-                var opva = configItems[opvsOnlyInA[j]];
+                var opva = configItems.get(opvsOnlyInA[j]);
+                if (!opva) return 1; // continue
                 var sameOPVExists = opvsOnlyInB.find(function (opvb) {
-                  return opva.sameopv && opva.sameopv == visibleOptionValuesOfArticles[_i2][opvb].sameopv;
+                  var _visibleOptionValuesO;
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO === void 0 ? void 0 : _visibleOptionValuesO.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInA.splice(j, 1);
@@ -34999,14 +35273,15 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
                 }
               };
               for (var j = opvsOnlyInA.length - 1; j >= 0; j--) {
-                _loop5();
+                if (_loop5()) continue;
               }
             } else if (opvsOnlyInA.length) {
               var _loop6 = function _loop6() {
-                var opva = configItems[opvsOnlyInA[_j]];
+                var opva = configItems.get(opvsOnlyInA[_j]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = newKeys.find(function (opvb) {
-                  return opva.sameopv && opva.sameopv == visibleOptionValuesOfArticles[_i2][opvb].sameopv;
+                  var _visibleOptionValuesO2;
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO2 = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO2 === void 0 ? void 0 : _visibleOptionValuesO2.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInA.splice(_j, 1);
@@ -35017,10 +35292,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
               }
             } else if (opvsOnlyInB.length) {
               var _loop7 = function _loop7() {
-                var opva = configItems[opvsOnlyInB[_j2]];
+                var opva = configItems.get(opvsOnlyInB[_j2]);
                 if (!opva) return 1; // continue
                 var sameOPVExists = keys.find(function (opvb) {
-                  return opva.sameopv && opva.sameopv == visibleOptionValuesOfArticles[_i2][opvb].sameopv;
+                  var _visibleOptionValuesO3;
+                  return opva.sameopv && opva.sameopv == ((_visibleOptionValuesO3 = visibleOptionValuesOfArticles[_i2].get(opvb)) === null || _visibleOptionValuesO3 === void 0 ? void 0 : _visibleOptionValuesO3.sameopv);
                 });
                 if (sameOPVExists) {
                   opvsOnlyInB.splice(_j2, 1);
@@ -35065,11 +35341,11 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
         ret = false;
       var articles = set.getDivaArticles();
       for (var basketId in articles) {
-        var _iterator2 = _createForOfIteratorHelper$2(articles[basketId].articleOptionStates),
-          _step2;
+        var _iterator5 = _createForOfIteratorHelper$2(articles[basketId].articleOptionStates.values()),
+          _step5;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var ops = _step2.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var ops = _step5.value;
             if (ops.headerPosVariationType == 'K') {
               if (optionValues[ops.optionCodex] == undefined) {
                 optionValues[ops.optionCodex] = ops.valCodex ? ops.valCodex : null;
@@ -35082,9 +35358,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator2.f();
+          _iterator5.f();
         }
         if (ret == true) break;
       }
@@ -35096,16 +35372,17 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
     //bei einer OPG wird hier dessen hauptoptionCodex Übergeben
     idmOpgGroupName, idmOpgValCodex, idmOpgOptionCodex, freeTextValue, freeTextLang) {
       var myConfigItemsForView = [];
-      var objectKeys = Object.keys(myConfigItems);
-      var groupContentItemIdObject = this.getGroupContentItemIdObject(Object.values(myConfigItems), idmOpgGroupName);
+      var objectKeys = Array.from(myConfigItems.keys());
+      var groupContentItemIdObject = this.getGroupContentItemIdObject(Array.from(myConfigItems.values()), idmOpgGroupName);
       var _loop8 = function _loop8() {
         var _ops$optionOcd3, _item$images, _item$colorGroups, _item$pdfUrl, _item$url;
-        var item = myConfigItems[objectKeys[i]];
+        var item = myConfigItems.get(objectKeys[i]);
+        if (!item) throw new Error('item ' + objectKeys[i] + ' not found in myConfigItems');
         var key = objectKeys[i];
         var groupName = item.groupName ? item.groupName : idmOpgGroupName;
         if (!selectedVals.find(function (opv) {
-          var _myConfigItems$opv, _myConfigItems$opv2;
-          return opv == item.codex || ((_myConfigItems$opv = myConfigItems[opv]) === null || _myConfigItems$opv === void 0 ? void 0 : _myConfigItems$opv.ocd) && ((_myConfigItems$opv2 = myConfigItems[opv]) === null || _myConfigItems$opv2 === void 0 ? void 0 : _myConfigItems$opv2.ocd) === item.codex;
+          var _myConfigItems$get, _myConfigItems$get2;
+          return opv == item.codex || ((_myConfigItems$get = myConfigItems.get(opv)) === null || _myConfigItems$get === void 0 ? void 0 : _myConfigItems$get.ocd) && ((_myConfigItems$get2 = myConfigItems.get(opv)) === null || _myConfigItems$get2 === void 0 ? void 0 : _myConfigItems$get2.ocd) === item.codex;
         }) && (ops.definedBySetFeatureFixed || item.hiddenByMask)) return 1; // continue
         var image = item.image ? set.CatalogData.getCatImageURL(item.image, '_gal') : '';
         var zoomImage = undefined;
@@ -35113,8 +35390,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
           zoomImage = image;
           image = set.CatalogData.getCatImageURL(item.zoomImage, '_gal');
         }
-        if (ops.visibleOPVsImages[item.codex]) {
-          image = ops.visibleOPVsImages[item.codex];
+        var imageFromVisibleOPVsImages = ops.visibleOPVsImages.get(item.codex);
+        if (imageFromVisibleOPVsImages) {
+          image = imageFromVisibleOPVsImages;
         }
         var isFav = favoritesHandlerInstance.isFavorite(set, targetArticles, item, (_ops$optionOcd3 = ops.optionOcd) !== null && _ops$optionOcd3 !== void 0 ? _ops$optionOcd3 : optionCodex);
         var isSelected = !!selectedVals.find(function (opv) {
@@ -35203,12 +35481,12 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
       for (var iKey in optionStatesOfArticles) {
         //hier evtl. die Article mit einer gewissen reihenfolge durchlaufen!
         var optionsStates = optionStatesOfArticles[iKey];
-        var _iterator3 = _createForOfIteratorHelper$2(optionsStates),
-          _step3;
+        var _iterator6 = _createForOfIteratorHelper$2(optionsStates.values()),
+          _step6;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
             var _ops$addToMeasure2;
-            var ops = _step3.value;
+            var ops = _step6.value;
             var selectionmode = ops.selectionmode;
             if (set.CatalogData.forceConfigSingle && (selectionmode == 1 || selectionmode == 2)) selectionmode = 3;
             if (ops.isInvisible || selectionmode == 0 || !ops.isDoShow || ops.visibleCount == 0 || !!((_ops$addToMeasure2 = ops.addToMeasure) !== null && _ops$addToMeasure2 !== void 0 && _ops$addToMeasure2.length)) {
@@ -35216,9 +35494,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator6.e(err);
         } finally {
-          _iterator3.f();
+          _iterator6.f();
         }
       }
       return configTree;
@@ -39339,7 +39617,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
       var article = set.getDivaArticles()[Object.keys(set.getDivaArticles())[0]];
       var opsKeys = article.articleOptionStatesKeys;
       var sapCount = 0;
-      var _iterator = _createForOfIteratorHelper$1(article.articleOptionStates),
+      var _iterator = _createForOfIteratorHelper$1(article.articleOptionStates.values()),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -39463,7 +39741,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               break;
             case 3:
               _context12.next = 5;
-              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-4058e465.js'); });
+              return Promise.resolve().then(function () { return require('./PfisterWWSHandler-e44293f5.js'); });
             case 5:
               _yield$import = _context12.sent;
               PfisterWWSHandler = _yield$import["default"];
@@ -39471,7 +39749,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 9:
               _context12.next = 11;
-              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-17894cd1.js'); });
+              return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-47a27ec7.js'); });
             case 11:
               _yield$import2 = _context12.sent;
               LiviqueWWSHandler = _yield$import2["default"];
@@ -39479,7 +39757,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 15:
               _context12.next = 17;
-              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-c8e698e9.js'); });
+              return Promise.resolve().then(function () { return require('./SeriousBasketHandler-6934e260.js'); });
             case 17:
               _yield$import3 = _context12.sent;
               SeriousWWSHandler = _yield$import3["default"];
@@ -39487,7 +39765,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
               return _context12.abrupt("break", 27);
             case 21:
               _context12.next = 23;
-              return Promise.resolve().then(function () { return require('./StandardWWSHandler-faeb77e7.js'); });
+              return Promise.resolve().then(function () { return require('./StandardWWSHandler-5dd8d94a.js'); });
             case 23:
               _yield$import4 = _context12.sent;
               StandardWWSHandler = _yield$import4["default"];
@@ -40916,7 +41194,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return Promise.resolve().then(function () { return require('./Host3DSignalR-eea7d1d4.js'); });
+              return Promise.resolve().then(function () { return require('./Host3DSignalR-57e23024.js'); });
             case 2:
               _yield$import = _context3.sent;
               Host3DSignalR = _yield$import["default"];
@@ -42474,7 +42752,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               break;
             case 8:
               _context4.next = 10;
-              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-e6e39978.js'); });
+              return Promise.resolve().then(function () { return require('./DivaStandardPlanner-77476193.js'); });
             case 10:
               _yield$import = _context4.sent;
               DivaStandardPlanner = _yield$import["default"];
@@ -42485,7 +42763,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
               return _context4.abrupt("break", 21);
             case 15:
               _context4.next = 17;
-              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-1364c551.js'); });
+              return Promise.resolve().then(function () { return require('./DivaBoxPlanner-04bf6318.js'); });
             case 17:
               _yield$import2 = _context4.sent;
               DivaBoxPlanner = _yield$import2["default"];
@@ -47626,7 +47904,7 @@ var Grid = /*#__PURE__*/function () {
                         _context4.next = 18;
                         break;
                       }
-                      if (montageOptionState) montageOptionState.val = montageOptionState.visibleOptionValues[mitCodex];
+                      if (montageOptionState) montageOptionState.val = montageOptionState.visibleOptionValues.get(mitCodex);
                       _context4.next = 15;
                       return _this.updateAccessoireMontageOption((!isIDM ? 'OPT' : '') + optionCodex, mitCodex, specificAccessoire);
                     case 15:
@@ -47634,7 +47912,7 @@ var Grid = /*#__PURE__*/function () {
                       _context4.next = 21;
                       break;
                     case 18:
-                      if (montageOptionState) montageOptionState.val = montageOptionState.visibleOptionValues[ohneCodex];
+                      if (montageOptionState) montageOptionState.val = montageOptionState.visibleOptionValues.get(ohneCodex);
                       _context4.next = 21;
                       return _this.updateAccessoireMontageOption((!isIDM ? 'OPT' : '') + optionCodex, ohneCodex, []);
                     case 21:
@@ -63782,6 +64060,7 @@ var a$5 = {
     },
     settings: {
       dontLoadAdditionalModelInfos: true,
+      dontLoadCatalogEditorLiteMask: true,
       identifier: 'PfisterWebPlanner',
       type: 'DIVA_WEBPLANNER',
       configParams: {
@@ -63852,6 +64131,7 @@ var a$4 = {
     },
     settings: {
       dontLoadAdditionalModelInfos: true,
+      dontLoadCatalogEditorLiteMask: true,
       identifier: 'Seller',
       type: 'DIVA_WEBPLANNER',
       configParams: {
@@ -63911,6 +64191,7 @@ var a$3 = {
     },
     settings: {
       dontLoadAdditionalModelInfos: true,
+      dontLoadCatalogEditorLiteMask: true,
       configParams: {
         mediaServiceApiKey: '620e074df81de00012ef47ed.wUyoXTbh4tR3DklrzvvdxFveVK9zcj4H',
         // api2devKey: '627b71be68f4c30011dd25e2.I2RdwvdHG4gruMNr6l810tTU5x7afNMm',