diff --git a/assets/scss/_single.scss b/assets/scss/_single.scss
index ca066708..07d7b23e 100644
--- a/assets/scss/_single.scss
+++ b/assets/scss/_single.scss
@@ -451,6 +451,10 @@ figure {
     margin-right: 1rem;
     vertical-align: middle;
 
+    a:before {
+      content: '' !important;
+    }
+
     svg {
       color: lch(60% 60 var(--accentHue));
       margin-right: 0.3rem;
diff --git a/content/notes/twitter/2589213272/index.md b/content/notes/twitter/2589213272/index.md
index 41bbf7ce..23e6296c 100644
--- a/content/notes/twitter/2589213272/index.md
+++ b/content/notes/twitter/2589213272/index.md
@@ -3,5 +3,14 @@ date: "2009-07-11T21:35:33Z"
 tags:
 - imported
 - from-twitter
+type: repost
+repostOf: http://homepage.ntlworld.com/keir.clarke/nsfw.htm
+references:
+  - url: http://homepage.ntlworld.com/keir.clarke/nsfw.htm
+    archiveURL: https://web.archive.org/web/20090715070455/https://homepage.ntlworld.com/keir.clarke/nsfw.htm
+    name: NSFW Map
+    date: 2009-07-15
 ---
-Yay for being purile\! http://homepage.ntlworld.com/keir.clarke/nsfw.htm
+Yay for being purile![^1]
+
+[^1]: Here in 2024 even the archived version of that site is pretty broken; it rotates through ~100 comically "NSFW" placenames around the world, showing them on what was once a Google map.
diff --git a/content/notes/twitter/2590655495/index.md b/content/notes/twitter/2590655495/index.md
index 6afdf9da..2082ffe3 100644
--- a/content/notes/twitter/2590655495/index.md
+++ b/content/notes/twitter/2590655495/index.md
@@ -3,5 +3,6 @@ date: "2009-07-11T23:36:38Z"
 tags:
 - imported
 - from-twitter
+- maps
 ---
 Anyone know where I can find a monochrome land/sea mercator projection map of the world in SVG, pref lat ±85º?
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 290e0606..e274efa8 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -25,7 +25,7 @@
                         <li class="post-item">
                             <a href="{{.RelPermalink}}">
                                 {{ if .Params.emoji }}<span class="post-emoji">{{ .Params.emoji }}</span>{{ end }}
-                                <span class="post-title">{{ partial "fallbacktitle.txt" . }}</span>
+                                <span class="post-title">{{ partial "page-title.txt" . }}</span>
                                 <span class="post-day">
                                     {{ if .Site.Params.dateformShort }}
                                         {{ .Date.Format .Site.Params.dateformShort }}
diff --git a/layouts/partials/fallbacktitle.txt b/layouts/partials/fallbacktitle.txt
deleted file mode 100644
index c20a36f5..00000000
--- a/layouts/partials/fallbacktitle.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ if .Title -}}
-  {{- .Title -}}
-{{- else -}}
-  {{- .Type | singularize | title }} from {{ partial "year-relative-date.txt" .Date -}}
-{{- end -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 5a8a29f3..b63ece9c 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -26,7 +26,7 @@
         {{- if .IsHome -}}
             {{- $.Site.Title -}}
         {{- else -}}
-            {{- if .Title -}}{{- .Title -}}{{- else -}}Untitled {{ $.Type | singularize -}}{{- end -}}, {{ $.Site.Title -}}
+            {{ partial "page-title.txt" . }}, {{ $.Site.Title -}}
         {{- end -}}
     </title>
 {{- end }}
diff --git a/layouts/partials/page-title.txt b/layouts/partials/page-title.txt
new file mode 100644
index 00000000..4fa8459a
--- /dev/null
+++ b/layouts/partials/page-title.txt
@@ -0,0 +1,15 @@
+{{- define "partials/fallback-title.txt" -}}
+  {{- .Type | singularize | title }} from {{ partial "year-relative-date.txt" .Date -}}
+{{- end -}}
+{{- if .Title -}}
+  {{- .Title -}}
+{{- else if or .Params.bookmarkOf .Params.repostOf -}}
+  {{- $ref := partial "reference.obj" (dict "url" (.Params.bookmarkOf | default .Params.repostOf) "references" .Params.references) -}}
+  {{- if $ref -}}
+    Comments on '{{ $ref.name }}'
+  {{- else -}}
+    {{- partial "partials/fallback-title.txt" . -}}
+  {{- end -}}
+{{- else -}}
+  {{- partial "partials/fallback-title.txt" . -}}
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/reference-to.html b/layouts/partials/reference-to.html
index 01781f96..3aeddc1f 100644
--- a/layouts/partials/reference-to.html
+++ b/layouts/partials/reference-to.html
@@ -18,7 +18,7 @@
 {{- if and (not $reference.name) (strings.HasPrefix $url "/") -}}
   {{- $other := site.GetPage $url -}}
   {{- if and $other $other.Page -}}
-    {{- $reference = dict "name" (partial "fallbacktitle.txt" $other.Page) "type" $other.Page.Type "internal" true -}}
+    {{- $reference = dict "name" (partial "page-title.txt" $other.Page) "type" $other.Page.Type "internal" true -}}
   {{- end -}}
 {{- end -}}
 {{ partial "svg.html" (dict "name" .svg) }} {{ .phrase }}{{" "}}