diff --git a/js/common.js b/js/common.js
index a70f81236f..1efafeb0b6 100644
--- a/js/common.js
+++ b/js/common.js
@@ -826,16 +826,13 @@ function getLanguage() {
      * "data-label" with the text of the th.
      */
     $(document).ready(function () {
-        $('table').each(function () {
-            var $table = $(this);
-            $table.find('th').each(function (index) {
-                var $th = $(this);
-                var text = $th.text();
-                if (text === '') {
-                    return;
-                }
-                $table.find('td:nth-child(' + (index + 1) + ')')
-                    .attr('data-label', text);
+        $('table.versions').each(function () {
+            var $columns = $(this).find('td:not(.collapse-phone)');
+            var $headers = $(this).find('th');
+            $headers.each(function (index) {
+              $columns.filter(function (counter) {
+                return index === counter % $headers.length;
+              }).attr('data-label', $(this).text());
             });
         });
     });
diff --git a/styles/supported-versions.css b/styles/supported-versions.css
index f152bcc94c..ec9477ab6e 100644
--- a/styles/supported-versions.css
+++ b/styles/supported-versions.css
@@ -19,10 +19,6 @@ table.standard tr.stable td:first-child {
 	}
 
 	table.standard td.collapse-phone {
-		padding: 0;
-	}
-
-	table.standard td.collapse-phone * {
 		display: none;
 	}
 }
diff --git a/supported-versions.php b/supported-versions.php
index a676a094cc..a4f69e7090 100644
--- a/supported-versions.php
+++ b/supported-versions.php
@@ -36,7 +36,7 @@
 
 <h3>Currently Supported Versions</h3>
 
-<table class="standard">
+<table class="standard versions">
 	<thead>
 		<tr>
 			<th>Branch</th>