diff --git a/index.html b/index.html
index 76875013..6c756af3 100644
--- a/index.html
+++ b/index.html
@@ -4438,14 +4438,16 @@ <h3>HTML Attribute State and Property Mappings</h3>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-high">
-                <th><code>high</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-meter-high"><code>meter</code></a></td>
-                <td class="aria">?</td>
-                <td class="ia2"><div class="general">Not mapped</div></td>
-                <td class="uia"><code>RangeValue.Maximum</code></td>
-                <td class="atk"><div class="general">Not mapped</div></td>
-                <td class="ax"><div class="general">Not mapped</div></td>
-                <td class="comments"></td>
+              <th>`high`</th>
+              <td class="elements">
+                <a data-cite="html/form-elements.html#attr-meter-high">`meter`</a>
+              </td>
+              <td class="aria">Not mapped</td>
+              <td class="ia2"><div class="general">Not mapped</div></td>
+              <td class="uia">`RangeValue.Maximum`</td>
+              <td class="atk"><div class="general">Not mapped</div></td>
+              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-href">
                 <th><a data-cite=
@@ -4596,7 +4598,7 @@ <h3>HTML Attribute State and Property Mappings</h3>
                   <a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-input-list"><code>input</code></a>
                 </td>
                 <td class="aria">
-                  <a class="core-mapping" href="#ariaControls"><code>aria-controls</code></a>
+                  <a class="core-mapping" href="#ariaControls">`aria-controls`</a>
                 </td>
                 <td class="ia2">
                   <div class="relations">
@@ -4652,7 +4654,7 @@ <h3>HTML Attribute State and Property Mappings</h3>
               <th><code>low</code></th>
               <td class="elements"><a data-cite=
             "html/form-elements.html#attr-meter-low">`meter`</a></td>
-                <td class="aria">?</td>
+                <td class="aria">Not mapped</td>
                 <td class="ia2"><div class="general">Not mapped</div></td>
                 <td class="uia"><code>RangeValue.Minimum</code></td>
                 <td class="atk"><div class="general">Not mapped</div></td>
@@ -4660,44 +4662,45 @@ <h3>HTML Attribute State and Property Mappings</h3>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-max-input">
-                <th><code>max</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-input-max"><code>input</code></a></td>
-                <td class="aria">?</td>
-                <td class="ia2">
-                  <div class="general">
-                    Exposed as <code>IAccessibleValue::maximumValue</code> if the element
-                    implements the interface
-                  </div>
-                </td>
-                <td class="uia"><code>RangeValue.Maximum</code></td>
-                <td class="atk">
-                  <div class="general">
-                    Exposed as <code>atk_value_get_maximum_value</code> if the element
-                    implements the <code>AtkValue</code> interface
-                  </div>
-                </td>
-                <td class="ax"><code>AXMaxValue: &lt;value&gt;</code></td>
+              <th>`max`</th>
+              <td class="elements">
+                <a data-cite="html/input.html#attr-input-max">`input`</a>
+              </td>
+              <td class="aria"><a class="core-mapping" href="#ariaValueMax">`aria-valuemax`</a></td>
+              <td class="ia2">
+                <div class="general">
+                  Exposed as `IAccessibleValue::maximumValue` if the element implements the interface
+                </div>
+              </td>
+              <td class="uia">`RangeValue.Maximum`</td>
+              <td class="atk">
+                <div class="general">
+                  Exposed as `atk_value_get_maximum_value` if the element implements the `AtkValue` interface
+                </div>
+              </td>
+              <td class="ax">`AXMaxValue: &lt;value&gt;`</td>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-max">
-                <th><code>max</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-meter-max"><code>meter</code></a>; <a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-progress-max"><code>progress</code></a></td>
-                <td class="aria">?</td>
-                <td class="ia2">
-                  <div class="general">
-                    Exposed as <code>IAccessibleValue::maximumValue</code> if the element
-                    implements the interface
-                  </div>
-                </td>
-                <td class="uia"><code>RangeValue.Maximum</code></td>
-                <td class="atk">
-                  <div class="general">
-                    Exposed as <code>atk_value_get_maximum_value</code> if the element
-                    implements the <code>AtkValue</code> interface
-                  </div>
-                </td>
-                <td class="ax"><code>AXMaxValue: &lt;value&gt;</code></td>
-                <td class="comments"></td>
+              <th>`max`</th>
+              <td class="elements">
+                <a data-cite="html/form-elements.html#attr-meter-max">`meter`</a>;
+                <a data-cite="html/form-elements.html#attr-progress-max">`progress`</a>
+              </td>
+              <td class="aria"><a class="core-mapping" href="#ariaValueMax">`aria-valuemax`</a></td>
+              <td class="ia2">
+                <div class="general">
+                  Exposed as `IAccessibleValue::maximumValue` if the element implements the interface
+                </div>
+              </td>
+              <td class="uia">`RangeValue.Maximum`</td>
+              <td class="atk">
+                <div class="general">
+                  Exposed as `atk_value_get_maximum_value` if the element implements the `AtkValue` interface
+                </div>
+              </td>
+              <td class="ax">`AXMaxValue: &lt;value&gt;`</td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-maxlength">
                 <th><code>maxlength</code></th>
@@ -4730,44 +4733,46 @@ <h3>HTML Attribute State and Property Mappings</h3>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-min-input">
-                <th><code>min</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-input-min"><code>input</code></a></td>
-                <td class="aria">?</td>
-                <td class="ia2">
-                  <div class="general">
-                    Exposed as <code>IAccessibleValue::minimumValue</code> if the element
-                    implements the interface
-                  </div>
-                </td>
-                <td class="uia"><code>RangeValue.Minimum</code></td>
-                <td class="atk">
-                  <div class="general">
-                    Exposed as <code>atk_value_get_minimum_value</code> if the element
-                    implements the <code>AtkValue</code> interface
-                  </div>
-                </td>
-                <td class="ax"><code>AXMinValue: &lt;value&gt;</code></td>
-                <td class="comments"></td>
+              <th>`min`</th>
+              <td class="elements">
+                <a data-cite="html/input.html#attr-input-min">`input`</a>
+              </td>
+              <td class="aria"><a class="core-mapping" href="#ariaValueMin">`aria-valuemin`</a></td>
+              <td class="ia2">
+                <div class="general">
+                  Exposed as `IAccessibleValue::minimumValue` if the element
+                  implements the interface
+                </div>
+              </td>
+              <td class="uia">`RangeValue.Minimum`</td>
+              <td class="atk">
+                <div class="general">
+                  Exposed as `atk_value_get_minimum_value` if the element
+                  implements the `AtkValue` interface
+                </div>
+              </td>
+              <td class="ax">`AXMinValue: &lt;value&gt;`</td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-min">
-                <th><code>min</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-meter-min"><code>meter</code></a></td>
-                <td class="aria">?</td>
-                <td class="ia2">
-                  <div class="general">
-                    Exposed as <code>IAccessibleValue::minimumValue</code> if the element
-                    implements the interface
-                  </div>
-                </td>
-                <td class="uia"><code>RangeValue.Minimum</code></td>
-                <td class="atk">
-                  <div class="general">
-                    Exposed as <code>atk_value_get_minimum_value</code> if the element
-                    implements the <code>AtkValue</code> interface
-                  </div>
-                </td>
-                <td class="ax"><code>AXMinValue: &lt;value&gt;</code></td>
-                <td class="comments"></td>
+              <th>`min`</th>
+              <td class="elements">
+                <a data-cite="html/form-elements.html#attr-meter-min">`meter`</a>
+              </td>
+              <td class="aria"><a class="core-mapping" href="#ariaValueMin">`aria-valuemin`</a></td>
+              <td class="ia2">
+                <div class="general">
+                  Exposed as `IAccessibleValue::minimumValue` if the element implements the interface
+                </div>
+              </td>
+              <td class="uia">`RangeValue.Minimum`</td>
+              <td class="atk">
+                <div class="general">
+                  Exposed as `atk_value_get_minimum_value` if the element implements the `AtkValue` interface
+                </div>
+              </td>
+              <td class="ax">`AXMinValue: &lt;value&gt;`</td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-multiple-input">
                 <th><code>multiple</code></th>
@@ -4918,14 +4923,16 @@ <h3>HTML Attribute State and Property Mappings</h3>
                 <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-optimum">
-                <th><code>optimum</code></th>
-                <td class="elements"><a href="https://www.w3.org/TR/html/sec-forms.html#element-attrdef-meter-optimum"><code>meter</code></a></td>
-                <td class="aria"><div class="general">Not mapped</div></td>
-                <td class="ia2"><div class="general">Not mapped</div></td>
-                <td class="uia"><div class="general">Not mapped</div></td>
-                <td class="atk"><div class="general">Not mapped</div></td>
-                <td class="ax"><div class="general">Not mapped</div></td>
-                <td class="comments"></td>
+              <th>`optimum`</th>
+              <td class="elements">
+                <a data-cite="html/form-elements.html#attr-meter-optimum">`meter`</a>
+              </td>
+              <td class="aria"><div class="general">Not mapped</div></td>
+              <td class="ia2"><div class="general">Not mapped</div></td>
+              <td class="uia"><div class="general">Not mapped</div></td>
+              <td class="atk"><div class="general">Not mapped</div></td>
+              <td class="ax"><div class="general">Not mapped</div></td>
+              <td class="comments"></td>
             </tr>
             <tr tabindex="-1" id="att-pattern">
                 <th><code>pattern</code></th>