diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index ce17d1cbdb..c8d97a392b 100755
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -665,7 +665,6 @@
                             "value": "line_width",
                             "default_value": 0.4,
                             "type": "float",
-                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -864,46 +863,29 @@
             "type": "category",
             "children":
             {
-                "wall_extruder_nr":
+                "wall_0_extruder_nr":
                 {
-                    "label": "Wall Extruder",
-                    "description": "The extruder train used for printing the walls. This is used in multi-extrusion.",
+                    "label": "Outer Wall Extruder",
+                    "description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.",
                     "type": "optional_extruder",
                     "default_value": "-1",
                     "settable_per_mesh": true,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": true,
                     "settable_globally": true,
-                    "enabled": "machine_extruder_count > 1",
-                    "children":
-                    {
-                        "wall_0_extruder_nr":
-                        {
-                            "label": "Outer Wall Extruder",
-                            "description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.",
-                            "type": "optional_extruder",
-                            "default_value": "-1",
-                            "value": "wall_extruder_nr",
-                            "settable_per_mesh": true,
-                            "settable_per_extruder": false,
-                            "settable_per_meshgroup": true,
-                            "settable_globally": true,
-                            "enabled": "machine_extruder_count > 1"
-                        },
-                        "wall_x_extruder_nr":
-                        {
-                            "label": "Inner Walls Extruder",
-                            "description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.",
-                            "type": "optional_extruder",
-                            "default_value": "-1",
-                            "value": "wall_extruder_nr",
-                            "settable_per_mesh": true,
-                            "settable_per_extruder": false,
-                            "settable_per_meshgroup": true,
-                            "settable_globally": true,
-                            "enabled": "machine_extruder_count > 1"
-                        }
-                    }
+                    "enabled": "machine_extruder_count > 1"
+                },
+                "wall_x_extruder_nr":
+                {
+                    "label": "Inner Walls Extruder",
+                    "description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.",
+                    "type": "optional_extruder",
+                    "default_value": "-1",
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": true,
+                    "settable_globally": true,
+                    "enabled": "machine_extruder_count > 1"
                 },
                 "wall_thickness":
                 {
@@ -915,7 +897,7 @@
                     "minimum_value_warning": "line_width",
                     "maximum_value_warning": "10 * line_width",
                     "type": "float",
-                    "limit_to_extruder": "wall_extruder_nr",
+                    "limit_to_extruder": "wall_x_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -929,7 +911,7 @@
                             "maximum_value_warning": "10",
                             "type": "int",
                             "value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0",
-                            "limit_to_extruder": "wall_extruder_nr",
+                            "limit_to_extruder": "wall_x_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1166,7 +1148,7 @@
                     "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.",
                     "type": "bool",
                     "default_value": true,
-                    "limit_to_extruder": "wall_extruder_nr",
+                    "limit_to_extruder": "wall_x_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -2043,7 +2025,6 @@
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
-                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2396,7 +2377,6 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled')",
-                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2702,7 +2682,6 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled')",
-                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {