diff --git a/server/sql/thread.sql b/server/sql/thread.sql
index af4b319..242d600 100644
--- a/server/sql/thread.sql
+++ b/server/sql/thread.sql
@@ -1,6 +1,13 @@
 SELECT
-    *
+    date,
+    is_read,
+    link,
+    site,
+    summary,
+    title,
+    name
 FROM
-    post
+    post p
+    JOIN feed f ON p.site = f.slug
 WHERE
     uid = $1
diff --git a/server/sql/threads.sql b/server/sql/threads.sql
index 370d205..69f9cc7 100644
--- a/server/sql/threads.sql
+++ b/server/sql/threads.sql
@@ -1,7 +1,12 @@
 SELECT
-    *
+    date,
+    is_read,
+    title,
+    uid,
+    name
 FROM
-    post
+    post p
+    JOIN feed f ON p.site = f.slug
 WHERE
     site = $1
     AND (
diff --git a/server/src/newsreader.rs b/server/src/newsreader.rs
index fe95f11..f373eec 100644
--- a/server/src/newsreader.rs
+++ b/server/src/newsreader.rs
@@ -70,8 +70,7 @@ pub async fn search(
                     date_relative: "TODO date_relative".to_string(),
                     matched: 0,
                     total: 1,
-                    // TODO: join with feed table and get pretty name
-                    authors: site.clone(),
+                    authors: r.name.unwrap_or_else(|| site.clone()),
                     subject: r.title.unwrap_or("NO TITLE".to_string()),
                     tags,
                 }
@@ -135,7 +134,7 @@ pub async fn thread(pool: &PgPool, thread_id: String) -> Result<Thread, ServerEr
     });
     let title = r.title.unwrap_or("NO TITLE".to_string());
     let from = Some(Email {
-        name: Some(site.clone()),
+        name: r.name,
         addr: r.link,
     });
     Ok(Thread {
@@ -143,7 +142,6 @@ pub async fn thread(pool: &PgPool, thread_id: String) -> Result<Thread, ServerEr
         subject: title.clone(),
         messages: vec![Message {
             id,
-            // TODO: join with feed for pretty site name
             from,
             to: Vec::new(),
             cc: Vec::new(),