diff --git a/pg/dateless.sql b/pg/dateless.sql
index d321cdb..f9a546f 100644
--- a/pg/dateless.sql
+++ b/pg/dateless.sql
@@ -12,20 +12,34 @@
    the missing hashes.  Maybe we can parse dates from there.
  */
 SELECT
-    l.hash, r.value
+    h.hash,
+    h.name,
+    substring(h.value, 0, 40)
 FROM
-    original l
-LEFT JOIN (
+    header h
+INNER JOIN (
     SELECT
-        hash,
-        value
+        l.hash
     FROM
-        search_header
+        original l
+    LEFT JOIN (
+        SELECT
+            hash
+        FROM
+            search_header
+        WHERE
+            name = 'Date'
+        ) r
+    ON
+        r.hash = l.hash
     WHERE
-        name = 'Date'
-    ) r
+        r.hash IS NULL
+    ) missing
 ON
-    r.hash = l.hash
+    missing.hash = h.hash
 WHERE
-    r.hash IS NULL
+    -- name IN ('Subject', 'Received', 'Date')
+    name IN ('From', 'Subject')
+ORDER BY
+    h.value
 ;