diff --git a/tests/action_matrix/baseline.json b/tests/action_matrix/baseline.json
index 93b1fc1b..a4728f80 100644
--- a/tests/action_matrix/baseline.json
+++ b/tests/action_matrix/baseline.json
@@ -718,7 +718,7 @@
    "Body2/F3:-z|F4:side#2": "edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body2/F4:side#1": "curved.axis curved.tangent_plane",
    "Body2/F4:side#2": "curved.axis curved.tangent_plane",
-   "Body2/F6:blend:F3:+z|F3:-x": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Body2/F6:blend:F3:+z|F3:-x": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Body2/body": "body.copy body.mirror body.move body.pattern",
    "Body2/v[F3:+x & F3:+y & F3:+z]": "vertex.plane_three_points vertex.point",
    "Body2/v[F3:+x & F3:+y & F3:-z]": "vertex.plane_three_points vertex.point",
@@ -1297,7 +1297,7 @@
    "Body1/F2:top#[F2:side:l3,F4:side:l3]|F4:side:l3": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F2:top#[F2:side:l3,F4:side:l3]|F6:blend:F2:side:l3|F2:top#[F2:side:l3,F4:side:l3]": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F4:side:l3": "face.angle_plane face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
-   "Body1/F6:blend:F2:side:l3|F2:top#[F2:side:l3,F4:side:l3]": "face.angle_plane face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Body1/F6:blend:F2:side:l3|F2:top#[F2:side:l3,F4:side:l3]": "face.angle_plane face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Body1/body": "body.copy body.mirror body.move body.pattern",
    "Body1/v[F2:side:l2#[F2:side:l3,F4:side:l3] & F2:side:l3 & F2:start#[F2:side:l3,F4:side:l3]]": "vertex.plane_three_points vertex.point",
    "Body1/v[F2:side:l2#[F2:side:l3,F4:side:l3] & F2:side:l3 & F6:blend:F2:side:l3|F2:top#[F2:side:l3,F4:side:l3]]": "vertex.plane_three_points vertex.point",
@@ -3077,7 +3077,7 @@
    "Case/v[F4:inner:F2:side:l1 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#1 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#2]": "vertex.point",
    "Case/v[F4:inner:F2:side:l1 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#1 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#[F4:inner:F2:start]]": "vertex.point",
    "Case/v[F4:inner:F2:side:l1 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#2 & F4:inner:F3:blend:F2:side:l1|F2:side:l4#[F2:top]]": "vertex.point",
-   "Lid/F14:side:l1": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.hole+edit face.midplane face.offset_plane face.press_pull face.shell face.shell+edit face.sketch",
+   "Lid/F14:side:l1": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.hole+edit face.midplane face.offset_plane !face.press_pull face.shell face.shell+edit face.sketch",
    "Lid/F14:side:l1|F14:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F14:side:l1|F15:blend:F14:side:l1|F14:side:l2": "edge.axis edge.normal_plane edge.project",
    "Lid/F14:side:l1|F15:blend:F14:side:l1|F14:side:l4": "edge.axis edge.normal_plane edge.project",
@@ -3087,7 +3087,7 @@
    "Lid/F14:side:l2|F15:blend:F14:side:l1|F14:side:l2": "edge.axis edge.normal_plane edge.project edge.project+edit",
    "Lid/F14:side:l2|F15:blend:F14:side:l2|F14:side:l3": "edge.axis edge.axis+edit edge.normal_plane edge.project edge.project+edit",
    "Lid/F14:side:l2|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
-   "Lid/F14:side:l3": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude face.hole face.hole+edit face.midplane face.offset_plane face.press_pull face.shell face.sketch",
+   "Lid/F14:side:l3": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude face.hole face.hole+edit face.midplane face.offset_plane !face.press_pull face.shell face.sketch",
    "Lid/F14:side:l3|F14:top": "edge.axis edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.normal_plane+edit edge.project",
    "Lid/F14:side:l3|F15:blend:F14:side:l2|F14:side:l3": "edge.axis edge.normal_plane edge.project",
    "Lid/F14:side:l3|F15:blend:F14:side:l3|F14:side:l4": "edge.axis edge.normal_plane edge.project",
@@ -3097,7 +3097,7 @@
    "Lid/F14:side:l4|F15:blend:F14:side:l1|F14:side:l4": "edge.axis edge.axis+edit edge.normal_plane edge.project",
    "Lid/F14:side:l4|F15:blend:F14:side:l3|F14:side:l4": "edge.axis edge.normal_plane edge.project",
    "Lid/F14:side:l4|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Lid/F14:start": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude !face.hole face.midplane face.offset_plane !face.press_pull face.shell face.shell+edit face.sketch face.sketch+edit",
+   "Lid/F14:start": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude !face.hole face.midplane face.offset_plane !face.press_pull face.shell !face.shell+edit face.sketch face.sketch+edit",
    "Lid/F14:start|F18:side:a17": "edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F14:start|F18:side:a18": "edge.chamfer edge.chamfer+edit edge.fillet edge.normal_plane edge.project",
    "Lid/F14:start|F18:side:a19": "edge.chamfer edge.fillet edge.normal_plane edge.project edge.project+edit",
@@ -3174,24 +3174,24 @@
    "Lid/F18:side:l13": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.midplane face.offset_plane face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l13|F18:top": "edge.axis edge.axis+edit edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F18:side:l13|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
-   "Lid/F18:side:l14": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude face.hole face.midplane face.offset_plane !face.press_pull !face.shell face.sketch",
+   "Lid/F18:side:l14": "face.angle_plane face.angle_plane+edit !face.draft_neutral !face.extrude !face.hole face.midplane face.offset_plane !face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l14|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F18:side:l14|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F18:side:l15": "face.angle_plane !face.draft_neutral !face.extrude !face.hole face.midplane face.offset_plane !face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l15|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F18:side:l15|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Lid/F18:side:l16": "face.angle_plane face.angle_plane+edit !face.draft_neutral face.extrude face.hole face.midplane face.midplane+edit face.offset_plane face.press_pull !face.shell face.sketch",
+   "Lid/F18:side:l16": "face.angle_plane face.angle_plane+edit !face.draft_neutral face.extrude !face.hole face.midplane face.midplane+edit face.offset_plane face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l16|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
    "Lid/F18:side:l16|F2:top": "edge.axis edge.axis+edit edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Lid/F18:side:l17": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l17|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Lid/F18:side:l18": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull !face.shell face.sketch face.sketch+edit",
+   "Lid/F18:side:l18": "face.angle_plane !face.draft_neutral !face.extrude !face.hole face.offset_plane !face.press_pull !face.shell face.sketch face.sketch+edit",
    "Lid/F18:side:l18|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
-   "Lid/F18:side:l19": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
+   "Lid/F18:side:l19": "face.angle_plane !face.draft_neutral !face.extrude !face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l19|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Lid/F18:side:l20": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
+   "Lid/F18:side:l20": "face.angle_plane !face.draft_neutral !face.extrude !face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
    "Lid/F18:side:l20|F18:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Lid/F18:top": "face.angle_plane !face.draft_neutral face.extrude face.hole face.midplane face.offset_plane face.press_pull face.press_pull+edit !face.shell face.sketch",
+   "Lid/F18:top": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.midplane face.offset_plane face.press_pull face.press_pull+edit !face.shell face.sketch",
    "Lid/F20:side:ls#1": "!curved.axis curved.tangent_plane",
    "Lid/F20:side:ls#2": "!curved.axis curved.tangent_plane",
    "Lid/F20:side:ls@F21.1#1": "!curved.axis curved.tangent_plane curved.tangent_plane+edit",
@@ -7843,7 +7843,7 @@
    "Shaft/F6:side:a2|F6:side:l1": "edge.axis edge.normal_plane edge.project",
    "Shaft/F6:side:a2|F6:side:l2": "edge.axis edge.normal_plane edge.project",
    "Shaft/F6:side:l1": "face.angle_plane !face.draft_neutral !face.extrude !face.hole face.midplane face.offset_plane !face.press_pull !face.shell face.sketch",
-   "Shaft/F6:side:l2": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane face.press_pull !face.shell face.sketch",
+   "Shaft/F6:side:l2": "face.angle_plane !face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull !face.shell face.sketch",
    "Shaft/body": "body.copy body.mirror body.move body.pattern",
    "Shaft/v[F2:side:l1 & F3:blend:F2:side:l1|F2:side:l2#1 & F3:blend:F2:side:l1|F2:side:l2#2]": "vertex.plane_three_points vertex.point",
    "Shaft/v[F2:side:l1 & F3:blend:F2:side:l1|F2:side:l2#1 & F3:blend:F2:side:l1|F2:side:l2#3]": "vertex.plane_three_points vertex.point",
@@ -10073,12 +10073,12 @@
    "Body1/F9:end|F9:side:l2": "edge.axis edge.normal_plane edge.project",
    "Body1/F9:end|F9:side:l3": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F9:end|F9:side:l4": "edge.axis edge.normal_plane edge.project",
-   "Body1/F9:side:l1": "face.angle_plane face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Body1/F9:side:l1": "face.angle_plane face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Body1/F9:side:l1|F9:side:l2": "edge.axis !edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F9:side:l1|F9:side:l4": "edge.axis !edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F9:side:l2": "face.angle_plane face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Body1/F9:side:l2|F9:side:l3": "edge.axis !edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Body1/F9:side:l3": "face.angle_plane face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Body1/F9:side:l3": "face.angle_plane face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Body1/F9:side:l3|F9:side:l4": "edge.axis !edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Body1/F9:side:l4": "face.angle_plane face.extrude !face.hole face.offset_plane face.press_pull !face.shell face.sketch",
    "Body1/body": "body.copy body.mirror body.move body.pattern",
@@ -10150,14 +10150,14 @@
    "Tool/F2:side:a1|F2:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:a1|F2:top": "edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:a1|F4:side:l1": "edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l1": "face.angle_plane !face.draft_neutral face.extrude face.hole face.midplane face.offset_plane face.press_pull !face.shell face.sketch",
+   "Tool/F2:side:l1": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.midplane face.offset_plane face.press_pull !face.shell face.sketch",
    "Tool/F2:side:l1|F2:side:l2": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l1|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l1|F4:side:l1": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l2": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Tool/F2:side:l2": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Tool/F2:side:l2|F2:side:l3": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l2|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l3": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull !face.shell face.sketch",
+   "Tool/F2:side:l3": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull !face.shell face.sketch",
    "Tool/F2:side:l3|F2:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l3|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l3|F4:side:l1": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
@@ -10187,7 +10187,7 @@
    "ClipBody/F4:bottom|F4:side:l2": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "ClipBody/F4:bottom|F4:side:l3": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "ClipBody/F4:bottom|F4:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "ClipBody/F4:side:l1": "face.angle_plane face.draft_neutral !face.extrude face.hole face.offset_plane !face.press_pull face.shell face.sketch",
+   "ClipBody/F4:side:l1": "face.angle_plane face.draft_neutral !face.extrude !face.hole face.offset_plane !face.press_pull face.shell face.sketch",
    "ClipBody/F4:side:l1|F4:side:l2": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "ClipBody/F4:side:l1|F4:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "ClipBody/F4:side:l1|F4:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
@@ -10219,18 +10219,18 @@
    "Tool/F2:side:a1|F2:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:a1|F2:top": "edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:a1|F4:side:l1": "edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l1": "face.angle_plane !face.draft_neutral face.extrude face.hole face.midplane face.offset_plane face.press_pull !face.shell face.sketch",
+   "Tool/F2:side:l1": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.midplane face.offset_plane face.press_pull !face.shell face.sketch",
    "Tool/F2:side:l1|F2:side:l2": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l1|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l1|F4:side:l1": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l2": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
+   "Tool/F2:side:l2": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull face.shell face.sketch",
    "Tool/F2:side:l2|F2:side:l3": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l2|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l3": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull !face.shell face.sketch",
+   "Tool/F2:side:l3": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull !face.shell face.sketch",
    "Tool/F2:side:l3|F2:side:l4": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l3|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l3|F4:side:l1": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
-   "Tool/F2:side:l4": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull !face.shell face.sketch",
+   "Tool/F2:side:l4": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull !face.shell face.sketch",
    "Tool/F2:side:l4|F2:top": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:side:l4|F4:side:l1": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project",
    "Tool/F2:top": "face.angle_plane !face.draft_neutral face.extrude !face.hole face.offset_plane face.press_pull !face.shell face.sketch",