diff --git a/view-webapp/src/main/webapp/tour-registration.inc.html b/view-webapp/src/main/webapp/tour-registration.inc.html
index 6b265ad..131e840 100644
--- a/view-webapp/src/main/webapp/tour-registration.inc.html
+++ b/view-webapp/src/main/webapp/tour-registration.inc.html
@@ -6,7 +6,7 @@
   #set($pmap = $utils.toMap($teams))
 #end
 
-## CB TODO - why limit to INDIVIDUAL here?
+## Team players do not have an individual MMS
 #if($tour.type == 'INDIVIDUAL' && $tour.pairing.type == 'MAC_MAHON')
   #set($mmbase = $api.get("tour/${params.id}/standings/0"))
   #if($mmbase.isObject() && ($mmbase.error || $mmbase.message))
@@ -61,7 +61,7 @@
           <th>Rank</th>
           ## TableSort bug which inverts specified sort...
           <th data-sort-default="1" aria-sort="ascending">Rating</th>
-#if($tour.pairing.type == 'MAC_MAHON')
+#if($tour.type == 'INDIVIDUAL' && $tour.pairing.type == 'MAC_MAHON')
           <th>MMS</th>
 #end
           <th>Participation</th>
@@ -85,7 +85,7 @@
   ## display MMS correction on the screen, but not when printed
             <td data-sort="$part.rank">#rank($part.rank)#if($part.mmsCorrection)<span class="noprint"> (#if($part.mmsCorrection > 0)+#end$part.mmsCorrection)</span>#end</td>
             <td>$part.rating</td>
-#if($tour.pairing.type == 'MAC_MAHON')
+#if($tour.type == 'INDIVIDUAL' && $tour.pairing.type == 'MAC_MAHON')
             <td>$mmsPlayersMap[$part.id]</td>
 #end
             <td class="participating" data-sort="#if($part.skip)$part.skip.size()/part.skip#{else}0#end">