diff --git a/view-webapp/src/main/webapp/tour-results.inc.html b/view-webapp/src/main/webapp/tour-results.inc.html
index 38e529f..2950142 100644
--- a/view-webapp/src/main/webapp/tour-results.inc.html
+++ b/view-webapp/src/main/webapp/tour-results.inc.html
@@ -31,9 +31,14 @@
       <tbody>
 #set($dispRst = {'?':'?', 'w':'1-0', 'b':'0-1', '=':'½-½', 'X':'X', '#':'1-1', '0':'0-0'})
 #set($dispRstInv = {'?':'?', 'w':'0-1', 'b':'1-0', '=':'½-½', 'X':'X', '#':'1-1', '0':'0-0'})
+## For PAIRGO/RENGO, games are team games - use pmap (teams). For others, use plmap (players).
+#set($resultsMap = $plmap)
+#if($tour.type == 'PAIRGO' || $tour.type.startsWith('RENGO'))
+  #set($resultsMap = $pmap)
+#end
 #foreach($game in $individualGames)
-  #set($white = $plmap[$game.w])
-  #set($black = $plmap[$game.b])
+  #set($white = $resultsMap[$game.w])
+  #set($black = $resultsMap[$game.b])
   #if($black && $white)
         <tr id="result-$game.id" data-id="$game.id">
           <td data-sort="$game.t">${game.t}.</td>