diff --git a/README.md b/README.md
index 08de100..0111d99 100644
--- a/README.md
+++ b/README.md
@@ -60,12 +60,7 @@ tests locally:
 
 ## TODOs
 
-1. Is `remark_tally` counting hidden remarks? Tried to add a `WHERE
-   NOT hidden_status` but that returns null, probably need a different
-   `JOIN` which may not be worth the trouble/processing
-1. Nah it needs a subquery instead of just `COUNT(*)` (dude trust me)
-1. Implement tripcodes (moving this down in priority due to complexity...)
-1. Post thread via SMS (twil.io??)
+- Tripcodes/PGP signing somehow perhaps...
 
 ## AGPL-3.0+ANTIFA compliance
 
diff --git a/lib/PostText/Model/Thread.pm b/lib/PostText/Model/Thread.pm
index f380650..9e1748c 100644
--- a/lib/PostText/Model/Thread.pm
+++ b/lib/PostText/Model/Thread.pm
@@ -44,6 +44,7 @@ sub by_page($self, $this_page = 1) {
               LEFT JOIN remarks AS r
                 ON t.thread_id = r.thread_id
              WHERE NOT t.hidden_status
+               AND NOT r.hidden_status
              GROUP BY t.thread_id
              ORDER BY t.bump_date DESC
              LIMIT ? OFFSET ?;