diff --git a/_includes/table-header-dns.html b/_includes/table-header-dns.html
index c70723c2..a3ede48f 100644
--- a/_includes/table-header-dns.html
+++ b/_includes/table-header-dns.html
@@ -1,11 +1,13 @@
-<th data-sorted="true" data-sorted-direction="ascending">DNS Provider</th>
-<th data-sortable="true">Server Locations</th>
-<th data-sortable="false">Privacy Policy</th>
-<th data-sortable="true">Type</th>
-<th data-sortable="true">Protocols</th>
-<th data-sortable="true">Logging</th>
-<th data-sortable="true">DNSSEC</th>
-<th data-sortable="true">QNAME Minimization</th>
-<th data-sortable="true">Filtering</th>
-<th data-sortable="true">Source Code</th>
-<th data-sortable="true">Hosting Provider</th>
+<tr>
+  <th data-sorted="true" data-sorted-direction="ascending">DNS Provider</th>
+  <th data-sortable="true">Server Locations</th>
+  <th data-sortable="false">Privacy Policy</th>
+  <th data-sortable="true">Type</th>
+  <th data-sortable="true">Protocols</th>
+  <th data-sortable="true">Logging</th>
+  <th data-sortable="true">DNSSEC</th>
+  <th data-sortable="true">QNAME Minimization</th>
+  <th data-sortable="true">Filtering</th>
+  <th data-sortable="true">Source Code</th>
+  <th data-sortable="true">Hosting Provider</th>
+</tr>
diff --git a/_includes/table-row-dns.html b/_includes/table-row-dns.html
index 4c318167..1a7585b0 100644
--- a/_includes/table-row-dns.html
+++ b/_includes/table-row-dns.html
@@ -1,7 +1,7 @@
 {% assign data = include.data[1] %}
-<td data-value="{{ data.title }}">
+<th data-value="{{ data.title }}" class="align-middle">
   <a href="{{ data.homepage }}">{{ data.title }}</a>
-</td>
+</th>
 <td>{%- if data.anycast -%}<strong class="text-green">Anycast:</strong> {%- endif -%}
   <ul class="list-unstyled mb-0">{%- for location in data.locations -%}
   <li>{%- include country.html cc=location -%}</li>
@@ -32,12 +32,12 @@
   </span>{% else %}<td class="table-success">No{% endif %}
 </td>
 <td
-  {% unless data.dnssec %}class="table-danger"><span title="Does not validate DNSSEC" aria-hidden="true" class="fad text-red fa-times-circle"></span><span class="visually-hidden">No</span>{% else %}
-  class="table-success"><span title="Validates DNSSEC" aria-hidden="true" class="fad text-green fa-check-square"></span><span class="visually-hidden">Yes</span>{% endunless %}
+  {% unless data.dnssec %}data-value="No" class="table-danger"><span title="Does not validate DNSSEC" aria-hidden="true" class="fad text-red fa-times-circle"></span><span class="visually-hidden">No</span>{% else %}
+  data-value="Yes" class="table-success"><span title="Validates DNSSEC" aria-hidden="true" class="fad text-green fa-check-square"></span><span class="visually-hidden">Yes</span>{% endunless %}
 </td>
 <td
-  {% unless data.qname_minimization %}class="table-danger"><span title="Does not perform QNAME Minimization" aria-hidden="true" class="fad text-red fa-times-circle"></span><span class="visually-hidden">No</span>{% else %}
-  class="table-success"><span title="Performs QNAME Minimization" aria-hidden="true" class="fad text-green fa-check-square"></span><span class="visually-hidden">Yes</span>{% endunless %}
+  {% unless data.qname_minimization %}data-value="No" class="table-danger"><span title="Does not perform QNAME Minimization" aria-hidden="true" class="fad text-red fa-times-circle"></span><span class="visually-hidden">No</span>{% else %}
+  data-value="Yes" class="table-success"><span title="Performs QNAME Minimization" aria-hidden="true" class="fad text-green fa-check-square"></span><span class="visually-hidden">Yes</span>{% endunless %}
 </td>
 <td>
   {{ data.filtering | escape | default: '<em>Unknown?</em>' }}