diff --git a/index.html b/index.html
index 701f5a00..a8a37159 100644
--- a/index.html
+++ b/index.html
@@ -1495,7 +1495,7 @@ <h3>HTML Element Role Mappings</h3>
             </tr>
             <tr tabindex="-1" id="el-form-associated-custom-element">
               <th>
-                <a href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
+                <a data-cite="html/custom-elements.html#custom-elements-face-example">form-associated custom element</a>
               </th>
               <td class="aria">If the author assigned a conforming ARIA role using the `role` attribute, map to that role. Otherwise, no corresponding role.</td>
               <td class="ia2"><div class="general">Use WAI-ARIA mapping</div></td>
@@ -3973,7 +3973,7 @@ <h3>HTML Attribute State and Property Mappings</h3>
       </ul>
       <div class="table-container">
         <table class="map-table attributes" id="attribute-mapping-table">
-          <caption>Mappings of <a data-cite="html/multipage/indices.html#attributes-3">HTML attributes (excluding event handler content attributes)</a> to platform <a class="termref">accessibility APIs</a>: ARIA, MSAA + UIA Express, MSAA + IAccessible2, UIA, ATK, and AX </caption>
+          <caption>Mappings of <a data-cite="html/indices.html#attributes-3">HTML attributes (excluding event handler content attributes)</a> to platform <a class="termref">accessibility APIs</a>: ARIA, MSAA + UIA Express, MSAA + IAccessible2, UIA, ATK, and AX </caption>
           <thead>
             <tr>
               <th>Attribute</th>
@@ -4987,7 +4987,7 @@ <h3>HTML Attribute State and Property Mappings</h3>
             <tr tabindex="-1" id="att-kind">
               <th>`kind`</th>
               <td class="elements">
-                <a data-cite="html/#element-attrdef-track-kind">`track`</a>
+              	<a data-cite="html/media.html#attr-track-kind">`track`</a>
               </td>
               <td class="aria">Not mapped</td>
               <td class="ia2">Not mapped</td>
@@ -4999,9 +4999,9 @@ <h3>HTML Attribute State and Property Mappings</h3>
             <tr tabindex="-1" id="att-label">
               <th>`label`</th>
               <td class="elements">
-                <a data-cite="html/#attr-optgroup-label">`optgroup`</a>;
-                <a data-cite="html/#attr-option-label">`option`</a>;
-                <a data-cite="html/#attr-track-label">`track`</a>
+              	<a data-cite="html/form-elements.html#attr-optgroup-label">`optgroup`</a>;
+                <a data-cite="html/form-elements.html#attr-option-label">`option`</a>;
+              	<a data-cite="html/media.html#attr-track-label">`track`</a>
               </td>
               <td class="aria"><div class="general">Not mapped</div></td>
               <td class="ia2">
@@ -7049,7 +7049,7 @@ <h4>Substantive changes since moving to the Web Application Working Group (forme
           <li>18-Sept-2019: Update `mark` element's UIA `LocalizedControlType` and AX `AXRoleDescription`.  See <a href="https://github.com/w3c/html-aam/issues/236">GitHub issue #236</a>.</li>
           <li>18-Sept-2019: Update ATK mappings for `summary` and `details` elements. See <a href="https://github.com/w3c/html-aam/issues/142">GitHub issue #142</a> and <a href="https://github.com/w3c/html-aam/issues/147">GitHub issue #147</a>.</li>
           <li>18-Sept-2019: Update MSAA mappings for `sub` and `sup`. See <a href="https://github.com/w3c/html-aam/pull/252">GitHub pull request #252</a>.</li>
-          <li>11-Sept-2019: Update mapping for `menu` to match <a data-cite="html/#the-menu-element">HTML Living Standard</a>. Remove element and attribute mappings that are not applicable to `menu` and `menuitem`. Update mapping of `menu` to `role="list"`. See <a href="https://github.com/w3c/html-aam/issues/188">GitHub issue #188</a>.</li>
+        	<li>11-Sept-2019: Update mapping for [^menu^] to match HTML Living Standard. Remove element and attribute mappings that are not applicable to `menu` and `menuitem`. Update mapping of `menu` to `role="list"`. See <a href="https://github.com/w3c/html-aam/issues/188">GitHub issue #188</a>.</li>
           <li>10-July-2019: Further updated mappings for `ins` and `del` elements. See <a href="https://github.com/w3c/html-aam/pull/219">GitHub pull request #219</a>.</li>
           <li>13-June-2019: Update mappings for `ins` and `del` elements. See <a href="https://github.com/w3c/html-aam/issues/141">GitHub issue #141</a>.</li>
           <li>10-June-2019: Update ATK mappings for `header` and `footer` when not scoped to the `body`. See <a href="https://github.com/w3c/html-aam/issues/129">GitHub issue #129</a>.</li>
@@ -7079,7 +7079,7 @@ <h4>Substantive changes since moving to the Web Application Working Group (forme
           <li>01-Dec-2017: Updated mappings for the `dfn` element. See <a href="https://github.com/w3c/html-aam/issues/6">GitHub issue #6</a>.</li>
           <li>30-Nov-2017: Updated mappings for the `meter` element. See <a href="https://github.com/w3c/html-aam/issues/2">GitHub issue #2</a>.</li>
           <li>24-Nov-2017: Updated mappings for the `audio` and `video` elements. See <a href="https://github.com/w3c/html-aam/issues/80">GitHub issue #80</a>.</li>
-          <li>23-Nov-2017: Updated `figure` element mappings to reflect the <a href="https://w3c.github.io/aria/core-aam/core-aam.html#role-map-figure">WAI-ARIA `figure` role mappings</a>.</li>
+          <li>23-Nov-2017: Updated `figure` element mappings to reflect the <a href="https://w3c.github.io/core-aam/#role-map-figure">WAI-ARIA `figure` role mappings</a>.</li>
           <li>23-Nov-2017: Updated mappings for the `form` element based on presence of <a class="termref">accessible name</a>. See <a href="https://github.com/w3c/html-aam/issues/106">GitHub issue #106</a>.</li>
           <li>23-Nov-2017: Removed the accessible name computation requirement to ignore an `img` element's `title` attribute when the element's `alt` attribute is empty. See <a href="https://github.com/w3c/html-aam/issues/99">GitHub issue #99</a>.</li>
           <li>23-Nov-2017: Added note to not expose `aria-roledescription` unless element also a conforming `role` attribute value. See <a href="https://github.com/w3c/html-aam/issues/98">GitHub issue #98</a>.</li>

Attribute
`kind`	- `track` + `track`	Not mapped	Not mapped
`label`	- `optgroup`; - `option`; - `track` + `optgroup`; + `option`; + `track`	Not mapped	@@ -7049,7 +7049,7 @@ Substantive changes since moving to the Web Application Working Group (forme 18-Sept-2019: Update `mark` element's UIA `LocalizedControlType` and AX `AXRoleDescription`. See GitHub issue #236. 18-Sept-2019: Update ATK mappings for `summary` and `details` elements. See GitHub issue #142 and GitHub issue #147. 18-Sept-2019: Update MSAA mappings for `sub` and `sup`. See GitHub pull request #252. - 11-Sept-2019: Update mapping for `menu` to match HTML Living Standard. Remove element and attribute mappings that are not applicable to `menu` and `menuitem`. Update mapping of `menu` to `role="list"`. See GitHub issue #188. + 11-Sept-2019: Update mapping for [^menu^] to match HTML Living Standard. Remove element and attribute mappings that are not applicable to `menu` and `menuitem`. Update mapping of `menu` to `role="list"`. See GitHub issue #188. 10-July-2019: Further updated mappings for `ins` and `del` elements. See GitHub pull request #219. 13-June-2019: Update mappings for `ins` and `del` elements. See GitHub issue #141. 10-June-2019: Update ATK mappings for `header` and `footer` when not scoped to the `body`. See GitHub issue #129. @@ -7079,7 +7079,7 @@ Substantive changes since moving to the Web Application Working Group (forme 01-Dec-2017: Updated mappings for the `dfn` element. See GitHub issue #6. 30-Nov-2017: Updated mappings for the `meter` element. See GitHub issue #2. 24-Nov-2017: Updated mappings for the `audio` and `video` elements. See GitHub issue #80. - 23-Nov-2017: Updated `figure` element mappings to reflect the WAI-ARIA `figure` role mappings. + 23-Nov-2017: Updated `figure` element mappings to reflect the WAI-ARIA `figure` role mappings. 23-Nov-2017: Updated mappings for the `form` element based on presence of accessible name. See GitHub issue #106. 23-Nov-2017: Removed the accessible name computation requirement to ignore an `img` element's `title` attribute when the element's `alt` attribute is empty. See GitHub issue #99. 23-Nov-2017: Added note to not expose `aria-roledescription` unless element also a conforming `role` attribute value. See GitHub issue #98.