diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
index ed6f5a0c5e..0d39ffadac 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
index 2aebe1e918..7589c59364 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 speed_wall_x = =math.ceil(speed_print * 30 / 35)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
index 78ffe10ce9..91f932df98 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
index 2099ea7cbf..d7989f9f3b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
index bf4be03a20..8d7471ccd1 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
@@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
index f1dd92db53..8a3ff137f1 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
@@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
index 2fd638f0e9..7026181d38 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
@@ -34,7 +34,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
index d7a64e12c8..d11a53640d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
@@ -34,7 +34,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
index d62a4e79ee..5497712600 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
@@ -33,7 +33,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
index a6161c2a07..b966c9132a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
@@ -32,7 +32,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
index dbb90918b8..55a067f3aa 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.55
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.55
 support_xy_distance = 0.7
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
index 172ef69c01..744985a7fc 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
index c85bacb89e..f9510aa268 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
index 153f206b19..548f61df37 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
index 062e7f97b5..43e6ffd774 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
@@ -30,7 +30,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
index 20ab28f97b..cf67cdf35c 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
@@ -30,7 +30,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
index 249bfb9053..3c3b01cf4b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
@@ -31,7 +31,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
index 86a2dabb6f..2ef73c0ba6 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
@@ -31,7 +31,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
index 95bbbff2d3..ed02c4d22a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
index c4f451d972..75edf9330b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
index c9fe800c7b..72ef057e7e 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
@@ -30,7 +30,7 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =0 if support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
index f03f8ca03d..0948aa2af5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40)
 speed_wall_x = =math.ceil(speed_print * 38 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
index 40e8daa71f..c14808ccde 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
@@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =math.ceil(speed_print * 35 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.65
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2