diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
index 79c1569868..8140c0b9d4 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -104,6 +104,9 @@ class SearchHandler(BaseHandler):
             user.to_string(), event_map.values()
         )
 
+        # TODO: Filter allowed_events
+        # TODO: Add a limit
+
         time_now = self.clock.time_msec()
 
         results = {