diff --git a/scripts/ftbfs-fti/follow-policy.py b/scripts/ftbfs-fti/follow-policy.py
index 888a65b..bba30f4 100755
--- a/scripts/ftbfs-fti/follow-policy.py
+++ b/scripts/ftbfs-fti/follow-policy.py
@@ -20,8 +20,9 @@ TRACKERS = {
     "F33FailsToInstall": 1803235,
     "F34FailsToInstall": 1868279,
     "F35FailsToInstall": 1927313,
+    "F36FailsToInstall": 1992487,
 }
-RAWHIDE = "35"
+RAWHIDE = "36"
 
 
 def _bzdate_to_python(date):
@@ -278,6 +279,7 @@ def follow_policy(release):
     ftibug = bz.getbug(f"F{release}FailsToInstall")
     query_fti = bz.build_query(
         product="Fedora",
+        status="__open__",
         include_fields=[
             "id",
             "status",
@@ -289,8 +291,11 @@ def follow_policy(release):
         ],
     )
     query_fti["blocks"] = ftibug.id
-    current_ftis = {b.component: b for b in bz.query(query_fti)
-                    if b.status != "CLOSED" and b.component != 'distribution'}
+    query_results = bz.query(query_fti)
+    if len(query_results) == 1000:
+        raise NotImplementedError('Bugzilla pagination not yet implemented')
+    current_ftis = {b.component: b for b in query_results
+                    if b.component != 'distribution'}
 
     env = jinja2.Environment(loader=jinja2.FileSystemLoader(TEMPLATE_DIR))
     env.globals["release"] = release