diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index d5c143a998..bab76c1216 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -577,7 +577,7 @@
       recursiveSorting(arr, scenarioProjectId) {
         for (let i in arr) {
           arr[i].index = Number(i) + 1;
-          if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].hashTree && arr[i].hashTree.length > 1) {
+          if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].loopType === "LOOP_COUNT" && arr[i].hashTree && arr[i].hashTree.length > 1) {
             arr[i].countController.proceed = true;
           }
           if (!arr[i].projectId) {
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
index d028acef6b..76222ef456 100644
--- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -45,7 +45,7 @@
             this.$emit('remove');
             break;
           case "scenarioVar":
-            this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, true);
+            this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, this.data.referenced === 'REF');
             break;
           case "openScenario":
             this.getScenario();
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index 65559c659d..4b2911fb5f 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -493,7 +493,7 @@
       recursiveSorting(arr, scenarioProjectId) {
         for (let i in arr) {
           arr[i].index = Number(i) + 1;
-          if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].hashTree && arr[i].hashTree.length > 1) {
+          if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].loopType === "LOOP_COUNT" && arr[i].hashTree && arr[i].hashTree.length > 1) {
             arr[i].countController.proceed = true;
           }
           if (!arr[i].projectId) {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 2115bd28a9..07951ba17a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 2115bd28a90854d2b6276a90878934715498c584
+Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd