diff --git a/shared/templatetags/people_filters.py b/shared/templatetags/people_filters.py
index b563c35fdbe41002731f290d79ccd9c6a139a8b5..8dc61e46ab287bb80b7b7fac7f73b341303259b9 100644
--- a/shared/templatetags/people_filters.py
+++ b/shared/templatetags/people_filters.py
@@ -8,7 +8,7 @@ def is_first_people_type(content, forloop):
     first_people_type_position = None
 
     for position, item in enumerate(content):
-        if item.block_type in ("octopus_group", "people_group", "team_group"):
+        if item.block_type in ("octopus_group", "octopus_team", "people_group", "team_group"):
             if first_people_type_position is None:
                 first_people_type_position = position
                 break
@@ -27,7 +27,7 @@ def has_one_people_type(content):
     people_type_count = 0
 
     for item in content:
-        if item.block_type in ("octopus_group", "people_group", "team_group"):
+        if item.block_type in ("octopus_group", "octopus_team", "people_group", "team_group"):
             people_type_count += 1
 
             if people_type_count > 1: