diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go
index b61c6bb89c..8c5f50f967 100644
--- a/d2ast/d2ast.go
+++ b/d2ast/d2ast.go
@@ -1081,12 +1081,11 @@ type InterpolationBox struct {
 // & is only special if it begins a key.
 // - is only special if followed by another - in a key.
 // ' " and | are only special if they begin an unquoted key or value.
-var UnquotedKeySpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', ':', '.', '-', '<', '>', '*', '&', '(', ')', '@'})
+var UnquotedKeySpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', ':', '.', '-', '<', '>', '*', '&', '(', ')', '@', '&'})
 var UnquotedValueSpecials = string([]rune{'#', ';', '\n', '\\', '{', '}', '[', ']', '\'', '"', '|', '$', '@'})
 
 // RawString returns s in a AST String node that can format s in the most aesthetically
 // pleasing way.
-// TODO: Return StringBox
 func RawString(s string, inKey bool) String {
 	if s == "" {
 		return FlatDoubleQuotedString(s)
@@ -1099,10 +1098,6 @@ func RawString(s string, inKey bool) String {
 				if i+1 < len(s) && s[i+1] != '-' {
 					continue
 				}
-			case '&':
-				if i > 0 {
-					continue
-				}
 			}
 			if strings.ContainsRune(UnquotedKeySpecials, r) {
 				if !strings.ContainsRune(s, '"') {