diff --git a/lokrez/queries/getCharsByTournamentIdAndEntrantIds.gql b/lokrez/queries/getCharsByTournamentIdAndEntrantIds.gql
index a53a996..07fad4d 100644
--- a/lokrez/queries/getCharsByTournamentIdAndEntrantIds.gql
+++ b/lokrez/queries/getCharsByTournamentIdAndEntrantIds.gql
@@ -1,17 +1,18 @@
-query getCharsByTournamentIdAndPlayerIds($tournamentId:ID, $playerIds:[ID])
+query getCharsByTournamentIdAndEntrantIds($tournamentId:ID, $entrantIds:[ID])
 {
     tournament(id:$tournamentId)
     {
         events
         {
             name
+            numEntrants
             sets
             (
                 perPage:100
                 page:1
                 filters:
                 {
-                    playerIds: $playerIds
+                    entrantIds: $entrantIds
                 }
             )
             {
@@ -31,13 +32,7 @@ query getCharsByTournamentIdAndPlayerIds($tournamentId:ID, $playerIds:[ID])
                             selectionValue
                             entrant
                             {
-                                participants
-                                {
-                                    player
-                                    {
-                                        id
-                                    }
-                                }
+                                id
                             }
                         }
                     }
diff --git a/lokrez/queries/getTournamentTopById.gql b/lokrez/queries/getTournamentTopById.gql
index b2af74a..4343b52 100644
--- a/lokrez/queries/getTournamentTopById.gql
+++ b/lokrez/queries/getTournamentTopById.gql
@@ -1,7 +1,8 @@
-query getTournamentTopBySlug($id:String,$top:Int)
+query getTournamentTopBySlug($id:ID,$top:Int)
 {
     tournament(id:$id)
     {
+        id
         slug
         name
         startAt
@@ -13,6 +14,7 @@ query getTournamentTopBySlug($id:String,$top:Int)
         events
         {
             name
+            numEntrants
             videogame
             {
                 id
@@ -37,14 +39,20 @@ query getTournamentTopBySlug($id:String,$top:Int)
                     placement
                     entrant
                     {
+                        id
                         participants
                         {
                             gamerTag
                             prefix
                             player
                             {
-                                id
-                                twitterHandle
+                                user
+                                {
+                                    authorizations(types: [TWITTER])
+                                    {
+                                        externalUsername
+                                    }
+                                }
                             }
                         }
 
diff --git a/lokrez/queries/getTournamentTopBySlug.gql b/lokrez/queries/getTournamentTopBySlug.gql
index 476b3fc..2454b0c 100644
--- a/lokrez/queries/getTournamentTopBySlug.gql
+++ b/lokrez/queries/getTournamentTopBySlug.gql
@@ -3,6 +3,7 @@ query getTournamentTopBySlug($slug:String,$top:Int)
     tournament(slug:$slug)
     {
         id
+        slug
         name
         startAt
         venueAddress
@@ -13,6 +14,7 @@ query getTournamentTopBySlug($slug:String,$top:Int)
         events
         {
             name
+            numEntrants
             videogame
             {
                 id
@@ -37,14 +39,20 @@ query getTournamentTopBySlug($slug:String,$top:Int)
                     placement
                     entrant
                     {
+                        id
                         participants
                         { 
                             gamerTag
                             prefix
                             player
                             {
-                                id
-                                twitterHandle
+                                user
+                                {
+                                    authorizations(types: [TWITTER])
+                                    {
+                                        externalUsername
+                                    }
+                                }
                             }
                         }