diff --git a/RELEASES.md b/RELEASES.md
index c0e8cf1e..77b6e706 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -14,6 +14,20 @@ commits that introduce the changes.  To make a new release, run
 `tools/mkrelease`, which will handle updating the heading for you.
 
 
+NEXT
+====
+
+Compiler
+--------
+- Summary Page now displays values of `lv:match/@on` instead of debug
+  values.
+  - This provides more useful information and is not subject to the
+    confusing reordering behavior of the compiler that is not reflected on
+    the page.
+  - Changes that have not yet been merged will remove debug values for the
+    classification system.
+
+
 v17.9.0 (2021-05-27)
 ====================
 This is a documentation/design release, introducing The TAME Programming
diff --git a/src/current/scripts/entry-form.js b/src/current/scripts/entry-form.js
index 7beab649..c4d3eadf 100644
--- a/src/current/scripts/entry-form.js
+++ b/src/current/scripts/entry-form.js
@@ -1108,9 +1108,11 @@ var client = ( function()
     }
 
 
-    function updateSummaryDebug( debug, parent, callback )
+    function updateSummaryDebug( results, parent, callback )
     {
         var queue = [];
+        var debug = results.debug;
+        var vars = results.vars || {};
 
         // do nothing if debug data is not yet available
         if ( !debug )
@@ -1149,8 +1151,11 @@ var client = ( function()
 
             try
             {
-                setPlaceholderValue( id, '', ( debug[ did ] )
-                    ? JSON.stringify( debug[ did ] )
+                // accommodate fallback values; see summary.xsl `ubd-*` generation
+                var dval = debug[ did ] || vars[ did ];
+
+                setPlaceholderValue( id, '', ( dval )
+                    ? JSON.stringify( dval )
                     : ''
                 );
             }
diff --git a/src/current/summary.xsl b/src/current/summary.xsl
index cb93c14d..3b4d8858 100644
--- a/src/current/summary.xsl
+++ b/src/current/summary.xsl
@@ -251,7 +251,7 @@
           if ( target.className.match( /\bmath-typeset-hover\b/ ) )
           {
             MathJax.Hub.Queue( [ "Typeset", MathJax.Hub, target ] );
-            client.updateSummaryDebug( rate_result.debug, target );
+            client.updateSummaryDebug( rate_result, target );
           }
         }
 
@@ -1158,7 +1158,10 @@
   <p class="debugid">
     <xsl:attribute name="id">
       <xsl:text>ubd-</xsl:text>
-      <xsl:value-of select="@_id" />
+      <!-- debug collection was removed, for now, during the classification
+           system rewrite; fall back to the name of what we're matching on,
+           which should be plenty good enough -->
+      <xsl:value-of select="@on" />
     </xsl:attribute>
 
     <a class="sym-ref sym-{$sym/@type}">