diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
index 712e23371..5f82a69de 100644
--- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
+++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
@@ -796,7 +796,7 @@ width="3454" height="2449" viewBox="-100 -100 3454 2449">customerissuerstore1Like starbucks or somethingacquirer2I'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occur
+customerissuerstore1Like starbucks or somethingacquirer2I'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occur
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
index 899feb414..1c87797cd 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json
@@ -30,7 +30,6 @@
"Host": "icons.terrastruct.com",
"Path": "/infra/019-network.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -82,7 +81,6 @@
"Host": "icons.terrastruct.com",
"Path": "/infra/019-network.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg
index 692e85ece..3b4217d31 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg
@@ -18,7 +18,7 @@ width="488" height="328" viewBox="-100 -100 488 328">
+
\ No newline at end of file
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
index b1fbe48ae..bdd6a327a 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json
@@ -30,7 +30,6 @@
"Host": "icons.terrastruct.com",
"Path": "/infra/019-network.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -82,7 +81,6 @@
"Host": "icons.terrastruct.com",
"Path": "/infra/019-network.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg
index 6cf3165f8..7080fd426 100644
--- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg
+++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg
@@ -18,7 +18,7 @@ width="448" height="328" viewBox="-88 -88 448 328">
+
\ No newline at end of file
diff --git a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
index 2f5d36bbb..80a0cdd50 100644
--- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
+++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json
@@ -30,7 +30,6 @@
"Host": "icons.terrastruct.com",
"Path": "/infra/019-network.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "fuga=1&hoge",
"Fragment": "",
diff --git a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg
index 4e2114b65..c333036cd 100644
--- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg
@@ -18,7 +18,7 @@ width="390" height="352" viewBox="-100 -100 390 352">my network
+my network
my network
+my network
hello
+hello
hello
+hello
ab
+ab
ab
+ab
aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456
+aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456
diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json
index 1714dbcd0..d52023422 100644
--- a/e2etests/testdata/stable/investigate/elk/board.exp.json
+++ b/e2etests/testdata/stable/investigate/elk/board.exp.json
@@ -481,7 +481,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/time.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -575,7 +574,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/time.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg
index 84ccb04ba..2d5155582 100644
--- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg
@@ -18,7 +18,7 @@ width="894" height="4930" viewBox="-88 -88 894 4930">aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456
+aabbccddllffwwyyadnniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac 123456
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
index 8b76ab744..ebbcd4a94 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
@@ -30,7 +30,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -124,7 +123,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -218,7 +216,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -312,7 +309,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -365,7 +361,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -459,7 +454,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -553,7 +547,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -606,7 +599,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
index 44f3bfa3d..7e2735094 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
@@ -18,7 +18,7 @@ width="1312" height="1416" viewBox="-100 -100 1312 1416">rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root
+rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
index e298dad43..0d5d35a25 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json
@@ -30,7 +30,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -124,7 +123,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -218,7 +216,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -312,7 +309,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -365,7 +361,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -459,7 +454,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -553,7 +547,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
@@ -606,7 +599,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg
index 06658bb1f..173ad73c2 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg
@@ -18,7 +18,7 @@ width="1522" height="1503" viewBox="-88 -88 1522 1503">rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root
+rootcontainerrootleftrightrootinnerrootinnerleftrightleftright to inner leftto inner rightto inner leftto inner rightto left container rootto right container root
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
index d1cc5c32a..85b572cf3 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json
@@ -413,7 +413,6 @@
"Host": "icons.terrastruct.com",
"Path": "/essentials/004-picture.svg",
"RawPath": "",
- "OmitHost": false,
"ForceQuery": false,
"RawQuery": "",
"Fragment": "",
diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
index 0683606be..3aa758130 100644
--- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
@@ -28,7 +28,7 @@ width="5177" height="2984" viewBox="-76 -26 5177 2984">