diff --git a/data/default.csl b/data/default.csl
index 8b344d44a..971f4003e 100644
--- a/data/default.csl
+++ b/data/default.csl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="in-text" demote-non-dropping-particle="display-and-sort" page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" page-range-format="chicago-16" version="1.0">
   <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
     <title>Chicago Manual of Style 18th edition (author-date)</title>
-    <title-short>CMOS (author-date)</title-short>
+    <title-short>CMOS with Bluebook (author-date [13.102])</title-short>
     <id>http://www.zotero.org/styles/chicago-author-date</id>
     <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="sociology"/>
     <category field="theology"/>
     <summary>Chicago-style source citations (with Bluebook for legal citations), author-date system</summary>
-    <updated>2025-05-19T00:00:00+00:00</updated>
+    <updated>2025-08-07T00:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -58,23 +58,33 @@
       <term form="verb-short" name="editortranslator">ed. and trans.</term>
       <term form="verb-short" name="illustrator">ill.</term>
       <term form="short" name="legislation">Pub. L.</term>
-      <term form="short" name="line">
-        <single>line</single>
-        <multiple>lines</multiple>
-      </term>
       <term name="manuscript">unpublished manuscript</term>
-      <term form="verb" name="narrator">read by</term>
-      <!-- both 'narrated by' (CMOS18 14.58) and 'read by' (CMOS18 14.164): taking the latter as it is in the section on recorded readings -->
       <term name="original-work-published">originally published as</term>
       <term form="short" name="paper-conference">paper</term>
-      <term name="review-of">review of the</term>
-      <term form="short" name="review-of">review of</term>
+      <!-- 'under' replaces 's.v.' from CMOS17 and earlier (CMOS18 14.130) -->
       <term name="sub-verbo">under</term>
       <term form="short" name="sub-verbo">under</term>
       <term name="timestamp">at</term>
       <term form="verb-short" name="translator">trans.</term>
     </terms>
   </locale>
+  <locale xml:lang="en-GB">
+    <terms>
+      <!-- ensure consistency with other `en-GB` contractions -->
+      <term form="short" name="collection-number">
+        <single>vol.</single>
+        <multiple>vols</multiple>
+      </term>
+      <term form="short" name="editor-translator">
+        <single>ed. and trans.</single>
+        <multiple>eds and trans.</multiple>
+      </term>
+      <term form="short" name="editortranslator">
+        <single>ed. and trans.</single>
+        <multiple>eds and trans.</multiple>
+      </term>
+    </terms>
+  </locale>
   <!-- Contents:
     
        This file interprets Chicago using APA's four basic reference elements
@@ -106,10 +116,6 @@
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
         6. Legal references
-            6.1. Legal author
-            6.2. Legal date
-            6.3. Legal title
-            6.4. Legal source
   -->
   <!-- In this file, macros suffixed `-bib` and `-note` are parallel versions
        of the same features for the bibliography and notes, and all changes
@@ -138,6 +144,19 @@
        : bill hearing legal_case legislation regulation treaty
   -->
   <!-- Variable labels -->
+  <macro name="label-chapter-number">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="chapter-number" type="song">
+          <text value="track"/>
+        </if>
+        <else-if is-numeric="chapter-number">
+          <label form="short" variable="chapter-number"/>
+        </else-if>
+      </choose>
+      <text variable="chapter-number"/>
+    </group>
+  </macro>
   <macro name="label-chapter-number-capitalized">
     <group delimiter=" ">
       <choose>
@@ -233,8 +252,26 @@
     <group delimiter=" ">
       <choose>
         <if locator="page"/>
+        <else-if match="any" type="bill hearing legal_case legislation regulation treaty">
+          <!-- Bluebook-style labels for legal types (CMOS18 14.174) -->
+          <choose>
+            <if locator="chapter paragraph section" match="any">
+              <label form="symbol" variable="locator"/>
+            </if>
+            <else>
+              <label form="short" variable="locator"/>
+            </else>
+          </choose>
+        </else-if>
         <else-if is-numeric="locator">
-          <label form="short" variable="locator"/>
+          <choose>
+            <if locator="line">
+              <label variable="locator"/>
+            </if>
+            <else>
+              <label form="short" variable="locator"/>
+            </else>
+          </choose>
         </else-if>
         <else-if locator="chapter line verse" match="any"/>
         <!-- a non-numeric canonical reference is identified by its formatting and does not need a label (CMOS18 14.143-54) -->
@@ -308,14 +345,14 @@
     <group delimiter=" ">
       <choose>
         <!-- TODO: Replace with `supplement-number` label when CSL provides one -->
-        <if variable="supplement-number volume-title">
+        <if is-numeric="supplement-number" variable="volume-title">
           <!-- if there is a volume title, it is already described as a supplement -->
           <text form="short" term="issue"/>
         </if>
-        <else-if type="periodical" variable="supplement-number title">
+        <else-if is-numeric="supplement-number" type="periodical" variable="title">
           <text form="short" term="issue"/>
         </else-if>
-        <else-if variable="supplement-number">
+        <else-if is-numeric="supplement-number">
           <text form="short" term="supplement"/>
         </else-if>
       </choose>
@@ -373,7 +410,7 @@
   <!-- 1. Author (CMOS18 13.74-86) -->
   <macro name="author-bib">
     <names variable="composer">
-      <name delimiter-precedes-last="always" name-as-sort-order="first"/>
+      <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="author"/>
@@ -461,11 +498,11 @@
         <text macro="title-and-descriptions-short"/>
       </if>
       <else-if match="any" type="interview personal_communication">
-        <text macro="author-short-and-recipient"/>
+        <text macro="author-inline-and-recipient"/>
       </else-if>
       <else>
         <names variable="composer">
-          <name form="short" initialize-with=". "/>
+          <name and="text" form="short" initialize-with=". "/>
           <substitute>
             <names variable="author"/>
             <names variable="guest"/>
@@ -476,16 +513,17 @@
               </if>
             </choose>
             <choose>
-              <if type="classic">
-                <!-- contributors fall after the title of `classic` (CMOS18 14.147) -->
+              <if match="any" type="classic performance">
+                <!-- contributors fall after the title of `classic` (CMOS18 14.147), `performance` (CMOS18 14.166) -->
                 <text macro="author-title-substitute-short"/>
               </if>
-              <else-if type="entry-dictionary" variable="container-title">
+              <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
                 <!-- contributors fall after the title of unsigned reference entries (CMOS18 14.130) -->
-                <text macro="author-title-substitute-container"/>
-              </else-if>
-              <else-if type="entry-encyclopedia" variable="container-title">
-                <text macro="author-title-substitute-container"/>
+                <choose>
+                  <if variable="container-title">
+                    <text macro="author-title-substitute-container"/>
+                  </if>
+                </choose>
               </else-if>
             </choose>
             <names variable="illustrator"/>
@@ -557,7 +595,8 @@
     </choose>
   </macro>
   <!-- Author elements -->
-  <macro name="author-short-and-recipient">
+  <macro name="author-inline-and-recipient">
+    <!-- identical to `author-short-and-recipient` but with initialization -->
     <group delimiter=" ">
       <choose>
         <!-- Inaccessible personal commmunication is cited in-text (CMOS18 14.111) -->
@@ -565,6 +604,7 @@
           <!-- These variables indicate whether the letter is retrievable by the reader -->
           <group delimiter=", ">
             <names variable="author">
+              <name and="text" initialize-with=". "/>
               <substitute>
                 <text macro="title-and-descriptions-short"/>
               </substitute>
@@ -574,7 +614,7 @@
             <if match="none" variable="genre">
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text" initialize-with=". "/>
               </names>
             </if>
           </choose>
@@ -582,20 +622,20 @@
         <else-if variable="author recipient">
           <names variable="author">
             <label/>
-            <name form="short"/>
+            <name and="text" form="short" initialize-with=". "/>
           </names>
           <choose>
             <if match="none" variable="genre">
               <names variable="recipient">
                 <label form="verb" suffix=" "/>
-                <name form="short"/>
+                <name and="text" form="short" initialize-with=". "/>
               </names>
             </if>
           </choose>
         </else-if>
         <else>
           <names variable="author">
-            <name form="short"/>
+            <name and="text" form="short" initialize-with=". "/>
             <substitute>
               <text macro="title-and-descriptions-short"/>
             </substitute>
@@ -692,31 +732,31 @@
       <if match="none" variable="container-title"/>
       <else-if match="any" type="article-magazine article-newspaper">
         <!-- Anonymous magazine/newspaper articles substitute name of publication (CMOS18 14.87, 14.97) -->
-        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+        <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if match="any" type="review review-book" variable="reviewed-author reviewed-genre reviewed-title">
         <!-- Publication name also substituted for unsigned reviews (CMOS18 14.102) -->
-        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+        <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if match="any" type="interview paper-conference">
         <choose>
           <if match="none" variable="collection-editor compiler editor editorial-director">
             <!-- serial usage -->
-            <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+            <text font-style="italic" text-case="title" variable="container-title"/>
           </if>
         </choose>
       </else-if>
       <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
         <!-- Anonymous entries in reference works (CMOS18 14.130) -->
-        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+        <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if type="broadcast">
         <!-- TV broadcasts and podcasts (CMOS18 14.165, 14.168) -->
-        <text font-style="italic" form="short" text-case="title" variable="container-title"/>
+        <text font-style="italic" text-case="title" variable="container-title"/>
       </else-if>
       <else-if type="webpage">
         <!-- Website title substituted in bibliography only (CMOS18 14.104) -->
-        <text form="short" text-case="title" variable="container-title"/>
+        <text text-case="title" variable="container-title"/>
       </else-if>
     </choose>
   </macro>
@@ -737,7 +777,7 @@
         <date date-parts="year" form="text" variable="available-date"/>
       </else-if>
       <else-if variable="event-date">
-        <date date-parts="year" form="text" variable="event-date"/>
+        <text macro="date-event-year"/>
       </else-if>
       <else-if variable="status">
         <group>
@@ -759,21 +799,6 @@
           </if>
         </choose>
       </else-if>
-      <else-if type="article-journal">
-        <choose>
-          <if match="any" variable="number page">
-            <text form="short" term="no date"/>
-          </if>
-          <else-if match="any" variable="available-date collection-title issue supplement-number volume">
-            <!-- journal articles should be forthcoming with an issue/volume but no date or locator (CMOS18 14.75) -->
-            <text term="forthcoming"/>
-          </else-if>
-          <else>
-            <text form="short" term="no date"/>
-          </else>
-        </choose>
-        <text prefix="-" variable="year-suffix"/>
-      </else-if>
       <else>
         <text form="short" term="no date"/>
         <text prefix="-" variable="year-suffix"/>
@@ -797,12 +822,12 @@
             <choose>
               <if match="any" type="interview personal_communication">
                 <choose>
-                  <if match="none" variable="archive archive-place container-title DOI number publisher references URL">
+                  <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
                     <!-- These variables indicate that the communication is retrievable by the reader. If not, then use the in-text-only personal communication format -->
-                    <text macro="date-issued-full"/>
+                    <text macro="date-issued-year"/>
                   </if>
                   <else>
-                    <text macro="date-issued-year"/>
+                    <text macro="date-issued-full"/>
                   </else>
                 </choose>
               </if>
@@ -818,112 +843,38 @@
         <date date-parts="year" form="text" variable="available-date"/>
       </else-if>
       <else-if variable="event-date">
-        <date date-parts="year" form="text" variable="event-date"/>
+        <text macro="date-event-year"/>
       </else-if>
       <else-if variable="status">
         <!-- Print the status variable rather than use generic CSL terms (`in press`, etc.) -->
         <text text-case="lowercase" variable="status"/>
         <text prefix="-" variable="year-suffix"/>
       </else-if>
-      <else>
+      <else-if match="any" type="interview personal_communication">
         <choose>
-          <if match="any" type="interview personal_communication">
-            <choose>
-              <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-                <!-- only give n.d. for accessible personal communication (CMOS18 14.111)-->
-                <text form="short" term="no date"/>
-              </if>
-            </choose>
-            <text prefix="-" variable="year-suffix"/>
+          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+            <!-- only give n.d. for accessible personal communication (CMOS18 14.111)-->
+            <text form="short" term="no date"/>
           </if>
-          <else-if match="any" type="classic collection entry entry-dictionary entry-encyclopedia">
-            <!-- do not give n.d. for archival collections (CMOS18 14.128), `classic` (CMOS18 14.143), or reference entries (CMOS18 14.131) -->
-            <text prefix="-" variable="year-suffix"/>
-          </else-if>
-          <else-if type="manuscript">
-            <!-- do not give n.d. with a bare shelfmark -->
-            <choose>
-              <if match="any" variable="container-title event-date event-place event-title genre title publisher publisher-place">
-                <text form="short" term="no date"/>
-                <text prefix="-" variable="year-suffix"/>
-              </if>
-            </choose>
-          </else-if>
-          <else-if type="article-journal">
-            <choose>
-              <if match="any" variable="number page">
-                <text form="short" term="no date"/>
-              </if>
-              <else-if match="any" variable="available-date collection-title issue supplement-number volume">
-                <!-- journal articles should be forthcoming with an issue/volume but no date or locator (CMOS18 14.75) -->
-                <text term="forthcoming"/>
-              </else-if>
-              <else>
-                <text form="short" term="no date"/>
-              </else>
-            </choose>
-            <text prefix="-" variable="year-suffix"/>
-          </else-if>
-          <else>
+        </choose>
+        <text prefix="-" variable="year-suffix"/>
+      </else-if>
+      <else-if match="any" type="classic collection entry entry-dictionary entry-encyclopedia">
+        <!-- do not give n.d. for archival collections (CMOS18 14.128), `classic` (CMOS18 14.143), or reference entries (CMOS18 14.131) -->
+        <text prefix="-" variable="year-suffix"/>
+      </else-if>
+      <else-if type="manuscript">
+        <!-- do not give n.d. with a bare shelfmark -->
+        <choose>
+          <if match="any" variable="container-title event-date event-place event-title genre title publisher publisher-place">
             <text form="short" term="no date"/>
             <text prefix="-" variable="year-suffix"/>
-          </else>
-        </choose>
-      </else>
-    </choose>
-  </macro>
-  <macro name="date-sort">
-    <!-- Sort items by issue date as printed by `source-date-issued-month-day` macro -->
-    <choose>
-      <if type="personal_communication" variable="event-date issued">
-        <date date-parts="year" form="text" variable="event-date"/>
-      </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <choose>
-          <if type="article-newspaper">
-            <text macro="date-issued-leading-zeros-full"/>
           </if>
-          <else-if match="any" variable="issue supplement-number volume">
-            <text macro="date-issued-leading-zeros-year-month"/>
-          </else-if>
-          <else>
-            <text macro="date-issued-leading-zeros-full"/>
-          </else>
         </choose>
       </else-if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="none" variable="collection-editor compiler editor editorial-director">
-            <!-- serial usage -->
-            <choose>
-              <if match="any" variable="issue supplement-number volume">
-                <text macro="date-issued-leading-zeros-year-month"/>
-              </if>
-              <else>
-                <text macro="date-issued-leading-zeros-full"/>
-              </else>
-            </choose>
-          </if>
-          <else>
-            <date date-parts="year" form="text" variable="issued"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-        <choose>
-          <if match="any" variable="DOI URL">
-            <text macro="date-issued-leading-zeros-full"/>
-          </if>
-          <else>
-            <date date-parts="year" form="text" variable="issued"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if match="any" type="article broadcast collection dataset document event graphic interview manuscript map patent performance personal_communication post software song speech standard webpage">
-        <text macro="date-issued-leading-zeros-full"/>
-      </else-if>
       <else>
-        <date date-parts="year" form="text" variable="issued"/>
+        <text form="short" term="no date"/>
+        <text prefix="-" variable="year-suffix"/>
       </else>
     </choose>
   </macro>
@@ -946,7 +897,40 @@
       </else>
     </choose>
   </macro>
+  <macro name="date-sort-year">
+    <!-- while reference lists are to be sorted chronologically (CMOS18 13.112), it appears that only the year is to be taken into account (CMOS18 13.114) -->
+    <choose>
+      <if type="personal_communication" variable="event-date issued">
+        <date date-parts="year" form="text" variable="event-date"/>
+      </if>
+      <else>
+        <text macro="date-issued-year"/>
+      </else>
+    </choose>
+  </macro>
   <!-- Date elements -->
+  <macro name="date-event-full">
+    <choose>
+      <if is-uncertain-date="issued">
+        <!-- guessed-at date (CMOS18 14.44) -->
+        <date form="text" prefix="[" suffix="?]" variable="event-date"/>
+      </if>
+      <else>
+        <date form="text" variable="event-date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-event-year">
+    <choose>
+      <if is-uncertain-date="issued">
+        <!-- guessed-at date (CMOS18 14.44) -->
+        <date date-parts="year" form="text" prefix="[" suffix="?]" variable="event-date"/>
+      </if>
+      <else>
+        <date date-parts="year" form="text" variable="event-date"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="date-issued-full">
     <choose>
       <if is-uncertain-date="issued">
@@ -958,19 +942,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-issued-leading-zeros-full">
-    <date delimiter="-" variable="issued">
-      <date-part name="year"/>
-      <date-part form="numeric-leading-zeros" name="month"/>
-      <date-part form="numeric-leading-zeros" name="day"/>
-    </date>
-  </macro>
-  <macro name="date-issued-leading-zeros-year-month">
-    <date delimiter="-" variable="issued">
-      <date-part name="year"/>
-      <date-part form="numeric-leading-zeros" name="month"/>
-    </date>
-  </macro>
   <macro name="date-issued-month">
     <date variable="issued">
       <date-part name="month"/>
@@ -1105,7 +1076,7 @@
       </group>
       <text macro="source-medium-bib"/>
       <text macro="source-archive-bib"/>
-      <text macro="source-DOI-URL-bib"/>
+      <text macro="source-date-accessed-DOI-URL-bib"/>
     </group>
   </macro>
   <!-- 3.1. Title -->
@@ -1116,7 +1087,7 @@
         <text macro="title-and-part-filter-review-bib"/>
       </if>
       <else-if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text macro="title-serial-bib"/>
+        <text macro="title-and-part-filter-review-bib"/>
       </else-if>
       <else-if match="any" type="interview paper-conference">
         <choose>
@@ -1126,7 +1097,7 @@
           </if>
           <else>
             <!-- serial usage -->
-            <text macro="title-serial-bib"/>
+            <text macro="title-and-part-filter-review-bib"/>
           </else>
         </choose>
       </else-if>
@@ -1185,13 +1156,14 @@
   </macro>
   <macro name="title-monographic-bib">
     <!-- For monographic items, assume `part-number` and `part-title` refer to the book/volume. -->
+    <!-- There is no `title-monographic-note` as notes always open with the primary title. -->
     <choose>
       <if variable="container-title">
         <text macro="title-primary"/>
       </if>
       <!-- For monographic items without `container-title`, bibliography entries list `part-title` or `volume-title` first if available -->
       <else-if variable="part-title">
-        <text font-style="italic" text-case="title" variable="part-title"/>
+        <text macro="title-part"/>
       </else-if>
       <else-if variable="volume-title">
         <text font-style="italic" text-case="title" variable="volume-title"/>
@@ -1203,38 +1175,54 @@
   </macro>
   <macro name="title-part">
     <choose>
-      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-        <text quotes="true" text-case="title" variable="part-title"/>
+      <if type="patent">
+        <!-- No italics or quotes, sentence case -->
+        <text form="short" text-case="capitalize-first" variable="part-title"/>
       </if>
-      <else-if match="any" type="interview paper-conference">
-        <choose>
-          <if match="any" variable="collection-editor compiler editor editorial-director">
-            <!-- monographic usage -->
-            <text font-style="italic" text-case="title" variable="part-title"/>
-          </if>
-          <else>
-            <!-- serial usage -->
-            <text quotes="true" text-case="title" variable="part-title"/>
-          </else>
-        </choose>
+      <else-if match="any" type="bill collection legislation regulation treaty">
+        <!-- No italics or quotes, title case -->
+        <text text-case="title" variable="part-title"/>
+      </else-if>
+      <else-if type="legal_case">
+        <!-- Italicized, sentence case -->
+        <text font-style="italic" variable="part-title"/>
+      </else-if>
+      <else-if match="any" type="book classic graphic hearing map">
+        <!-- Italicized, title case (regardless of `container-title`) -->
+        <text font-style="italic" text-case="title" variable="part-title"/>
+      </else-if>
+      <else-if type="entry-encyclopedia" variable="author container-title">
+        <!-- Signed encyclopedia entry in quotes, title case (CMOS18 14.132) -->
+        <text quotes="true" text-case="title" variable="part-title"/>
+      </else-if>
+      <else-if type="entry-dictionary" variable="container-title">
+        <!-- Quotes, sentence case -->
+        <text quotes="true" variable="part-title"/>
+      </else-if>
+      <else-if type="entry-encyclopedia" variable="container-title">
+        <!-- Quotes, sentence case -->
+        <text quotes="true" variable="part-title"/>
+      </else-if>
+      <else-if type="post">
+        <!-- Quotes, sentence case -->
+        <text quotes="true" variable="part-title"/>
+      </else-if>
+      <!-- Other types are formatted based on presence of `container-title` -->
+      <else-if variable="container-title">
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="part-title"/>
+      </else-if>
+      <else-if match="any" type="article dataset document interview manuscript paper-conference personal_communication speech thesis webpage">
+        <!-- Container-like but not necessarily with `container-title` -->
+        <!-- Quotes, title case -->
+        <text quotes="true" text-case="title" variable="part-title"/>
       </else-if>
       <else>
+        <!-- Italicized, title case (default) -->
         <text font-style="italic" text-case="title" variable="part-title"/>
       </else>
     </choose>
   </macro>
-  <macro name="title-serial-bib">
-    <!-- For serials, assume that `part-number` and `part-title` refer to the article and append to `title` -->
-    <choose>
-      <if variable="container-title">
-        <text macro="title-and-part-filter-review-bib"/>
-      </if>
-      <else>
-        <!-- for serial items without `container-title`, don't append `volume-title` to `title` -->
-        <text macro="title-and-part-filter-review-bib"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="title-primary">
     <choose>
       <if type="patent">
@@ -1447,6 +1435,9 @@
           </if>
         </choose>
       </else-if>
+      <else-if variable="chapter-number">
+        <text macro="label-chapter-number"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="description-generic-bib">
@@ -1472,7 +1463,7 @@
           <!-- `genre` printed with `number` -->
           <names variable="interviewer">
             <label form="verb" suffix=" " text-case="capitalize-first"/>
-            <name/>
+            <name and="text"/>
           </names>
         </if>
         <else-if variable="genre">
@@ -1487,7 +1478,7 @@
         <else-if variable="interviewer">
           <names variable="interviewer">
             <label form="verb" suffix=" " text-case="capitalize-first"/>
-            <name/>
+            <name and="text"/>
           </names>
         </else-if>
         <else>
@@ -1502,7 +1493,7 @@
       <if disambiguate="true">
         <names variable="interviewer">
           <label form="verb" suffix=" "/>
-          <name/>
+          <name and="text"/>
           <substitute>
             <text macro="description-format-short"/>
           </substitute>
@@ -1534,7 +1525,7 @@
               <!-- `genre` appears with `number` -->
               <names variable="recipient">
                 <label form="verb" suffix=" " text-case="capitalize-first"/>
-                <name/>
+                <name and="text"/>
               </names>
             </if>
             <else-if variable="genre">
@@ -1542,19 +1533,19 @@
                 <text macro="description-format-bib"/>
                 <names variable="recipient">
                   <label form="verb" suffix=" "/>
-                  <name/>
+                  <name and="text"/>
                 </names>
               </group>
             </else-if>
             <else>
               <names variable="recipient">
                 <label form="verb" suffix=" " text-case="capitalize-first"/>
-                <name/>
+                <name and="text"/>
               </names>
             </else>
           </choose>
           <text variable="event-place"/>
-          <date form="text" variable="event-date"/>
+          <text macro="date-event-full"/>
         </group>
       </if>
       <else>
@@ -1571,7 +1562,7 @@
             <text macro="description-format-short"/>
             <names variable="recipient">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name and="text"/>
             </names>
           </group>
         </if>
@@ -1580,7 +1571,7 @@
         </else>
       </choose>
       <text variable="event-place"/>
-      <date form="text" variable="event-date"/>
+      <text macro="date-event-full"/>
     </group>
   </macro>
   <macro name="description-paper-conference-bib">
@@ -1610,14 +1601,14 @@
           <if variable="reviewed-genre reviewed-title title">
             <names variable="reviewed-author">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name and="text"/>
             </names>
           </if>
           <else-if variable="reviewed-genre"/>
           <else>
             <names variable="reviewed-author">
               <label form="verb" suffix=" "/>
-              <name/>
+              <name and="text"/>
             </names>
           </else>
         </choose>
@@ -1636,7 +1627,7 @@
             <if match="none" variable="reviewed-title">
               <names variable="reviewed-author">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
             </if>
           </choose>
@@ -1656,7 +1647,7 @@
   </macro>
   <macro name="description-review-short">
     <group delimiter=" ">
-      <text form="short" term="review-of"/>
+      <text term="review-of"/>
       <text macro="description-review-title-short"/>
     </group>
   </macro>
@@ -1664,26 +1655,12 @@
     <!-- Anonymous reviews appear as 'unsigned' (CMOS18 14.102) -->
     <choose>
       <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
-        <choose>
-          <if variable="reviewed-genre">
-            <text term="review-of" text-case="capitalize-first"/>
-          </if>
-          <else>
-            <text form="short" term="review-of" text-case="capitalize-first"/>
-          </else>
-        </choose>
+        <text term="review-of" text-case="capitalize-first"/>
       </if>
       <else>
         <group delimiter=" ">
           <text term="anonymous" text-case="capitalize-first"/>
-          <choose>
-            <if variable="reviewed-genre">
-              <text term="review-of"/>
-            </if>
-            <else>
-              <text form="short" term="review-of"/>
-            </else>
-          </choose>
+          <text term="review-of"/>
         </group>
       </else>
     </choose>
@@ -1716,12 +1693,7 @@
   </macro>
   <macro name="description-serial-bib">
     <group delimiter=". ">
-      <choose>
-        <if match="none" type="periodical" variable="volume-title">
-          <!-- move `genre` with special issue (CMOS18 14.77) or supplement (CMOS18 14.78) -->
-          <text macro="description-format-bib"/>
-        </if>
-      </choose>
+      <text macro="description-format-bib"/>
       <!-- `section` provides magazine departments (CMOS18 14.88) and newspaper column names (CMOS18 14.93) -->
       <text macro="label-section-capitalized"/>
     </group>
@@ -1804,7 +1776,7 @@
                 <if variable="collection-editor">
                   <names variable="collection-editor">
                     <label form="verb" suffix=" " text-case="capitalize-first"/>
-                    <name/>
+                    <name and="text"/>
                   </names>
                 </if>
                 <else>
@@ -1862,69 +1834,69 @@
           <group delimiter=". ">
             <names variable="container-author">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="editor-translator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names delimiter=". " variable="editor translator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="editorial-director">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="guest">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="host">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="illustrator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="narrator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names delimiter=". " variable="compiler chair organizer curator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names delimiter=". " variable="series-creator executive-producer">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="producer">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="director">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <choose>
               <if match="any" type="broadcast performance">
                 <names variable="script-writer">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
               </if>
             </choose>
             <names variable="performer">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <choose>
               <if match="none" type="thesis">
                 <names variable="contributor">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
               </if>
             </choose>
@@ -1937,73 +1909,73 @@
               <if match="none" variable="container-title">
                 <names variable="container-author">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="editor-translator">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names delimiter=". " variable="editor translator">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="editorial-director">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="guest">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="host">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
               </if>
             </choose>
             <names variable="illustrator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <names variable="narrator">
               <label form="verb" suffix=" " text-case="capitalize-first"/>
-              <name/>
+              <name and="text"/>
             </names>
             <choose>
               <if match="none" variable="container-title">
                 <names delimiter=". " variable="compiler chair organizer curator">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names delimiter=". " variable="series-creator executive-producer">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="producer">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <names variable="director">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <choose>
                   <if match="any" type="broadcast performance">
                     <names variable="script-writer">
                       <label form="verb" suffix=" " text-case="capitalize-first"/>
-                      <name/>
+                      <name and="text"/>
                     </names>
                   </if>
                 </choose>
                 <names variable="performer">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
                 <choose>
                   <if match="none" type="song thesis">
                     <names variable="contributor">
                       <label form="verb" suffix=" " text-case="capitalize-first"/>
-                      <name/>
+                      <name and="text"/>
                     </names>
                   </if>
                 </choose>
@@ -2014,7 +1986,7 @@
                 <!-- Song contributors attached to album (CMOS18 14.163) -->
                 <names variable="contributor">
                   <label form="verb" suffix=" " text-case="capitalize-first"/>
-                  <name/>
+                  <name and="text"/>
                 </names>
               </if>
             </choose>
@@ -2027,31 +1999,31 @@
     <group delimiter=". ">
       <names delimiter=". " variable="translator narrator">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="compiler chair organizer curator">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="producer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="director">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="script-writer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="performer">
         <label form="verb" suffix=" " text-case="capitalize-first"/>
-        <name/>
+        <name and="text"/>
       </names>
     </group>
   </macro>
@@ -2157,7 +2129,7 @@
               <text macro="title-primary"/>
               <names variable="collection-editor">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
             </group>
           </group>
@@ -2185,7 +2157,7 @@
               <text macro="title-primary"/>
               <names variable="collection-editor">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
             </group>
           </group>
@@ -2208,7 +2180,7 @@
   </macro>
   <macro name="identifier-volume-monographic-bib">
     <choose>
-      <if match="any" type="article-journal article-magazine article-newspaper broadcast event interview patent performance periodical post post-weblog review review-book speech webpage"/>
+      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book"/>
       <else-if match="any" type="interview paper-conference">
         <choose>
           <if match="any" variable="collection-editor compiler editor editorial-director">
@@ -2224,30 +2196,28 @@
   </macro>
   <!-- 4. Source -->
   <macro name="source-bib">
-    <group delimiter=". ">
-      <choose>
-        <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
-          <!-- Serial items -->
-          <text macro="source-serial-bib"/>
-        </if>
-        <else-if match="any" type="interview paper-conference">
-          <choose>
-            <if match="any" variable="collection-editor container-author editor editorial-director">
-              <!-- monographic usage -->
-              <text macro="source-monographic-bib"/>
-            </if>
-            <else>
-              <!-- serial usage -->
-              <text macro="source-serial-bib"/>
-            </else>
-          </choose>
-        </else-if>
-        <else-if match="any" type="patent post webpage"/>
-        <else>
-          <text macro="source-monographic-bib"/>
-        </else>
-      </choose>
-    </group>
+    <choose>
+      <if match="any" type="article-journal article-magazine article-newspaper periodical post-weblog review review-book">
+        <!-- serial usage -->
+        <text macro="source-serial-bib"/>
+      </if>
+      <else-if match="any" type="interview paper-conference">
+        <choose>
+          <if match="any" variable="collection-editor container-author editor editorial-director">
+            <!-- monographic usage -->
+            <text macro="source-monographic-bib"/>
+          </if>
+          <else>
+            <!-- serial usage -->
+            <text macro="source-serial-bib"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if match="any" type="patent post webpage"/>
+      <else>
+        <text macro="source-monographic-bib"/>
+      </else>
+    </choose>
   </macro>
   <!-- 4.1. Serial sources -->
   <macro name="source-serial-bib">
@@ -2297,25 +2267,20 @@
     <group delimiter=", ">
       <choose>
         <!-- Journal special issues (CMOS18 14.77) and supplements (CMOS18 14.78) -->
-        <if variable="collection-title supplement-number"/>
+        <if match="none" variable="container-title"/>
+        <else-if match="none" type="periodical" variable="supplement-number volume-title"/>
+        <!-- TODO: use `container-genre` here once available to allow a custom description of the journal volume -->
         <else-if variable="supplement-number volume-title">
           <text term="supplement" text-case="capitalize-first"/>
         </else-if>
         <else-if type="periodical" variable="supplement-number title">
           <text term="supplement" text-case="capitalize-first"/>
         </else-if>
-        <else-if match="any" type="periodical" variable="volume-title">
-          <choose>
-            <if variable="genre">
-              <text text-case="capitalize-first" variable="genre"/>
-            </if>
-            <else-if variable="volume-title">
-              <text term="special-issue" text-case="capitalize-first"/>
-            </else-if>
-            <else-if type="periodical" variable="editor title">
-              <text term="special-issue" text-case="capitalize-first"/>
-            </else-if>
-          </choose>
+        <else-if variable="volume-title">
+          <text term="special-issue" text-case="capitalize-first"/>
+        </else-if>
+        <else-if type="periodical" variable="title">
+          <text term="special-issue" text-case="capitalize-first"/>
         </else-if>
       </choose>
       <text macro="source-serial-name"/>
@@ -2386,7 +2351,7 @@
                     <else-if match="none" variable="issue volume"/>
                     <else>
                       <text macro="source-date-bib"/>
-                      <!-- for author-date 17th edition: -->
+                      <!-- for CMOS17 author-date: -->
                       <!-- <text macro="source-date-issued-month-day"/> -->
                     </else>
                   </choose>
@@ -2430,14 +2395,14 @@
                       <choose>
                         <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
                           <text macro="source-date-bib"/>
-                          <!-- for author-date 17th edition: -->
+                          <!-- for CMOS17 author-date: -->
                           <!-- <text macro="source-date-issued-month-day"/> -->
                         </if>
                       </choose>
                     </else-if>
                     <else>
                       <text macro="source-date-bib"/>
-                      <!-- for author-date 17th edition: -->
+                      <!-- for CMOS17 author-date: -->
                       <!-- <text macro="source-date-issued-month-day"/> -->
                     </else>
                   </choose>
@@ -2452,7 +2417,7 @@
                   <choose>
                     <if match="any" variable="author chair collection-editor compiler composer curator director editor editor-translator editorial-director executive-producer guest host illustrator organizer producer series-creator translator">
                       <text macro="source-date-bib" prefix="(" suffix=")"/>
-                      <!-- for author-date 17th edition: -->
+                      <!-- for CMOS17 author-date: -->
                       <!-- <text macro="source-date-issued-month-day" prefix="(" suffix=")"/> -->
                     </if>
                   </choose>
@@ -2489,6 +2454,8 @@
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
         <text macro="source-date-bib"/>
+        <!-- for CMOS17 author-date: -->
+        <!-- <text macro="source-date-issued-full-serial"/> -->
       </group>
     </group>
   </macro>
@@ -2496,9 +2463,9 @@
   <macro name="source-serial-locator">
     <choose>
       <if match="any" variable="locator number">
-        <!-- Page numbers cited in notes appear alongside article ID (CMOS18 14.71) -->
         <group delimiter=", ">
           <text macro="label-locator"/>
+          <!-- an article ID appears alongside locators in notes (CMOS18 14.71) -->
           <text variable="number"/>
         </group>
       </if>
@@ -2553,8 +2520,8 @@
           </if>
         </choose>
       </else-if>
-      <!-- if printing chapter page numbers:
-      <else-if variable="chapter-number page"><text term="in" text-case="capitalize-first"/></else-if>
+      <!-- if printing chapter page numbers (CMOS17/classic):
+      <else-if variable="chapter-number page title"><text term="in" text-case="capitalize-first"/></else-if>
       -->
       <else-if variable="chapter-number">
         <group delimiter=" ">
@@ -2577,7 +2544,7 @@
   <macro name="source-monographic-title-bib">
     <choose>
       <if variable="part-title">
-        <text font-style="italic" text-case="title" variable="part-title"/>
+        <text macro="title-part"/>
       </if>
       <else-if variable="volume-title">
         <text font-style="italic" text-case="title" variable="volume-title"/>
@@ -2633,7 +2600,7 @@
                 <if variable="collection-editor">
                   <names variable="collection-editor">
                     <label form="verb" suffix=" "/>
-                    <name/>
+                    <name and="text"/>
                   </names>
                 </if>
                 <else>
@@ -2665,66 +2632,66 @@
     <group delimiter=", ">
       <names variable="container-author">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="editor-translator">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="editor translator">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="guest">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="host">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="chair organizer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="illustrator narrator compiler curator">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names delimiter=", " variable="series-creator executive-producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="producer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="editorial-director">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <choose>
         <if match="any" type="broadcast performance">
           <names variable="script-writer">
             <label form="verb" suffix=" "/>
-            <name/>
+            <name and="text"/>
           </names>
         </if>
       </choose>
       <names variable="director">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <names variable="performer">
         <label form="verb" suffix=" "/>
-        <name/>
+        <name and="text"/>
       </names>
       <choose>
         <if match="none" type="song thesis">
           <!-- Song contributors attached to album (CMOS18 14.163) -->
           <names variable="contributor">
             <label form="verb" suffix=" "/>
-            <name/>
+            <name and="text"/>
           </names>
         </if>
       </choose>
@@ -2748,7 +2715,7 @@
               <text font-style="italic" text-case="title" variable="container-title"/>
               <names variable="collection-editor">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
             </group>
           </group>
@@ -2776,7 +2743,7 @@
               <text font-style="italic" text-case="title" variable="container-title"/>
               <names variable="collection-editor">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
             </group>
           </group>
@@ -2786,8 +2753,8 @@
             <if is-numeric="volume" match="none">
               <text macro="label-volume"/>
             </if>
-            <else-if variable="container-title title">
-              <!-- remove condition in styles that print chapter page numbers -->
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
             <else-if is-numeric="volume" variable="page">
@@ -2826,8 +2793,8 @@
       <else-if variable="locator">
         <text macro="label-locator"/>
       </else-if>
-      <!-- Remove `container-title` condition in styles that provide chapter page numbers -->
-      <else-if variable="container-title title"/>
+      <!-- remove `container-title` condition in styles that print chapter page numbers (CMOS17/classic) -->
+      <else-if variable="container-title"/>
       <else-if is-numeric="volume" variable="page">
         <!-- collapse the volume and page number if adjacent -->
         <group delimiter=":">
@@ -2858,7 +2825,7 @@
               <text text-case="title" variable="collection-title"/>
               <names variable="collection-editor">
                 <label form="verb" suffix=" "/>
-                <name/>
+                <name and="text"/>
               </names>
               <text macro="label-collection-number"/>
               <text macro="label-issue"/>
@@ -2929,7 +2896,7 @@
         <group delimiter=", ">
           <text variable="event-title"/>
           <text variable="event-place"/>
-          <date form="text" variable="event-date"/>
+          <text macro="date-event-full"/>
         </group>
       </if>
     </choose>
@@ -3010,7 +2977,7 @@
           <text macro="source-event-title-capitalized"/>
         </else>
       </choose>
-      <date form="text" variable="event-date"/>
+      <text macro="date-event-full"/>
       <text variable="event-place"/>
     </group>
   </macro>
@@ -3198,6 +3165,8 @@
   </macro>
   <!-- 4.6. Date -->
   <macro name="source-date-bib">
+    <!-- the date represents the last-mentioned title (CMOS18 14.21) -->
+    <!-- there is no `source-date-note` as the date of a multivolume work is not used in note form -->
     <choose>
       <if variable="available-date volume-title">
         <!-- TODO: Is there a better CSL variable for a date of a multivolume work (CMOS18 14.21)? -->
@@ -3214,8 +3183,8 @@
   <!-- Date elements -->
   <macro name="source-date-issued-month-day">
     <!-- Variant for author-date styles -->
-    <!-- Give full date for more ephemeral types; reflected in `date-sort` -->
-    <!-- NB: any changes must also be applied to `date-sort` and `source-date-original-month-day` -->
+    <!-- Give full date for more ephemeral types -->
+    <!-- NB: any changes must also be applied to `source-date-original-month-day` -->
     <choose>
       <if type="personal_communication" variable="event-date issued">
         <!-- Provide issue date for letters listed under event-date -->
@@ -3263,7 +3232,7 @@
     <text macro="source-date-original-month-day"/>
   </macro>
   <macro name="source-date-original-month-day">
-    <!-- Give full date for more ephemeral types; reflected in `date-sort` -->
+    <!-- Give full date for more ephemeral types -->
     <!-- Macro derived from `source-date-issued-month-day` -->
     <choose>
       <if type="personal_communication" variable="event-date original-date">
@@ -3388,13 +3357,14 @@
   <!-- 4.9. Archival location -->
   <macro name="source-archive-bib">
     <choose>
-      <!-- With `archive_collection` or `archive-place`: physical archives. Without: digital archives (database and identifier) -->
+      <!-- With `archive_collection` or `archive-place`: physical archives -->
       <if type="graphic">
         <text macro="source-archive-name-first"/>
       </if>
-      <else-if match="any" type="collection document manuscript" variable="archive_collection archive-place">
+      <else-if match="any" type="collection document manuscript personal_communication" variable="archive_collection archive-place">
         <text macro="source-archive-location-first-bib"/>
       </else-if>
+      <!-- Without `archive_collection` or `archive-place`: digital archives (database and identifier) -->
       <else>
         <text macro="source-archive-identifier"/>
       </else>
@@ -3406,7 +3376,7 @@
       <if type="graphic">
         <text macro="source-archive-name-first"/>
       </if>
-      <else-if match="any" type="collection document manuscript" variable="archive_collection archive-place">
+      <else-if match="any" type="collection document manuscript personal_communication" variable="archive_collection archive-place">
         <text macro="source-archive-location-first-note"/>
       </else-if>
       <!-- Without `archive_collection` or `archive-place`: digital archives (database and identifier) -->
@@ -3471,36 +3441,35 @@
     </group>
   </macro>
   <!-- 4.10. URL or persistent identifier -->
-  <macro name="source-DOI-URL-bib">
+  <macro name="source-date-accessed-DOI-URL-bib">
+    <group delimiter=". ">
+      <choose>
+        <if variable="DOI"/>
+        <else-if match="any" variable="available-date event-date issued status"/>
+        <else-if variable="accessed URL">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </else-if>
+      </choose>
+      <text macro="source-DOI-URL"/>
+    </group>
+  </macro>
+  <macro name="source-DOI-URL">
     <choose>
       <if variable="DOI">
         <text prefix="https://doi.org/" variable="DOI"/>
       </if>
       <else-if variable="URL">
-        <group delimiter=". ">
-          <choose>
-            <if match="none" variable="event-date issued status">
-              <group delimiter=" ">
-                <text term="accessed" text-case="capitalize-first"/>
-                <date form="text" variable="accessed"/>
-              </group>
-            </if>
-          </choose>
-          <text variable="URL"/>
-        </group>
+        <text variable="URL"/>
       </else-if>
     </choose>
   </macro>
-  <macro name="source-DOI-URL">
-    <!-- Alias to avoid modifying legal references block shared with APA -->
-    <text macro="source-DOI-URL-bib"/>
-  </macro>
   <!-- 5. Notes -->
-  <macro name="notes">
-    <!-- Notes on source element: original publication, reprint info, retraction info -->
-    <text variable="references"/>
-  </macro>
+  <!-- TODO: add variables for distributor and exhibitions if available in CSL -->
   <!-- 6. Legal references: Bluebook style (shared with APA) -->
+  <!-- Where APA or Chicago diverge from Bluebook, the official manual is followed -->
   <macro name="legal-reference">
     <!-- Type usage:
 
@@ -3522,21 +3491,20 @@
          `treaty`
          : treaties
     -->
-    <group delimiter=" ">
+    <group delimiter=", ">
       <choose>
         <if type="treaty">
-          <group delimiter=", " suffix=".">
-            <!-- APA generally defers to Bluebook for legal citations, but diverges without explanation for treaty items. We follow the Bluebook format that was used in APA 6th ed. -->
-            <!-- APA manual omits treaty parties/authors, but per Bluebook they should be included at least for bilateral treaties. -->
-            <text macro="legal-title"/>
-            <text macro="legal-author"/>
-            <text macro="legal-date"/>
-            <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL. Both are included here, following the APA style used for all other item types to end the reference with a period, then give the URL afterward. -->
-            <text macro="legal-source"/>
-          </group>
+          <text macro="legal-title"/>
+          <names variable="author">
+            <!-- Treaty parties should be included at least for bilateral treaties (Bluebook 21.4.2) -->
+            <name delimiter="-" et-al-min="100" et-al-use-first="99" form="short"/>
+          </names>
+          <text macro="legal-date"/>
+          <!-- treaty source/report in addition to URL (Bluebook 21.4.5) -->
+          <text macro="legal-source"/>
         </if>
         <else>
-          <group delimiter=" " suffix=".">
+          <group delimiter=" ">
             <group delimiter=", ">
               <text macro="legal-title"/>
               <text macro="legal-source"/>
@@ -3546,17 +3514,18 @@
           </group>
         </else>
       </choose>
-      <text variable="references"/>
-      <text macro="source-DOI-URL"/>
+      <group delimiter=" ">
+        <!-- locator for use in notes -->
+        <choose>
+          <if locator="page" variable="page">
+            <text term="at"/>
+          </if>
+        </choose>
+        <text macro="label-locator"/>
+      </group>
     </group>
   </macro>
-  <!-- 6.1. Legal author -->
-  <macro name="legal-author">
-    <names variable="author">
-      <name delimiter="-" form="short"/>
-    </names>
-  </macro>
-  <!-- 6.2. Legal date -->
+  <!-- 6.1. Legal date -->
   <macro name="legal-date">
     <choose>
       <if type="treaty">
@@ -3573,7 +3542,6 @@
           </group>
           <choose>
             <if variable="issued">
-              <!-- APA manual includes "rev." before the revision year, but this isn't part of the Bluebook rules. -->
               <text macro="date-issued-year"/>
             </if>
             <else>
@@ -3600,27 +3568,25 @@
       </choose>
     </group>
   </macro>
-  <!-- 6.3.1. Legal title -->
+  <!-- 6.2.1. Legal title -->
   <macro name="legal-title">
     <choose>
       <if match="any" type="bill legal_case legislation regulation treaty">
         <text text-case="title" variable="title"/>
       </if>
       <else-if type="hearing">
-        <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony, but follows Bluebook rules (colon delimiter, prefix before the committee name) for references to the whole hearing. We simply follow the Bluebook rules for both, but use APA style capitalization (not capitalizing "Before" or the title of the hearing). -->
+        <!-- use standard format (Bluebook 13.3) -->
         <group delimiter=": " font-style="italic">
           <text text-case="capitalize-first" variable="title"/>
           <group delimiter=" ">
             <text term="hearing" text-case="capitalize-first"/>
             <group delimiter=" ">
               <group delimiter=" ">
-                <!-- APA manual omits the bill number, but it should be included per Bluebook if relevant -->
                 <text term="on"/>
                 <text variable="number"/>
               </group>
               <group delimiter=" ">
-                <!-- Use the `at` term to hold "before the" -->
-                <text term="at"/>
+                <text value="before the"/>
                 <text variable="section"/>
               </group>
             </group>
@@ -3629,7 +3595,7 @@
       </else-if>
     </choose>
   </macro>
-  <!-- 6.3.2. Legal identifier -->
+  <!-- 6.2.2. Legal identifier -->
   <macro name="legal-identifier">
     <choose>
       <if type="hearing">
@@ -3637,7 +3603,7 @@
           <!-- Use the 'verb' form of the hearing term to hold 'testimony of' -->
           <text form="verb" term="hearing"/>
           <names variable="author">
-            <name initialize="false"/>
+            <name and="symbol" initialize="false"/>
           </names>
         </group>
       </if>
@@ -3661,7 +3627,7 @@
       </choose>
     </group>
   </macro>
-  <!-- 6.4. Legal source -->
+  <!-- 6.3. Legal source -->
   <macro name="legal-source">
     <!-- Expect legal item `container-title` to be stored in short form -->
     <choose>
@@ -3691,7 +3657,7 @@
       <text macro="legal-identifier-bill-report"/>
       <group delimiter=" ">
         <text variable="authority"/>
-        <!-- 'session' is `chapter-number` -->
+        <!-- `chapter-number` is a session number -->
         <text variable="chapter-number"/>
       </group>
       <group delimiter=" ">
@@ -3728,14 +3694,14 @@
   <macro name="legal-source-hearing">
     <group delimiter=" ">
       <text variable="authority"/>
-      <!-- 'session' is `chapter-number` -->
+      <!-- `chapter-number` is a session number -->
       <text variable="chapter-number"/>
     </group>
   </macro>
   <macro name="legal-source-legislation">
     <choose>
       <if variable="number">
-        <!-- There's a public law number. -->
+        <!-- `number` is a public law number -->
         <group delimiter=", ">
           <group delimiter=" ">
             <choose>
@@ -3806,43 +3772,6 @@
     </group>
   </macro>
   <!-- Citation -->
-  <macro name="citation-author-date">
-    <!-- Usage:
-    
-    <citation after-collapse-delimiter="; " collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true" et-al-min="3" et-al-use-first="1" givenname-disambiguation-rule="primary-name-with-initials"><layout delimiter="; " prefix="(" suffix=")"><text macro="citation-author-date"/></layout></citation>
-    -->
-    <choose>
-      <if type="classic">
-        <!-- with `classic`, a non-numeric canonical reference or identifying number is separated by a space rather than a comma (CMOS18 14.145) -->
-        <choose>
-          <if is-numeric="locator">
-            <group delimiter=", ">
-              <text macro="citation-author-date-item"/>
-              <text macro="source-locator-author-date"/>
-            </group>
-          </if>
-          <else-if locator="chapter line verse" match="any">
-            <group delimiter=" ">
-              <text macro="citation-author-date-item"/>
-              <text macro="source-locator-author-date"/>
-            </group>
-          </else-if>
-          <else>
-            <group delimiter=", ">
-              <text macro="citation-author-date-item"/>
-              <text macro="source-locator-author-date"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-      <else>
-        <group delimiter=", ">
-          <text macro="citation-author-date-item"/>
-          <text macro="source-locator-author-date"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
   <macro name="citation-author-date-item">
     <group delimiter=", ">
       <choose>
@@ -3898,77 +3827,107 @@
       </choose>
     </group>
   </macro>
-  <citation after-collapse-delimiter="; " collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true" et-al-min="3" et-al-use-first="1" givenname-disambiguation-rule="primary-name-with-initials">
+  <citation after-collapse-delimiter="; " collapse="year" disambiguate-add-givenname="true" disambiguate-add-names="true" disambiguate-add-year-suffix="true" et-al-min="3" et-al-use-first="1">
     <layout delimiter="; " prefix="(" suffix=")">
-      <text macro="citation-author-date"/>
+      <choose>
+        <if type="classic">
+          <!-- with `classic`, a non-numeric canonical reference or identifying number is separated by a space rather than a comma (CMOS18 14.145) -->
+          <choose>
+            <if is-numeric="locator">
+              <group delimiter=", ">
+                <text macro="citation-author-date-item"/>
+                <text macro="source-locator-author-date"/>
+              </group>
+            </if>
+            <else-if locator="chapter line verse" match="any">
+              <group delimiter=" ">
+                <text macro="citation-author-date-item"/>
+                <text macro="source-locator-author-date"/>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text macro="citation-author-date-item"/>
+                <text macro="source-locator-author-date"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <text macro="citation-author-date-item"/>
+            <text macro="source-locator-author-date"/>
+          </group>
+        </else>
+      </choose>
     </layout>
   </citation>
   <!-- Bibliography -->
   <macro name="bibliography-author-date">
-    <choose>
-      <if match="any" type="bill hearing legal_case legislation regulation treaty">
-        <!-- Legal items have different orders and delimiters -->
-        <text macro="legal-reference"/>
-      </if>
-      <else>
-        <group delimiter=". ">
+    <group delimiter=". ">
+      <choose>
+        <if match="any" type="bill hearing legal_case legislation regulation treaty">
+          <!-- Legal items have different orders and delimiters -->
+          <text macro="legal-reference"/>
+          <text macro="source-date-accessed-DOI-URL-bib"/>
+          <text variable="references"/>
+        </if>
+        <else>
           <text macro="author-bib"/>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
-          <text macro="notes"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="bibliography-filtered-author-date">
-    <!-- usage:
-     <sort><key macro="author-sort"/><key macro="date-sort-group"/><key macro="date-sort"/><key variable="status"/><key macro="title-bib"/><key variable="part-number"/><key variable="volume"/></sort><layout suffix="."><text macro="bibliography-filtered-author-date"/></layout>
-    -->
-    <choose>
-      <if type="classic">
-        <choose>
-          <if match="any" variable="archive editor translator publisher">
-            <text macro="bibliography-author-date"/>
-          </if>
-        </choose>
-      </if>
-      <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-        <choose>
-          <if variable="author">
-            <!-- Signed reference entries appear in the bibliography (CMOS18 14.132) -->
-            <text macro="bibliography-author-date"/>
-          </if>
-          <else-if match="any" variable="DOI URL">
-            <!-- Provide a bibliography if necessary identifying information is not in text -->
-            <text macro="bibliography-author-date"/>
-          </else-if>
-        </choose>
-      </else-if>
-      <else-if match="any" type="interview personal_communication">
-        <choose>
-          <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
-            <!-- Personal communications only appear in the bibliography if the reader can retrieve them (CMOS18 14.13, 14.111) -->
-            <text macro="bibliography-author-date"/>
-          </if>
-        </choose>
-      </else-if>
-      <else>
-        <text macro="bibliography-author-date"/>
-      </else>
-    </choose>
+          <text variable="references"/>
+        </else>
+      </choose>
+    </group>
   </macro>
   <bibliography et-al-min="7" et-al-use-first="3" hanging-indent="true">
     <sort>
       <key macro="author-sort"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort"/>
-      <key variable="status"/>
-      <key macro="title-bib"/>
-      <key variable="part-number"/>
+      <key macro="date-sort-year"/>
+      <key macro="date"/>
+      <key macro="title-and-descriptions-bib"/>
+      <key macro="source-bib"/>
       <key variable="volume"/>
+      <key variable="part-number"/>
+      <key variable="event-date"/>
+      <key variable="issued"/>
+      <key macro="source-archive-bib"/>
     </sort>
     <layout suffix=".">
-      <text macro="bibliography-filtered-author-date"/>
+      <choose>
+        <if type="classic">
+          <choose>
+            <if match="any" variable="archive editor translator publisher">
+              <text macro="bibliography-author-date"/>
+            </if>
+          </choose>
+        </if>
+        <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
+          <choose>
+            <if variable="author">
+              <!-- Signed reference entries appear in the bibliography (CMOS18 14.132) -->
+              <text macro="bibliography-author-date"/>
+            </if>
+            <else-if match="any" variable="DOI URL">
+              <!-- Provide a bibliography if necessary identifying information is not in text -->
+              <text macro="bibliography-author-date"/>
+            </else-if>
+          </choose>
+        </else-if>
+        <else-if match="any" type="interview personal_communication">
+          <choose>
+            <if match="any" variable="archive archive-place container-title DOI number publisher references URL">
+              <!-- Personal communications only appear in the bibliography if the reader can retrieve them (CMOS18 14.13, 14.111) -->
+              <text macro="bibliography-author-date"/>
+            </if>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="bibliography-author-date"/>
+        </else>
+      </choose>
     </layout>
   </bibliography>
 </style>
diff --git a/test/command/pandoc-citeproc-87.md b/test/command/pandoc-citeproc-87.md
index e54edba42..67f67c91b 100644
--- a/test/command/pandoc-citeproc-87.md
+++ b/test/command/pandoc-citeproc-87.md
@@ -110,15 +110,15 @@ References
 ^D
 Doe (2006a) -- webpage, date
 
-Doe (2006b) -- webpage, date range
+Doe (2006c) -- webpage, date range
 
-Doe (2006d) -- webpage, date range YM
+Doe (2006b) -- webpage, date range YM
 
 Doe (2006--2007) -- webpage, date range across years
 
-Doe (2006c) -- article-newspaper
+Doe (2006e) -- article-newspaper
 
-Doe (2006e) -- article-newspaper YM
+Doe (2006d) -- article-newspaper YM
 
 # References {#references .unnumbered}
 
@@ -128,23 +128,23 @@ Doe, John. 2006a. "Title." The Web Site, October 26.
 <http://www.example.com>.
 :::
 
-::: {#ref-item2 .csl-entry}
-Doe, John. 2006b. "Title." The Web Site, October 26--November 27.
-<http://www.example.com>.
-:::
-
-::: {#ref-item3 .csl-entry}
-Doe, John. 2006c. "Title." *The Newspaper*, October 26--November 27.
-<http://www.example.com>.
-:::
-
 ::: {#ref-item2a .csl-entry}
-Doe, John. 2006d. "Title." The Web Site, October--November.
+Doe, John. 2006b. "Title." The Web Site, October--November.
+<http://www.example.com>.
+:::
+
+::: {#ref-item2 .csl-entry}
+Doe, John. 2006c. "Title." The Web Site, October 26--November 27.
 <http://www.example.com>.
 :::
 
 ::: {#ref-item3b .csl-entry}
-Doe, John. 2006e. "Title." *The Newspaper*, October--November.
+Doe, John. 2006d. "Title." *The Newspaper*, October--November.
+<http://www.example.com>.
+:::
+
+::: {#ref-item3 .csl-entry}
+Doe, John. 2006e. "Title." *The Newspaper*, October 26--November 27.
 <http://www.example.com>.
 :::