diff --git a/docs/glossaries/mrg.tev2.documentation.yaml b/docs/glossaries/mrg.tev2.documentation.yaml
index aa6952d375..c3c8a0171a 100644
--- a/docs/glossaries/mrg.tev2.documentation.yaml
+++ b/docs/glossaries/mrg.tev2.documentation.yaml
@@ -989,6 +989,7 @@ entries:
       - 'installing-the-tool'
       - 'calling-the-tool'
       - 'mrg-ref-handling'
+      - 'hrg-sorting-{#hrg-sorting}'
       - 'example'
       - 'processing,-errors-and-warnings'
       - 'deploying-the-tool'
@@ -1406,7 +1407,7 @@ entries:
     term: 'mrg'
     termType: 'concept'
     isa: 'glossary'
-    bodyFile: '/spec-files/31-mrg.md'
+    bodyFile: '/spec-files/32-mrg.md'
     glossaryTerm: 'Machine Readable Glossary (MRG)'
     glossaryText: 'a [glossary](@) for a particular (version of a) [terminology](@) that is formatted in YAML, according to the [TEv2 MRG specifications](/docs/spec-files/mrg), to enable automated processing and integration with software systems.'
     hoverText: 'MRG: {{noRefs glossaryText}}'
@@ -1422,8 +1423,15 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:mrg'
     locator: 'mrg.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/31-mrg'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/mrg'
+    headingids:
+      - 'machine-readable-glossary-(mrg)'
+      - 'file-naming-conventions-{#mrg-file-naming-conventions}'
+      - 'mrg-structure'
+      - 'mrg-`terminology`-section-{#mrg-terminology}'
+      - 'mrg-`scopes`-section-{#mrg-scopes}'
+      - 'mrg-entries-(the-`entries`-section)-{#mrg-entries}'
+      - 'footnotes'
     vsntag: 'documentation'
   - term: 'mrg-entry'
     termType: 'concept'
@@ -1945,7 +1953,7 @@ entries:
   - id: 'saf'
     term: 'saf'
     termType: 'concept'
-    bodyFile: '/spec-files/21-saf.md'
+    bodyFile: '/spec-files/12-saf.md'
     glossaryTerm: 'Scope Administration File (SAF)'
     glossaryText: 'a YAML file that contains essential data about a particular [scope](@) (e.g., specifying where its [curated texts](@), [glossaries](@) etc. live), the relationships this [scope](@) has with other [scopes](@), and the specifications of the different [terminologies](@) that are [curated](@) within that [scope](@). The SAF of a [scope](@) is located in its [scopedir](@).'
     hoverText: 'SAF: a YAML file that contains essential data about a particular scope, such as the locations of the scope''s curated texts, glossaries, and the specifications of the curated terminologies. The SAF is located in the so-called scopedir.'
@@ -1961,8 +1969,27 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:saf'
     locator: 'saf.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/21-saf'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/saf'
+    headingids:
+      - 'scope-administration-file-(saf)'
+      - 'scope-administration-file-field-descriptions'
+      - 'saf-terminology---defining-the-scope-itself-{#scope-section}'
+      - '#-this-is-a-scope-administration-file-that-can-be-used-in-conjunction-with-tev2.'
+      - '#-the-first-section-defines-meta-data-concerning-the-scope-itself,-both-for-technical-use-and-human-use.'
+      - 'it-shows-where-directories-and-files-live-that-ar-part-of-the-scope,-and-also'
+      - 'ways-in-which-people-can-contribute,-raise-issues,-see-what''s-going-on,-discuss,-etc.'
+      - 'scope:'
+      - 'saf-scopes---mapping-scopetags-and-scopedirs-{#scopes}'
+      - '#-the-second-section-contains-a-mapping-between-scopetags-that-are-used-within-the-scope,-and-the-associated-scopedirs.'
+      - 'this-enables-tools-to-find-the-[saf](@)-of-these-[scopes](@),-and-from-there-all-other-directories,-files-etc.'
+      - 'that-live-within-them,-e.g.-to-use/import-their-data.'
+      - 'scopes:-#'
+      - 'saf-versions---enabling-changes-and-updates-in-a-scope''s-terminology-{#versions}'
+      - '#-the-third-section-specifies-the-versions-that-are-actively-maintained-by-the-curators.'
+      - 'for-each-version,-the-set-of-terms-is-selected-that-constitute-the-terminology.'
+      - 'see-the-glossary-generation-tool-(ggt)-for-details-about-the-syntax-and-semantics.'
+      - 'versions:'
+      - 'notes'
     vsntag: 'documentation'
   - term: 'scope'
     termType: 'concept'
diff --git a/docs/glossaries/mrg.tev2.latest.yaml b/docs/glossaries/mrg.tev2.latest.yaml
index aa6952d375..c3c8a0171a 100644
--- a/docs/glossaries/mrg.tev2.latest.yaml
+++ b/docs/glossaries/mrg.tev2.latest.yaml
@@ -989,6 +989,7 @@ entries:
       - 'installing-the-tool'
       - 'calling-the-tool'
       - 'mrg-ref-handling'
+      - 'hrg-sorting-{#hrg-sorting}'
       - 'example'
       - 'processing,-errors-and-warnings'
       - 'deploying-the-tool'
@@ -1406,7 +1407,7 @@ entries:
     term: 'mrg'
     termType: 'concept'
     isa: 'glossary'
-    bodyFile: '/spec-files/31-mrg.md'
+    bodyFile: '/spec-files/32-mrg.md'
     glossaryTerm: 'Machine Readable Glossary (MRG)'
     glossaryText: 'a [glossary](@) for a particular (version of a) [terminology](@) that is formatted in YAML, according to the [TEv2 MRG specifications](/docs/spec-files/mrg), to enable automated processing and integration with software systems.'
     hoverText: 'MRG: {{noRefs glossaryText}}'
@@ -1422,8 +1423,15 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:mrg'
     locator: 'mrg.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/31-mrg'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/mrg'
+    headingids:
+      - 'machine-readable-glossary-(mrg)'
+      - 'file-naming-conventions-{#mrg-file-naming-conventions}'
+      - 'mrg-structure'
+      - 'mrg-`terminology`-section-{#mrg-terminology}'
+      - 'mrg-`scopes`-section-{#mrg-scopes}'
+      - 'mrg-entries-(the-`entries`-section)-{#mrg-entries}'
+      - 'footnotes'
     vsntag: 'documentation'
   - term: 'mrg-entry'
     termType: 'concept'
@@ -1945,7 +1953,7 @@ entries:
   - id: 'saf'
     term: 'saf'
     termType: 'concept'
-    bodyFile: '/spec-files/21-saf.md'
+    bodyFile: '/spec-files/12-saf.md'
     glossaryTerm: 'Scope Administration File (SAF)'
     glossaryText: 'a YAML file that contains essential data about a particular [scope](@) (e.g., specifying where its [curated texts](@), [glossaries](@) etc. live), the relationships this [scope](@) has with other [scopes](@), and the specifications of the different [terminologies](@) that are [curated](@) within that [scope](@). The SAF of a [scope](@) is located in its [scopedir](@).'
     hoverText: 'SAF: a YAML file that contains essential data about a particular scope, such as the locations of the scope''s curated texts, glossaries, and the specifications of the curated terminologies. The SAF is located in the so-called scopedir.'
@@ -1961,8 +1969,27 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:saf'
     locator: 'saf.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/21-saf'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/saf'
+    headingids:
+      - 'scope-administration-file-(saf)'
+      - 'scope-administration-file-field-descriptions'
+      - 'saf-terminology---defining-the-scope-itself-{#scope-section}'
+      - '#-this-is-a-scope-administration-file-that-can-be-used-in-conjunction-with-tev2.'
+      - '#-the-first-section-defines-meta-data-concerning-the-scope-itself,-both-for-technical-use-and-human-use.'
+      - 'it-shows-where-directories-and-files-live-that-ar-part-of-the-scope,-and-also'
+      - 'ways-in-which-people-can-contribute,-raise-issues,-see-what''s-going-on,-discuss,-etc.'
+      - 'scope:'
+      - 'saf-scopes---mapping-scopetags-and-scopedirs-{#scopes}'
+      - '#-the-second-section-contains-a-mapping-between-scopetags-that-are-used-within-the-scope,-and-the-associated-scopedirs.'
+      - 'this-enables-tools-to-find-the-[saf](@)-of-these-[scopes](@),-and-from-there-all-other-directories,-files-etc.'
+      - 'that-live-within-them,-e.g.-to-use/import-their-data.'
+      - 'scopes:-#'
+      - 'saf-versions---enabling-changes-and-updates-in-a-scope''s-terminology-{#versions}'
+      - '#-the-third-section-specifies-the-versions-that-are-actively-maintained-by-the-curators.'
+      - 'for-each-version,-the-set-of-terms-is-selected-that-constitute-the-terminology.'
+      - 'see-the-glossary-generation-tool-(ggt)-for-details-about-the-syntax-and-semantics.'
+      - 'versions:'
+      - 'notes'
     vsntag: 'documentation'
   - term: 'scope'
     termType: 'concept'
diff --git a/docs/glossaries/mrg.tev2.terms.yaml b/docs/glossaries/mrg.tev2.terms.yaml
index 87b3056bac..a9f4a314c9 100644
--- a/docs/glossaries/mrg.tev2.terms.yaml
+++ b/docs/glossaries/mrg.tev2.terms.yaml
@@ -724,6 +724,7 @@ entries:
       - 'installing-the-tool'
       - 'calling-the-tool'
       - 'mrg-ref-handling'
+      - 'hrg-sorting-{#hrg-sorting}'
       - 'example'
       - 'processing,-errors-and-warnings'
       - 'deploying-the-tool'
@@ -1007,7 +1008,7 @@ entries:
     term: 'mrg'
     termType: 'concept'
     isa: 'glossary'
-    bodyFile: '/spec-files/31-mrg.md'
+    bodyFile: '/spec-files/32-mrg.md'
     glossaryTerm: 'Machine Readable Glossary (MRG)'
     glossaryText: 'a [glossary](@) for a particular (version of a) [terminology](@) that is formatted in YAML, according to the [TEv2 MRG specifications](/docs/spec-files/mrg), to enable automated processing and integration with software systems.'
     hoverText: 'MRG: {{noRefs glossaryText}}'
@@ -1023,8 +1024,15 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:mrg'
     locator: 'mrg.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/31-mrg'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/mrg'
+    headingids:
+      - 'machine-readable-glossary-(mrg)'
+      - 'file-naming-conventions-{#mrg-file-naming-conventions}'
+      - 'mrg-structure'
+      - 'mrg-`terminology`-section-{#mrg-terminology}'
+      - 'mrg-`scopes`-section-{#mrg-scopes}'
+      - 'mrg-entries-(the-`entries`-section)-{#mrg-entries}'
+      - 'footnotes'
     vsntag: 'terms'
   - term: 'mrg-entry'
     termType: 'concept'
@@ -1312,7 +1320,7 @@ entries:
   - id: 'saf'
     term: 'saf'
     termType: 'concept'
-    bodyFile: '/spec-files/21-saf.md'
+    bodyFile: '/spec-files/12-saf.md'
     glossaryTerm: 'Scope Administration File (SAF)'
     glossaryText: 'a YAML file that contains essential data about a particular [scope](@) (e.g., specifying where its [curated texts](@), [glossaries](@) etc. live), the relationships this [scope](@) has with other [scopes](@), and the specifications of the different [terminologies](@) that are [curated](@) within that [scope](@). The SAF of a [scope](@) is located in its [scopedir](@).'
     hoverText: 'SAF: a YAML file that contains essential data about a particular scope, such as the locations of the scope''s curated texts, glossaries, and the specifications of the curated terminologies. The SAF is located in the so-called scopedir.'
@@ -1328,8 +1336,27 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:saf'
     locator: 'saf.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/21-saf'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/saf'
+    headingids:
+      - 'scope-administration-file-(saf)'
+      - 'scope-administration-file-field-descriptions'
+      - 'saf-terminology---defining-the-scope-itself-{#scope-section}'
+      - '#-this-is-a-scope-administration-file-that-can-be-used-in-conjunction-with-tev2.'
+      - '#-the-first-section-defines-meta-data-concerning-the-scope-itself,-both-for-technical-use-and-human-use.'
+      - 'it-shows-where-directories-and-files-live-that-ar-part-of-the-scope,-and-also'
+      - 'ways-in-which-people-can-contribute,-raise-issues,-see-what''s-going-on,-discuss,-etc.'
+      - 'scope:'
+      - 'saf-scopes---mapping-scopetags-and-scopedirs-{#scopes}'
+      - '#-the-second-section-contains-a-mapping-between-scopetags-that-are-used-within-the-scope,-and-the-associated-scopedirs.'
+      - 'this-enables-tools-to-find-the-[saf](@)-of-these-[scopes](@),-and-from-there-all-other-directories,-files-etc.'
+      - 'that-live-within-them,-e.g.-to-use/import-their-data.'
+      - 'scopes:-#'
+      - 'saf-versions---enabling-changes-and-updates-in-a-scope''s-terminology-{#versions}'
+      - '#-the-third-section-specifies-the-versions-that-are-actively-maintained-by-the-curators.'
+      - 'for-each-version,-the-set-of-terms-is-selected-that-constitute-the-terminology.'
+      - 'see-the-glossary-generation-tool-(ggt)-for-details-about-the-syntax-and-semantics.'
+      - 'versions:'
+      - 'notes'
     vsntag: 'terms'
   - term: 'scope'
     termType: 'concept'
diff --git a/docs/glossaries/mrg.tev2.yaml b/docs/glossaries/mrg.tev2.yaml
index aa6952d375..c3c8a0171a 100644
--- a/docs/glossaries/mrg.tev2.yaml
+++ b/docs/glossaries/mrg.tev2.yaml
@@ -989,6 +989,7 @@ entries:
       - 'installing-the-tool'
       - 'calling-the-tool'
       - 'mrg-ref-handling'
+      - 'hrg-sorting-{#hrg-sorting}'
       - 'example'
       - 'processing,-errors-and-warnings'
       - 'deploying-the-tool'
@@ -1406,7 +1407,7 @@ entries:
     term: 'mrg'
     termType: 'concept'
     isa: 'glossary'
-    bodyFile: '/spec-files/31-mrg.md'
+    bodyFile: '/spec-files/32-mrg.md'
     glossaryTerm: 'Machine Readable Glossary (MRG)'
     glossaryText: 'a [glossary](@) for a particular (version of a) [terminology](@) that is formatted in YAML, according to the [TEv2 MRG specifications](/docs/spec-files/mrg), to enable automated processing and integration with software systems.'
     hoverText: 'MRG: {{noRefs glossaryText}}'
@@ -1422,8 +1423,15 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:mrg'
     locator: 'mrg.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/31-mrg'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/mrg'
+    headingids:
+      - 'machine-readable-glossary-(mrg)'
+      - 'file-naming-conventions-{#mrg-file-naming-conventions}'
+      - 'mrg-structure'
+      - 'mrg-`terminology`-section-{#mrg-terminology}'
+      - 'mrg-`scopes`-section-{#mrg-scopes}'
+      - 'mrg-entries-(the-`entries`-section)-{#mrg-entries}'
+      - 'footnotes'
     vsntag: 'documentation'
   - term: 'mrg-entry'
     termType: 'concept'
@@ -1945,7 +1953,7 @@ entries:
   - id: 'saf'
     term: 'saf'
     termType: 'concept'
-    bodyFile: '/spec-files/21-saf.md'
+    bodyFile: '/spec-files/12-saf.md'
     glossaryTerm: 'Scope Administration File (SAF)'
     glossaryText: 'a YAML file that contains essential data about a particular [scope](@) (e.g., specifying where its [curated texts](@), [glossaries](@) etc. live), the relationships this [scope](@) has with other [scopes](@), and the specifications of the different [terminologies](@) that are [curated](@) within that [scope](@). The SAF of a [scope](@) is located in its [scopedir](@).'
     hoverText: 'SAF: a YAML file that contains essential data about a particular scope, such as the locations of the scope''s curated texts, glossaries, and the specifications of the curated terminologies. The SAF is located in the so-called scopedir.'
@@ -1961,8 +1969,27 @@ entries:
     scopetag: 'tev2'
     termid: 'concept:saf'
     locator: 'saf.md'
-    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/21-saf'
-    headingids: []
+    navurl: 'https://tno-terminology-design.github.io/tev2-specifications/docs/spec-files/saf'
+    headingids:
+      - 'scope-administration-file-(saf)'
+      - 'scope-administration-file-field-descriptions'
+      - 'saf-terminology---defining-the-scope-itself-{#scope-section}'
+      - '#-this-is-a-scope-administration-file-that-can-be-used-in-conjunction-with-tev2.'
+      - '#-the-first-section-defines-meta-data-concerning-the-scope-itself,-both-for-technical-use-and-human-use.'
+      - 'it-shows-where-directories-and-files-live-that-ar-part-of-the-scope,-and-also'
+      - 'ways-in-which-people-can-contribute,-raise-issues,-see-what''s-going-on,-discuss,-etc.'
+      - 'scope:'
+      - 'saf-scopes---mapping-scopetags-and-scopedirs-{#scopes}'
+      - '#-the-second-section-contains-a-mapping-between-scopetags-that-are-used-within-the-scope,-and-the-associated-scopedirs.'
+      - 'this-enables-tools-to-find-the-[saf](@)-of-these-[scopes](@),-and-from-there-all-other-directories,-files-etc.'
+      - 'that-live-within-them,-e.g.-to-use/import-their-data.'
+      - 'scopes:-#'
+      - 'saf-versions---enabling-changes-and-updates-in-a-scope''s-terminology-{#versions}'
+      - '#-the-third-section-specifies-the-versions-that-are-actively-maintained-by-the-curators.'
+      - 'for-each-version,-the-set-of-terms-is-selected-that-constitute-the-terminology.'
+      - 'see-the-glossary-generation-tool-(ggt)-for-details-about-the-syntax-and-semantics.'
+      - 'versions:'
+      - 'notes'
     vsntag: 'documentation'
   - term: 'scope'
     termType: 'concept'