diff --git a/runner/md_output.go b/runner/md_output.go
index 4b57777..3428210 100644
--- a/runner/md_output.go
+++ b/runner/md_output.go
@@ -8,23 +8,9 @@ import (
 
 func MarkdownHeader(r Result) string {
 	var b strings.Builder
-
-	b.WriteString("| URL | Status | Method | IP | Size | Words | Lines |")
-	if r.Title != "" {
-		b.WriteString(" Title |")
-	}
-	if r.CDNName != "" {
-		b.WriteString(" CDN |")
-	}
+	b.WriteString("| URL | Status | Method | IP | Size | Words | Lines | Title | CDN |")
 	b.WriteString("\n")
-
-	b.WriteString("|---|---|---|---|---|---|---|")
-	if r.Title != "" {
-		b.WriteString("---|")
-	}
-	if r.CDNName != "" {
-		b.WriteString("---|")
-	}
+	b.WriteString("|---|---|---|---|---|---|---|---|---|")
 	b.WriteString("\n")
 
 	return b.String()
@@ -34,7 +20,7 @@ func (r Result) MarkdownRow(scanopts *ScanOptions) string {
 	var b strings.Builder
 
 	fmt.Fprintf(&b, "| %s | `%d %s` | `%s` | `%s` | %d | %d | %d |",
-		r.URL,
+		escapeMarkdown(r.URL),
 		r.StatusCode, http.StatusText(r.StatusCode),
 		r.Method,
 		r.HostIP,
@@ -44,12 +30,17 @@ func (r Result) MarkdownRow(scanopts *ScanOptions) string {
 
 	if r.Title != "" {
 		fmt.Fprintf(&b, " %s |", escapeMarkdown(r.Title))
+	} else {
+		b.WriteString(" |")
 	}
+
 	if r.CDNName != "" {
 		fmt.Fprintf(&b, " `%s` |", r.CDNName)
+	} else {
+		b.WriteString(" |")
 	}
-	b.WriteString("\n")
 
+	b.WriteString("\n")
 	return b.String()
 }