diff --git a/data/model.py b/data/model.py
index 80cdde416..4f44d863d 100644
--- a/data/model.py
+++ b/data/model.py
@@ -299,7 +299,7 @@ def get_user(username):
 def get_matching_teams(team_prefix, organization):  
   query = Team.select().where(Team.name ** (team_prefix + '%'),
                               Team.organization == organization)
-  return list(query.limit(10))
+  return query.limit(10)
 
 
 def get_matching_users(username_prefix, organization=None):
diff --git a/endpoints/api.py b/endpoints/api.py
index f167c3e5f..309166d7c 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -273,6 +273,7 @@ def get_matching_entities(prefix):
       'kind': 'team',
       'is_org_member': True
     }
+    return result
 
   def user_view(user):
     user_json = {