From 98e4a124efe4259cf6f8016477ff8efd03288cf1 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Sun, 29 Mar 2026 13:54:50 +0100
Subject: [PATCH 1/5] CMOS: number of volumes in notes (14.20); website
 abbreviations (14.104)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the override to display the number of volumes in notes-only styles: the CMOS team confirmed via email that the example of this in sec. 14.20 is meant to be permissive rather than normative. Support website title abbreviations in author–date styles using `container-title-short`; see <https://www.zotero.org/groups/2205533/items/HN7AMYZ9> for an encoded version of the example from CMOS 14.104.
---
 chicago-author-date-17th-edition.csl          | 42 ++++++++++++-----
 chicago-author-date-access-dates.csl          | 40 ++++++++++++----
 ...author-date-archive-place-first-no-url.csl | 40 ++++++++++++----
 chicago-author-date-archive-place-first.csl   | 40 ++++++++++++----
 chicago-author-date-classic-no-url.csl        | 40 ++++++++++++----
 chicago-author-date-classic.csl               | 40 ++++++++++++----
 chicago-author-date-no-url.csl                | 40 ++++++++++++----
 chicago-author-date.csl                       | 40 ++++++++++++----
 chicago-in-text-full-no-url.csl               | 24 +++++-----
 chicago-in-text-full.csl                      | 24 +++++-----
 chicago-in-text-shortened-author-no-url.csl   | 20 ++++----
 ...-in-text-shortened-author-title-no-url.csl | 20 ++++----
 chicago-in-text-shortened-author-title.csl    | 20 ++++----
 chicago-in-text-shortened-author.csl          | 20 ++++----
 chicago-notes-archive-place-first-no-url.csl  | 26 +++++------
 chicago-notes-archive-place-first.csl         | 26 +++++------
 chicago-notes-bibliography-17th-edition.csl   | 26 +++++------
 chicago-notes-bibliography-access-dates.csl   | 24 +++++-----
 ...-notes-bibliography-annotated-abstract.csl | 24 +++++-----
 chicago-notes-bibliography-annotated.csl      | 24 +++++-----
 ...ibliography-archive-place-first-no-url.csl | 24 +++++-----
 ...notes-bibliography-archive-place-first.csl | 24 +++++-----
 ...phy-classic-archive-place-first-no-url.csl | 24 +++++-----
 ...bliography-classic-archive-place-first.csl | 24 +++++-----
 chicago-notes-bibliography-classic-no-url.csl | 24 +++++-----
 chicago-notes-bibliography-classic.csl        | 24 +++++-----
 chicago-notes-bibliography-no-url.csl         | 24 +++++-----
 ...raphy-subsequent-author-classic-no-url.csl | 24 +++++-----
 ...bibliography-subsequent-author-classic.csl | 24 +++++-----
 ...-bibliography-subsequent-author-no-url.csl | 24 +++++-----
 ...y-subsequent-author-title-17th-edition.csl | 26 +++++------
 ...o-notes-bibliography-subsequent-author.csl | 24 +++++-----
 ...liography-subsequent-ibid-17th-edition.csl | 26 +++++------
 ...ography-subsequent-ibid-classic-no-url.csl | 24 +++++-----
 ...s-bibliography-subsequent-ibid-classic.csl | 24 +++++-----
 ...es-bibliography-subsequent-ibid-no-url.csl | 24 +++++-----
 ...ago-notes-bibliography-subsequent-ibid.csl | 24 +++++-----
 ...s-bibliography-subsequent-title-no-url.csl | 24 +++++-----
 ...go-notes-bibliography-subsequent-title.csl | 24 +++++-----
 chicago-notes-bibliography.csl                | 24 +++++-----
 ...tes-classic-archive-place-first-no-url.csl | 46 +++++++++----------
 chicago-notes-classic-archive-place-first.csl | 46 +++++++++----------
 chicago-notes-classic-no-url.csl              | 46 +++++++++----------
 chicago-notes-classic.csl                     | 46 +++++++++----------
 chicago-notes-no-url.csl                      | 42 ++++++++---------
 ...isher-place-archive-place-first-no-url.csl | 46 +++++++++----------
 ...es-publisher-place-archive-place-first.csl | 44 +++++++++---------
 ...-label-page-archive-place-first-no-url.csl | 40 +++++++---------
 ...r-place-label-page-archive-place-first.csl | 40 +++++++---------
 chicago-notes-publisher-place-no-url.csl      | 44 +++++++++---------
 chicago-notes-publisher-place.csl             | 44 +++++++++---------
 chicago-notes.csl                             | 38 ++++++---------
 ...rtened-notes-bibliography-17th-edition.csl | 22 ++++-----
 ...rtened-notes-bibliography-access-dates.csl | 20 ++++----
 ...ibliography-archive-place-first-no-url.csl | 20 ++++----
 ...notes-bibliography-archive-place-first.csl | 20 ++++----
 ...phy-classic-archive-place-first-no-url.csl | 20 ++++----
 ...bliography-classic-archive-place-first.csl | 20 ++++----
 ...ened-notes-bibliography-classic-no-url.csl | 20 ++++----
 ...o-shortened-notes-bibliography-classic.csl | 20 ++++----
 ...go-shortened-notes-bibliography-no-url.csl | 20 ++++----
 ...raphy-subsequent-author-classic-no-url.csl | 20 ++++----
 ...bibliography-subsequent-author-classic.csl | 20 ++++----
 ...-bibliography-subsequent-author-no-url.csl | 20 ++++----
 ...y-subsequent-author-title-17th-edition.csl | 22 ++++-----
 ...d-notes-bibliography-subsequent-author.csl | 20 ++++----
 ...liography-subsequent-ibid-17th-edition.csl | 22 ++++-----
 ...ography-subsequent-ibid-classic-no-url.csl | 20 ++++----
 ...s-bibliography-subsequent-ibid-classic.csl | 20 ++++----
 ...es-bibliography-subsequent-ibid-no-url.csl | 20 ++++----
 ...ned-notes-bibliography-subsequent-ibid.csl | 20 ++++----
 ...s-bibliography-subsequent-title-no-url.csl | 20 ++++----
 ...ed-notes-bibliography-subsequent-title.csl | 20 ++++----
 chicago-shortened-notes-bibliography.csl      | 20 ++++----
 taylor-and-francis-chicago-author-date.csl    | 40 ++++++++++++----
 75 files changed, 1058 insertions(+), 1034 deletions(-)

diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index 42d6a9d1c0..c0249d0ebd 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (author-date)</title>
-    <title-short>CMOS 17e with Bluebook (author-date/AD [15.5])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (author-date/AD [15.5])</title-short>
     <id>http://www.zotero.org/styles/chicago-author-date-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-author-date-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -400,8 +400,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -732,7 +730,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3230,7 +3235,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4175,7 +4186,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-access-dates.csl b/chicago-author-date-access-dates.csl
index a9c438d66f..9dc2425e10 100644
--- a/chicago-author-date-access-dates.csl
+++ b/chicago-author-date-access-dates.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3219,7 +3224,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4131,7 +4142,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-archive-place-first-no-url.csl b/chicago-author-date-archive-place-first-no-url.csl
index b66c1c7cbe..bc6832b2ce 100644
--- a/chicago-author-date-archive-place-first-no-url.csl
+++ b/chicago-author-date-archive-place-first-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3219,7 +3224,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4108,7 +4119,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-archive-place-first.csl b/chicago-author-date-archive-place-first.csl
index 693fc150b2..a4dfd7d0d1 100644
--- a/chicago-author-date-archive-place-first.csl
+++ b/chicago-author-date-archive-place-first.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3219,7 +3224,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4118,7 +4129,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-classic-no-url.csl b/chicago-author-date-classic-no-url.csl
index 0775a14ce3..31c9dd6078 100644
--- a/chicago-author-date-classic-no-url.csl
+++ b/chicago-author-date-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3213,7 +3218,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4116,7 +4127,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-classic.csl b/chicago-author-date-classic.csl
index 4270bbe6e1..a5ab1f355c 100644
--- a/chicago-author-date-classic.csl
+++ b/chicago-author-date-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3213,7 +3218,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4126,7 +4137,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date-no-url.csl b/chicago-author-date-no-url.csl
index 27b7d87632..5f31a98a3b 100644
--- a/chicago-author-date-no-url.csl
+++ b/chicago-author-date-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3219,7 +3224,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4122,7 +4133,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index d29fadb635..c941a50e50 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -735,7 +733,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3219,7 +3224,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4132,7 +4143,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>
diff --git a/chicago-in-text-full-no-url.csl b/chicago-in-text-full-no-url.csl
index 55fd117549..937fcab4ba 100644
--- a/chicago-in-text-full-no-url.csl
+++ b/chicago-in-text-full-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-full.csl b/chicago-in-text-full.csl
index 94910026be..2dee540d69 100644
--- a/chicago-in-text-full.csl
+++ b/chicago-in-text-full.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-no-url.csl b/chicago-in-text-shortened-author-no-url.csl
index b442fc2f75..59eeba0ed7 100644
--- a/chicago-in-text-shortened-author-no-url.csl
+++ b/chicago-in-text-shortened-author-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2282,8 +2282,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2298,8 +2296,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3121,6 +3117,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-title-no-url.csl b/chicago-in-text-shortened-author-title-no-url.csl
index 6067e30d73..75f83eae55 100644
--- a/chicago-in-text-shortened-author-title-no-url.csl
+++ b/chicago-in-text-shortened-author-title-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-title.csl b/chicago-in-text-shortened-author-title.csl
index c120fcb6f7..de17e2eefd 100644
--- a/chicago-in-text-shortened-author-title.csl
+++ b/chicago-in-text-shortened-author-title.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author.csl b/chicago-in-text-shortened-author.csl
index c8e0d4d8e4..e6d39f8946 100644
--- a/chicago-in-text-shortened-author.csl
+++ b/chicago-in-text-shortened-author.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2282,8 +2282,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2298,8 +2296,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3121,6 +3117,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-archive-place-first-no-url.csl b/chicago-notes-archive-place-first-no-url.csl
index 9f9abfba30..7d108a96d0 100644
--- a/chicago-notes-archive-place-first-no-url.csl
+++ b/chicago-notes-archive-place-first-no-url.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, archival references with place first, without URLs)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], archive place first [14.205], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], archive place first [14.205], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-archive-place-first-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-notes-archive-place-first-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,8 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -767,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2814,7 +2814,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3001,8 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,8 +3015,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3486,7 +3482,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
diff --git a/chicago-notes-archive-place-first.csl b/chicago-notes-archive-place-first.csl
index a04ece9d96..68c0e0f840 100644
--- a/chicago-notes-archive-place-first.csl
+++ b/chicago-notes-archive-place-first.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, archival references with place first)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], archive place first [14.205])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], archive place first [14.205])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-archive-place-first</id>
     <link href="http://www.zotero.org/styles/chicago-notes-archive-place-first" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20), archival references with place first (CMOS18 14.205)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), archival references with place first (CMOS18 14.205)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,8 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -767,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2814,7 +2814,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3001,8 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,8 +3015,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3486,7 +3482,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
diff --git a/chicago-notes-bibliography-17th-edition.csl b/chicago-notes-bibliography-17th-edition.csl
index 0509fce9e4..90fb5545e3 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (notes and bibliography)</title>
-    <title-short>CMOS 17e with Bluebook (notes and bibliography/NB [14.19])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (notes and bibliography/NB [14.19])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-bibliography-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -421,8 +421,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -900,6 +898,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3013,7 +3013,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3200,8 +3200,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3212,8 +3210,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4153,7 +4149,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4706,6 +4702,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-access-dates.csl b/chicago-notes-bibliography-access-dates.csl
index 90d8fbe53a..c627c7bbc5 100644
--- a/chicago-notes-bibliography-access-dates.csl
+++ b/chicago-notes-bibliography-access-dates.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3219,8 +3217,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4160,7 +4156,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4715,6 +4711,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-annotated-abstract.csl b/chicago-notes-bibliography-annotated-abstract.csl
index bc80f19c2d..dca5390d96 100644
--- a/chicago-notes-bibliography-annotated-abstract.csl
+++ b/chicago-notes-bibliography-annotated-abstract.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3219,8 +3217,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4160,7 +4156,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4715,6 +4711,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-annotated.csl b/chicago-notes-bibliography-annotated.csl
index 9e390a2992..fbae958e7f 100644
--- a/chicago-notes-bibliography-annotated.csl
+++ b/chicago-notes-bibliography-annotated.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3219,8 +3217,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4160,7 +4156,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4715,6 +4711,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-archive-place-first-no-url.csl b/chicago-notes-bibliography-archive-place-first-no-url.csl
index afc13d0b07..581b76e2b9 100644
--- a/chicago-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-archive-place-first-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-archive-place-first.csl b/chicago-notes-bibliography-archive-place-first.csl
index 9eeee74acf..0742542750 100644
--- a/chicago-notes-bibliography-archive-place-first.csl
+++ b/chicago-notes-bibliography-archive-place-first.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
index 8e6d8989b2..6412d551ae 100644
--- a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-archive-place-first.csl b/chicago-notes-bibliography-classic-archive-place-first.csl
index 53ca0bc558..e6705a8348 100644
--- a/chicago-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-no-url.csl b/chicago-notes-bibliography-classic-no-url.csl
index 85ef047f2f..cd96fca20f 100644
--- a/chicago-notes-bibliography-classic-no-url.csl
+++ b/chicago-notes-bibliography-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic.csl b/chicago-notes-bibliography-classic.csl
index 33dae70e9e..368cfb561a 100644
--- a/chicago-notes-bibliography-classic.csl
+++ b/chicago-notes-bibliography-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-no-url.csl b/chicago-notes-bibliography-no-url.csl
index 2a38e9ae89..2e16aa9491 100644
--- a/chicago-notes-bibliography-no-url.csl
+++ b/chicago-notes-bibliography-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
index 69a2e96c73..7d87a45245 100644
--- a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-classic.csl b/chicago-notes-bibliography-subsequent-author-classic.csl
index 3345c27c07..35e52a4ed5 100644
--- a/chicago-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-no-url.csl b/chicago-notes-bibliography-subsequent-author-no-url.csl
index 770698feff..8e77850f47 100644
--- a/chicago-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
index 8c90b2a1f1..bf3e9c847f 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (notes and bibliography, subsequent author-title)</title>
-    <title-short>CMOS 17e with Bluebook (notes and bibliography/NB [14.19], subsequent author-title [14.34])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (notes and bibliography/NB [14.19], subsequent author-title [14.34])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-bibliography-subsequent-author-title-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography-subsequent-author-title-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -421,8 +421,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -900,6 +898,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3013,7 +3013,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3200,8 +3200,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3212,8 +3210,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4153,7 +4149,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4706,6 +4702,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author.csl b/chicago-notes-bibliography-subsequent-author.csl
index 61a7f75e48..949c8e645e 100644
--- a/chicago-notes-bibliography-subsequent-author.csl
+++ b/chicago-notes-bibliography-subsequent-author.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
index c038c0f741..7f9393b415 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (notes and bibliography, subsequent ibid.)</title>
-    <title-short>CMOS 17e with Bluebook (notes and bibliography/NB [14.19], subsequent ibid. [14.34])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (notes and bibliography/NB [14.19], subsequent ibid. [14.34])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-bibliography-subsequent-ibid-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography-subsequent-ibid-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -421,8 +421,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -900,6 +898,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3013,7 +3013,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3200,8 +3200,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3212,8 +3210,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4153,7 +4149,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4706,6 +4702,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 8137f6bfde..5d9dea0671 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic.csl b/chicago-notes-bibliography-subsequent-ibid-classic.csl
index fe76c41aab..61a78154a3 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -424,8 +424,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -903,6 +901,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3016,7 +3016,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3203,8 +3203,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3215,8 +3213,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4156,7 +4152,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4709,6 +4705,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
index 1cf28887fe..7b470e4c1e 100644
--- a/chicago-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid.csl b/chicago-notes-bibliography-subsequent-ibid.csl
index 6a057b94cd..f1c1567f44 100644
--- a/chicago-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-notes-bibliography-subsequent-ibid.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-title-no-url.csl b/chicago-notes-bibliography-subsequent-title-no-url.csl
index 3c808b0724..4db5cd3b9c 100644
--- a/chicago-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-title-no-url.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-title.csl b/chicago-notes-bibliography-subsequent-title.csl
index 17531e7aab..2c09db4686 100644
--- a/chicago-notes-bibliography-subsequent-title.csl
+++ b/chicago-notes-bibliography-subsequent-title.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography.csl b/chicago-notes-bibliography.csl
index cfd010e1e7..5f0fd81177 100644
--- a/chicago-notes-bibliography.csl
+++ b/chicago-notes-bibliography.csl
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,8 +423,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -902,6 +900,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,8 +3202,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3218,8 +3216,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -4159,7 +4155,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4714,6 +4710,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-classic-archive-place-first-no-url.csl b/chicago-notes-classic-archive-place-first-no-url.csl
index 9748823167..6603b9c3f0 100644
--- a/chicago-notes-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-classic-archive-place-first-no-url.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, classic variants, archival references with place first, without URLs)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], classic variants [14.8, 14.30], archive place first [14.205], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], classic variants [14.8, 14.30], archive place first [14.205], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-classic-archive-place-first-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-notes-classic-archive-place-first-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20); classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); archival references with place first (CMOS18 14.205); without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23); classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); archival references with place first (CMOS18 14.205); without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-classic-archive-place-first.csl b/chicago-notes-classic-archive-place-first.csl
index df6b313cea..74203c71f9 100644
--- a/chicago-notes-classic-archive-place-first.csl
+++ b/chicago-notes-classic-archive-place-first.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, classic variants, archival references with place first)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], classic variants [14.8, 14.30], archive place first [14.205])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], classic variants [14.8, 14.30], archive place first [14.205])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-classic-archive-place-first</id>
     <link href="http://www.zotero.org/styles/chicago-notes-classic-archive-place-first" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20); classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); archival references with place first (CMOS18 14.205)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23); classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); archival references with place first (CMOS18 14.205)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-classic-no-url.csl b/chicago-notes-classic-no-url.csl
index 949daf8b38..06ed5175c0 100644
--- a/chicago-notes-classic-no-url.csl
+++ b/chicago-notes-classic-no-url.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, classic variants, without URLs)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], classic variants [14.8, 14.30], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], classic variants [14.8, 14.30], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-classic-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-notes-classic-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20), classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30); without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-classic.csl b/chicago-notes-classic.csl
index e7e0e9bd78..6b6e9869ce 100644
--- a/chicago-notes-classic.csl
+++ b/chicago-notes-classic.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, classic variants)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], classic variants [14.8, 14.30])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], classic variants [14.8, 14.30])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-classic</id>
     <link href="http://www.zotero.org/styles/chicago-notes-classic" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20), classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), classic variants: chapter page numbers (CMOS18 14.8), place of publication (CMOS18 14.30)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-no-url.csl b/chicago-notes-no-url.csl
index 5c652c4b42..5180b5a71c 100644
--- a/chicago-notes-no-url.csl
+++ b/chicago-notes-no-url.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, without URLs)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-notes-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20), without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3021,10 +3015,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3492,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place-archive-place-first-no-url.csl b/chicago-notes-publisher-place-archive-place-first-no-url.csl
index 22381f44ff..65eb818109 100644
--- a/chicago-notes-publisher-place-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-archive-place-first-no-url.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography, place of publication substituted for publisher, archival references with place first, without URLs)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20], chapter page numbers [14.8], publisher place for name [14.31], archive place first [14.205], no URLs [13.6])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23], chapter page numbers [14.8], publisher place for name [14.31], archive place first [14.205], no URLs [13.6])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes-publisher-place-archive-place-first-no-url</id>
     <link href="http://www.zotero.org/styles/chicago-notes-publisher-place-archive-place-first-no-url" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place-archive-place-first.csl b/chicago-notes-publisher-place-archive-place-first.csl
index a75bfb4d7c..120623bec5 100644
--- a/chicago-notes-publisher-place-archive-place-first.csl
+++ b/chicago-notes-publisher-place-archive-place-first.csl
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31), archival references with place first (CMOS18 14.205)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31), archival references with place first (CMOS18 14.205)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
index 26eeecd3b0..c368b468eb 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31), page abbreviations with locator (CMOS18 14.50), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31), page abbreviations with locator (CMOS18 14.50), archival references with place first (CMOS18 14.205), without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -410,13 +410,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -771,6 +764,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2818,8 +2813,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3002,10 +3000,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3016,10 +3010,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3487,8 +3477,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first.csl b/chicago-notes-publisher-place-label-page-archive-place-first.csl
index b01b98ac27..f08a095c68 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first.csl
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31), page abbreviations with locator (CMOS18 14.50), archival references with place first (CMOS18 14.205)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31), page abbreviations with locator (CMOS18 14.50), archival references with place first (CMOS18 14.205)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -410,13 +410,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -771,6 +764,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2818,8 +2813,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3002,10 +3000,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3016,10 +3010,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3487,8 +3477,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place-no-url.csl b/chicago-notes-publisher-place-no-url.csl
index b0fc20b8ff..e191db28cb 100644
--- a/chicago-notes-publisher-place-no-url.csl
+++ b/chicago-notes-publisher-place-no-url.csl
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31), without URLs (CMOS18 13.6)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31), without URLs (CMOS18 13.6)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes-publisher-place.csl b/chicago-notes-publisher-place.csl
index 6bb4f16faa..46014b1a41 100644
--- a/chicago-notes-publisher-place.csl
+++ b/chicago-notes-publisher-place.csl
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), displaying number of volumes (CMOS18 14.20), substituting place of publication for publisher name (CMOS18 14.31)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), chapter page numbers (CMOS18 14.8), substituting place of publication for publisher name (CMOS18 14.31)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3017,10 +3011,10 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
+            <else-if variable="container-title">
+              <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
+              <text macro="label-volume"/>
+            </else-if>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3488,8 +3482,12 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
+        <else-if variable="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
diff --git a/chicago-notes.csl b/chicago-notes.csl
index a266d33d6d..2059bd953b 100644
--- a/chicago-notes.csl
+++ b/chicago-notes.csl
@@ -3,7 +3,7 @@
   <!-- 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 (notes without bibliography)</title>
-    <title-short>CMOS/CMS with Bluebook (notes only [13.23, 14.20])</title-short>
+    <title-short>CMOS/CMS with Bluebook (notes only [13.23])</title-short>
     <id>http://www.zotero.org/styles/chicago-notes</id>
     <link href="http://www.zotero.org/styles/chicago-notes" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -29,7 +29,7 @@
     <category field="social_science"/>
     <category field="sociology"/>
     <category field="theology"/>
-    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23), displaying number of volumes (CMOS18 14.20)</summary>
+    <summary>Chicago-style source citations (with Bluebook for legal citations), notes system without bibliography, listing up to six authors in a full citation (CMOS18 13.23)</summary>
     <updated>2025-02-09T00: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>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -411,13 +411,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <choose>
-        <if is-numeric="number-of-volumes" variable="volume">
-          <text value="of"/>
-          <text variable="number-of-volumes"/>
-        </if>
-      </choose>
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -772,6 +765,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2819,8 +2814,11 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
+        <else-if locator="column"/>
+        <else-if locator="folio"/>
+        <else-if locator="page"/>
         <else>
           <text macro="label-number-of-volumes"/>
         </else>
@@ -3003,10 +3001,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3021,10 +3015,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <else>
-              <text macro="label-number-of-volumes"/>
-            </else>
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3492,7 +3482,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
diff --git a/chicago-shortened-notes-bibliography-17th-edition.csl b/chicago-shortened-notes-bibliography-17th-edition.csl
index 4ade36bda2..736611d18f 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (shortened notes and bibliography)</title>
-    <title-short>CMOS 17e with Bluebook (shortened author-title notes [14.29])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (shortened author-title notes [14.29])</title-short>
     <id>http://www.zotero.org/styles/chicago-shortened-notes-bibliography-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-shortened-notes-bibliography-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -400,8 +400,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -757,6 +755,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2350,8 +2350,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2362,8 +2360,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3282,6 +3278,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-access-dates.csl b/chicago-shortened-notes-bibliography-access-dates.csl
index 7572226abb..ab4631224b 100644
--- a/chicago-shortened-notes-bibliography-access-dates.csl
+++ b/chicago-shortened-notes-bibliography-access-dates.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
index a87918842f..8bb429c37f 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first.csl b/chicago-shortened-notes-bibliography-archive-place-first.csl
index b0fb81ac06..673dec0f67 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
index 52c82922de..ffa5f0fe08 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
index 8752d617b9..ef9d4aac14 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-no-url.csl b/chicago-shortened-notes-bibliography-classic-no-url.csl
index d8a9e08a66..bb27620223 100644
--- a/chicago-shortened-notes-bibliography-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic.csl b/chicago-shortened-notes-bibliography-classic.csl
index 2ddda7bbcf..6e1b05bf8d 100644
--- a/chicago-shortened-notes-bibliography-classic.csl
+++ b/chicago-shortened-notes-bibliography-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-no-url.csl b/chicago-shortened-notes-bibliography-no-url.csl
index d047abd4d8..9659c30571 100644
--- a/chicago-shortened-notes-bibliography-no-url.csl
+++ b/chicago-shortened-notes-bibliography-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
index 7542cc1b84..d3c659b6b8 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
index 09039a3dcf..f9a62ba428 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
index bed0e6a9a8..37e1307e8a 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
index 7da6bfd385..46ed7f5cb6 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (shortened notes and bibliography, subsequent author-title)</title>
-    <title-short>CMOS 17e with Bluebook (shortened author-title notes [14.29], subsequent author-title [14.34])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (shortened author-title notes [14.29], subsequent author-title [14.34])</title-short>
     <id>http://www.zotero.org/styles/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -400,8 +400,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -757,6 +755,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2350,8 +2350,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2362,8 +2360,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3282,6 +3278,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author.csl b/chicago-shortened-notes-bibliography-subsequent-author.csl
index ae6ffe5ef9..15d2025522 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
index 80bbb44400..5d3ea20859 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -3,7 +3,7 @@
   <!-- 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 17th edition (shortened notes and bibliography, subsequent ibid.)</title>
-    <title-short>CMOS 17e with Bluebook (shortened author-title notes [14.29], subsequent ibid. [14.34])</title-short>
+    <title-short>CMOS/CMS 17e with Bluebook (shortened author-title notes [14.29], subsequent ibid. [14.34])</title-short>
     <id>http://www.zotero.org/styles/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition</id>
     <link href="http://www.zotero.org/styles/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-notes-bibliography" rel="template"/>
@@ -85,7 +85,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -106,11 +106,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -400,8 +400,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -757,6 +755,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2350,8 +2350,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2362,8 +2360,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3282,6 +3278,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
index ed8727ebe3..cce52313ac 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
index a7ddaf7c18..4f2e779296 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2365,8 +2363,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3285,6 +3281,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
index dcc0292b43..7b733ce0fc 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid.csl b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
index c87b3c6f32..9ade60ba2f 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
index eb0164dc79..bcd853c4ff 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title.csl b/chicago-shortened-notes-bibliography-subsequent-title.csl
index cfcd1f1c5d..c045eb667e 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography.csl b/chicago-shortened-notes-bibliography.csl
index 0ca5f5648f..1761f39492 100644
--- a/chicago-shortened-notes-bibliography.csl
+++ b/chicago-shortened-notes-bibliography.csl
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,8 +403,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -760,6 +758,8 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
+        <!-- for author-date:
+        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -2353,8 +2353,6 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -2369,8 +2367,6 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
-            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3291,6 +3287,8 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/taylor-and-francis-chicago-author-date.csl b/taylor-and-francis-chicago-author-date.csl
index 341dca1ad2..55dab984b8 100644
--- a/taylor-and-francis-chicago-author-date.csl
+++ b/taylor-and-francis-chicago-author-date.csl
@@ -69,7 +69,7 @@
     </terms>
   </locale>
   <!-- Contents:
-    
+
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -90,11 +90,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-      
-       Freeform annotations to bibliography entries: 
-        
+
+       Freeform annotations to bibliography entries:
+
         5. Notes
-       
+
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -384,8 +384,6 @@
         </if>
       </choose>
       <text variable="volume"/>
-      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
-      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -716,7 +714,14 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <text text-case="title" variable="container-title"/>
+        <choose>
+          <if variable="container-title-short">
+            <text text-case="title" variable="container-title-short"/>
+          </if>
+          <else>
+            <text text-case="title" variable="container-title"/>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
@@ -3214,7 +3219,13 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <text text-case="title" variable="container-title"/>
+          <!-- avoid possible repetition of `container-title` with author-date: -->
+          <choose>
+            <if type="webpage" variable="container-title container-title-short"/>
+            <else>
+              <text text-case="title" variable="container-title"/>
+            </else>
+          </choose>
         </if>
       </choose>
       <choose>
@@ -4159,7 +4170,16 @@
           <text variable="references"/>
         </if>
         <else>
-          <text macro="author-bib"/>
+          <group delimiter=" ">
+            <text macro="author-bib"/>
+            <choose>
+              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
+              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
+              <if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>

From 5ae77c9ee5c9c89df1f155276e812ece40f9f260 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Wed, 1 Apr 2026 10:59:14 +0100
Subject: [PATCH 2/5] Adjust condition for `accepted` label

Closes #8123.
---
 chicago-author-date-17th-edition.csl                   |  5 +++--
 chicago-author-date-access-dates.csl                   |  5 +++--
 chicago-author-date-archive-place-first-no-url.csl     |  5 +++--
 chicago-author-date-archive-place-first.csl            |  5 +++--
 chicago-author-date-classic-no-url.csl                 |  5 +++--
 chicago-author-date-classic.csl                        |  5 +++--
 chicago-author-date-no-url.csl                         |  5 +++--
 chicago-author-date.csl                                |  5 +++--
 chicago-in-text-full-no-url.csl                        | 10 ++++++----
 chicago-in-text-full.csl                               | 10 ++++++----
 chicago-in-text-shortened-author-no-url.csl            |  5 +++--
 chicago-in-text-shortened-author-title-no-url.csl      |  5 +++--
 chicago-in-text-shortened-author-title.csl             |  5 +++--
 chicago-in-text-shortened-author.csl                   |  5 +++--
 chicago-notes-archive-place-first-no-url.csl           |  5 +++--
 chicago-notes-archive-place-first.csl                  |  5 +++--
 chicago-notes-bibliography-17th-edition.csl            | 10 ++++++----
 chicago-notes-bibliography-access-dates.csl            | 10 ++++++----
 chicago-notes-bibliography-annotated-abstract.csl      | 10 ++++++----
 chicago-notes-bibliography-annotated.csl               | 10 ++++++----
 ...o-notes-bibliography-archive-place-first-no-url.csl | 10 ++++++----
 chicago-notes-bibliography-archive-place-first.csl     | 10 ++++++----
 ...bibliography-classic-archive-place-first-no-url.csl | 10 ++++++----
 ...-notes-bibliography-classic-archive-place-first.csl | 10 ++++++----
 chicago-notes-bibliography-classic-no-url.csl          | 10 ++++++----
 chicago-notes-bibliography-classic.csl                 | 10 ++++++----
 chicago-notes-bibliography-no-url.csl                  | 10 ++++++----
 ...s-bibliography-subsequent-author-classic-no-url.csl | 10 ++++++----
 ...go-notes-bibliography-subsequent-author-classic.csl | 10 ++++++----
 ...ago-notes-bibliography-subsequent-author-no-url.csl | 10 ++++++----
 ...bliography-subsequent-author-title-17th-edition.csl | 10 ++++++----
 chicago-notes-bibliography-subsequent-author.csl       | 10 ++++++----
 ...notes-bibliography-subsequent-ibid-17th-edition.csl | 10 ++++++----
 ...tes-bibliography-subsequent-ibid-classic-no-url.csl | 10 ++++++----
 chicago-notes-bibliography-subsequent-ibid-classic.csl | 10 ++++++----
 chicago-notes-bibliography-subsequent-ibid-no-url.csl  | 10 ++++++----
 chicago-notes-bibliography-subsequent-ibid.csl         | 10 ++++++----
 chicago-notes-bibliography-subsequent-title-no-url.csl | 10 ++++++----
 chicago-notes-bibliography-subsequent-title.csl        | 10 ++++++----
 chicago-notes-bibliography.csl                         | 10 ++++++----
 chicago-notes-classic-archive-place-first-no-url.csl   |  5 +++--
 chicago-notes-classic-archive-place-first.csl          |  5 +++--
 chicago-notes-classic-no-url.csl                       |  5 +++--
 chicago-notes-classic.csl                              |  5 +++--
 chicago-notes-no-url.csl                               |  5 +++--
 ...otes-publisher-place-archive-place-first-no-url.csl |  5 +++--
 chicago-notes-publisher-place-archive-place-first.csl  |  5 +++--
 ...her-place-label-page-archive-place-first-no-url.csl |  5 +++--
 ...-publisher-place-label-page-archive-place-first.csl |  5 +++--
 chicago-notes-publisher-place-no-url.csl               |  5 +++--
 chicago-notes-publisher-place.csl                      |  5 +++--
 chicago-notes.csl                                      |  5 +++--
 chicago-shortened-notes-bibliography-17th-edition.csl  |  5 +++--
 chicago-shortened-notes-bibliography-access-dates.csl  |  5 +++--
 ...d-notes-bibliography-archive-place-first-no-url.csl |  5 +++--
 ...hortened-notes-bibliography-archive-place-first.csl |  5 +++--
 ...bibliography-classic-archive-place-first-no-url.csl |  5 +++--
 ...-notes-bibliography-classic-archive-place-first.csl |  5 +++--
 ...ago-shortened-notes-bibliography-classic-no-url.csl |  5 +++--
 chicago-shortened-notes-bibliography-classic.csl       |  5 +++--
 chicago-shortened-notes-bibliography-no-url.csl        |  5 +++--
 ...s-bibliography-subsequent-author-classic-no-url.csl |  5 +++--
 ...ed-notes-bibliography-subsequent-author-classic.csl |  5 +++--
 ...ned-notes-bibliography-subsequent-author-no-url.csl |  5 +++--
 ...bliography-subsequent-author-title-17th-edition.csl |  5 +++--
 ...-shortened-notes-bibliography-subsequent-author.csl |  5 +++--
 ...notes-bibliography-subsequent-ibid-17th-edition.csl |  5 +++--
 ...tes-bibliography-subsequent-ibid-classic-no-url.csl |  5 +++--
 ...ened-notes-bibliography-subsequent-ibid-classic.csl |  5 +++--
 ...tened-notes-bibliography-subsequent-ibid-no-url.csl |  5 +++--
 ...go-shortened-notes-bibliography-subsequent-ibid.csl |  5 +++--
 ...ened-notes-bibliography-subsequent-title-no-url.csl |  5 +++--
 ...o-shortened-notes-bibliography-subsequent-title.csl |  5 +++--
 chicago-shortened-notes-bibliography.csl               |  5 +++--
 taylor-and-francis-chicago-author-date.csl             |  5 +++--
 75 files changed, 303 insertions(+), 202 deletions(-)

diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index c0249d0ebd..922ff8ab39 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -2576,14 +2576,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-access-dates.csl b/chicago-author-date-access-dates.csl
index 9dc2425e10..68963864e2 100644
--- a/chicago-author-date-access-dates.csl
+++ b/chicago-author-date-access-dates.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-archive-place-first-no-url.csl b/chicago-author-date-archive-place-first-no-url.csl
index bc6832b2ce..6f3ed541f5 100644
--- a/chicago-author-date-archive-place-first-no-url.csl
+++ b/chicago-author-date-archive-place-first-no-url.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-archive-place-first.csl b/chicago-author-date-archive-place-first.csl
index a4dfd7d0d1..4529f4b16e 100644
--- a/chicago-author-date-archive-place-first.csl
+++ b/chicago-author-date-archive-place-first.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-classic-no-url.csl b/chicago-author-date-classic-no-url.csl
index 31c9dd6078..c8972754a8 100644
--- a/chicago-author-date-classic-no-url.csl
+++ b/chicago-author-date-classic-no-url.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-classic.csl b/chicago-author-date-classic.csl
index a5ab1f355c..da8fe819cb 100644
--- a/chicago-author-date-classic.csl
+++ b/chicago-author-date-classic.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date-no-url.csl b/chicago-author-date-no-url.csl
index 5f31a98a3b..16f7fe5990 100644
--- a/chicago-author-date-no-url.csl
+++ b/chicago-author-date-no-url.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index c941a50e50..bc2c207791 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -2559,14 +2559,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-in-text-full-no-url.csl b/chicago-in-text-full-no-url.csl
index 937fcab4ba..0e57e329be 100644
--- a/chicago-in-text-full-no-url.csl
+++ b/chicago-in-text-full-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-in-text-full.csl b/chicago-in-text-full.csl
index 2dee540d69..8cbc9c8876 100644
--- a/chicago-in-text-full.csl
+++ b/chicago-in-text-full.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-in-text-shortened-author-no-url.csl b/chicago-in-text-shortened-author-no-url.csl
index 59eeba0ed7..0e5aaa5e99 100644
--- a/chicago-in-text-shortened-author-no-url.csl
+++ b/chicago-in-text-shortened-author-no-url.csl
@@ -2516,14 +2516,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-in-text-shortened-author-title-no-url.csl b/chicago-in-text-shortened-author-title-no-url.csl
index 75f83eae55..1a26f9256a 100644
--- a/chicago-in-text-shortened-author-title-no-url.csl
+++ b/chicago-in-text-shortened-author-title-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-in-text-shortened-author-title.csl b/chicago-in-text-shortened-author-title.csl
index de17e2eefd..523016b21f 100644
--- a/chicago-in-text-shortened-author-title.csl
+++ b/chicago-in-text-shortened-author-title.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-in-text-shortened-author.csl b/chicago-in-text-shortened-author.csl
index e6d39f8946..c80e913e0d 100644
--- a/chicago-in-text-shortened-author.csl
+++ b/chicago-in-text-shortened-author.csl
@@ -2516,14 +2516,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-notes-archive-place-first-no-url.csl b/chicago-notes-archive-place-first-no-url.csl
index 7d108a96d0..5e0fd2231a 100644
--- a/chicago-notes-archive-place-first-no-url.csl
+++ b/chicago-notes-archive-place-first-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-archive-place-first.csl b/chicago-notes-archive-place-first.csl
index 68c0e0f840..736fd03ab5 100644
--- a/chicago-notes-archive-place-first.csl
+++ b/chicago-notes-archive-place-first.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-17th-edition.csl b/chicago-notes-bibliography-17th-edition.csl
index 90fb5545e3..7bf9c2d251 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -3640,14 +3640,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3660,14 +3661,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-access-dates.csl b/chicago-notes-bibliography-access-dates.csl
index c627c7bbc5..c9dc95a219 100644
--- a/chicago-notes-bibliography-access-dates.csl
+++ b/chicago-notes-bibliography-access-dates.csl
@@ -3647,14 +3647,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3667,14 +3668,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-annotated-abstract.csl b/chicago-notes-bibliography-annotated-abstract.csl
index dca5390d96..8f708a4276 100644
--- a/chicago-notes-bibliography-annotated-abstract.csl
+++ b/chicago-notes-bibliography-annotated-abstract.csl
@@ -3647,14 +3647,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3667,14 +3668,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-annotated.csl b/chicago-notes-bibliography-annotated.csl
index fbae958e7f..883fb04d00 100644
--- a/chicago-notes-bibliography-annotated.csl
+++ b/chicago-notes-bibliography-annotated.csl
@@ -3647,14 +3647,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3667,14 +3668,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-archive-place-first-no-url.csl b/chicago-notes-bibliography-archive-place-first-no-url.csl
index 581b76e2b9..bf32cf5b73 100644
--- a/chicago-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-archive-place-first-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-archive-place-first.csl b/chicago-notes-bibliography-archive-place-first.csl
index 0742542750..65a2351e49 100644
--- a/chicago-notes-bibliography-archive-place-first.csl
+++ b/chicago-notes-bibliography-archive-place-first.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
index 6412d551ae..2c02b4691d 100644
--- a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-classic-archive-place-first.csl b/chicago-notes-bibliography-classic-archive-place-first.csl
index e6705a8348..52cf8570b0 100644
--- a/chicago-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-classic-no-url.csl b/chicago-notes-bibliography-classic-no-url.csl
index cd96fca20f..5111e530c9 100644
--- a/chicago-notes-bibliography-classic-no-url.csl
+++ b/chicago-notes-bibliography-classic-no-url.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-classic.csl b/chicago-notes-bibliography-classic.csl
index 368cfb561a..6b614d4cb5 100644
--- a/chicago-notes-bibliography-classic.csl
+++ b/chicago-notes-bibliography-classic.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-no-url.csl b/chicago-notes-bibliography-no-url.csl
index 2e16aa9491..6ff2787c4a 100644
--- a/chicago-notes-bibliography-no-url.csl
+++ b/chicago-notes-bibliography-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
index 7d87a45245..f062beaf9d 100644
--- a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-author-classic.csl b/chicago-notes-bibliography-subsequent-author-classic.csl
index 35e52a4ed5..1ce8e57706 100644
--- a/chicago-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-author-no-url.csl b/chicago-notes-bibliography-subsequent-author-no-url.csl
index 8e77850f47..5f219344e3 100644
--- a/chicago-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
index bf3e9c847f..06e6412173 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -3640,14 +3640,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3660,14 +3661,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-author.csl b/chicago-notes-bibliography-subsequent-author.csl
index 949c8e645e..ac73addb40 100644
--- a/chicago-notes-bibliography-subsequent-author.csl
+++ b/chicago-notes-bibliography-subsequent-author.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
index 7f9393b415..7b0f508f3b 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -3640,14 +3640,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3660,14 +3661,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 5d9dea0671..22f9ea8a77 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic.csl b/chicago-notes-bibliography-subsequent-ibid-classic.csl
index 61a78154a3..f0963aa175 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic.csl
@@ -3643,14 +3643,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3663,14 +3664,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
index 7b470e4c1e..5080a15251 100644
--- a/chicago-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-ibid.csl b/chicago-notes-bibliography-subsequent-ibid.csl
index f1c1567f44..8c10dac78c 100644
--- a/chicago-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-notes-bibliography-subsequent-ibid.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-title-no-url.csl b/chicago-notes-bibliography-subsequent-title-no-url.csl
index 4db5cd3b9c..abd4ce6284 100644
--- a/chicago-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-title-no-url.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography-subsequent-title.csl b/chicago-notes-bibliography-subsequent-title.csl
index 2c09db4686..93ad70664c 100644
--- a/chicago-notes-bibliography-subsequent-title.csl
+++ b/chicago-notes-bibliography-subsequent-title.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-bibliography.csl b/chicago-notes-bibliography.csl
index 5f0fd81177..666f1f1bbf 100644
--- a/chicago-notes-bibliography.csl
+++ b/chicago-notes-bibliography.csl
@@ -3646,14 +3646,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3666,14 +3667,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-classic-archive-place-first-no-url.csl b/chicago-notes-classic-archive-place-first-no-url.csl
index 6603b9c3f0..da6c548605 100644
--- a/chicago-notes-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-classic-archive-place-first-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-classic-archive-place-first.csl b/chicago-notes-classic-archive-place-first.csl
index 74203c71f9..2cfc7e02d2 100644
--- a/chicago-notes-classic-archive-place-first.csl
+++ b/chicago-notes-classic-archive-place-first.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-classic-no-url.csl b/chicago-notes-classic-no-url.csl
index 06ed5175c0..e1c6a4d5de 100644
--- a/chicago-notes-classic-no-url.csl
+++ b/chicago-notes-classic-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-classic.csl b/chicago-notes-classic.csl
index 6b6e9869ce..f6a7d196fb 100644
--- a/chicago-notes-classic.csl
+++ b/chicago-notes-classic.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-no-url.csl b/chicago-notes-no-url.csl
index 5180b5a71c..0565761076 100644
--- a/chicago-notes-no-url.csl
+++ b/chicago-notes-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place-archive-place-first-no-url.csl b/chicago-notes-publisher-place-archive-place-first-no-url.csl
index 65eb818109..630e1f5a4a 100644
--- a/chicago-notes-publisher-place-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-archive-place-first-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place-archive-place-first.csl b/chicago-notes-publisher-place-archive-place-first.csl
index 120623bec5..68c9455fa1 100644
--- a/chicago-notes-publisher-place-archive-place-first.csl
+++ b/chicago-notes-publisher-place-archive-place-first.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
index c368b468eb..791f80368f 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
@@ -3246,14 +3246,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first.csl b/chicago-notes-publisher-place-label-page-archive-place-first.csl
index f08a095c68..6fda4835d9 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first.csl
@@ -3246,14 +3246,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place-no-url.csl b/chicago-notes-publisher-place-no-url.csl
index e191db28cb..33cae7c76a 100644
--- a/chicago-notes-publisher-place-no-url.csl
+++ b/chicago-notes-publisher-place-no-url.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes-publisher-place.csl b/chicago-notes-publisher-place.csl
index 46014b1a41..46c746e201 100644
--- a/chicago-notes-publisher-place.csl
+++ b/chicago-notes-publisher-place.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-notes.csl b/chicago-notes.csl
index 2059bd953b..c75ed0519a 100644
--- a/chicago-notes.csl
+++ b/chicago-notes.csl
@@ -3251,14 +3251,15 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
diff --git a/chicago-shortened-notes-bibliography-17th-edition.csl b/chicago-shortened-notes-bibliography-17th-edition.csl
index 736611d18f..343ef78f8b 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -2580,14 +2580,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-access-dates.csl b/chicago-shortened-notes-bibliography-access-dates.csl
index ab4631224b..364dba8806 100644
--- a/chicago-shortened-notes-bibliography-access-dates.csl
+++ b/chicago-shortened-notes-bibliography-access-dates.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
index 8bb429c37f..9e49f6483a 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first.csl b/chicago-shortened-notes-bibliography-archive-place-first.csl
index 673dec0f67..6a2f1279b6 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
index ffa5f0fe08..d2dc222c9b 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
index ef9d4aac14..5cbc206d10 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-classic-no-url.csl b/chicago-shortened-notes-bibliography-classic-no-url.csl
index bb27620223..d1899f5c54 100644
--- a/chicago-shortened-notes-bibliography-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-no-url.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-classic.csl b/chicago-shortened-notes-bibliography-classic.csl
index 6e1b05bf8d..b6fcc9e165 100644
--- a/chicago-shortened-notes-bibliography-classic.csl
+++ b/chicago-shortened-notes-bibliography-classic.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-no-url.csl b/chicago-shortened-notes-bibliography-no-url.csl
index 9659c30571..997caa3aa3 100644
--- a/chicago-shortened-notes-bibliography-no-url.csl
+++ b/chicago-shortened-notes-bibliography-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
index d3c659b6b8..fbbb4a4dc7 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
index f9a62ba428..8f773e3732 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
index 37e1307e8a..5aa65f6b7b 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
index 46ed7f5cb6..60f44ea9bc 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -2580,14 +2580,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author.csl b/chicago-shortened-notes-bibliography-subsequent-author.csl
index 15d2025522..20af4904a9 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
index 5d3ea20859..50add34edc 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -2580,14 +2580,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
index cce52313ac..5685ba2a41 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
index 4f2e779296..6486999cee 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
@@ -2583,14 +2583,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
index 7b733ce0fc..9177e1bf0e 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid.csl b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
index 9ade60ba2f..ab2cc88103 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
index bcd853c4ff..8a07c4ed15 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title.csl b/chicago-shortened-notes-bibliography-subsequent-title.csl
index c045eb667e..9406ab288d 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/chicago-shortened-notes-bibliography.csl b/chicago-shortened-notes-bibliography.csl
index 1761f39492..1ee0afdbb1 100644
--- a/chicago-shortened-notes-bibliography.csl
+++ b/chicago-shortened-notes-bibliography.csl
@@ -2587,14 +2587,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
diff --git a/taylor-and-francis-chicago-author-date.csl b/taylor-and-francis-chicago-author-date.csl
index 55dab984b8..e1e22500f3 100644
--- a/taylor-and-francis-chicago-author-date.csl
+++ b/taylor-and-francis-chicago-author-date.csl
@@ -2560,14 +2560,15 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="none" variable="collection-title issue number page supplement-number volume">
+        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </if>
+        </else-if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>

From ae64b9ce895d0d1213e147f4dabfdee9af14e0c5 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Wed, 1 Apr 2026 11:23:52 +0100
Subject: [PATCH 3/5] Fix webpage with publisher and container-title-short

---
 chicago-author-date-17th-edition.csl                   | 10 +++++++---
 chicago-author-date-access-dates.csl                   | 10 +++++++---
 chicago-author-date-archive-place-first-no-url.csl     | 10 +++++++---
 chicago-author-date-archive-place-first.csl            | 10 +++++++---
 chicago-author-date-classic-no-url.csl                 | 10 +++++++---
 chicago-author-date-classic.csl                        | 10 +++++++---
 chicago-author-date-no-url.csl                         | 10 +++++++---
 chicago-author-date.csl                                | 10 +++++++---
 chicago-in-text-full-no-url.csl                        |  2 +-
 chicago-in-text-full.csl                               |  2 +-
 chicago-in-text-shortened-author-no-url.csl            |  2 +-
 chicago-in-text-shortened-author-title-no-url.csl      |  2 +-
 chicago-in-text-shortened-author-title.csl             |  2 +-
 chicago-in-text-shortened-author.csl                   |  2 +-
 chicago-notes-bibliography-17th-edition.csl            |  2 +-
 chicago-notes-bibliography-access-dates.csl            |  2 +-
 chicago-notes-bibliography-annotated-abstract.csl      |  2 +-
 chicago-notes-bibliography-annotated.csl               |  2 +-
 ...o-notes-bibliography-archive-place-first-no-url.csl |  2 +-
 chicago-notes-bibliography-archive-place-first.csl     |  2 +-
 ...bibliography-classic-archive-place-first-no-url.csl |  2 +-
 ...-notes-bibliography-classic-archive-place-first.csl |  2 +-
 chicago-notes-bibliography-classic-no-url.csl          |  2 +-
 chicago-notes-bibliography-classic.csl                 |  2 +-
 chicago-notes-bibliography-no-url.csl                  |  2 +-
 ...s-bibliography-subsequent-author-classic-no-url.csl |  2 +-
 ...go-notes-bibliography-subsequent-author-classic.csl |  2 +-
 ...ago-notes-bibliography-subsequent-author-no-url.csl |  2 +-
 ...bliography-subsequent-author-title-17th-edition.csl |  2 +-
 chicago-notes-bibliography-subsequent-author.csl       |  2 +-
 ...notes-bibliography-subsequent-ibid-17th-edition.csl |  2 +-
 ...tes-bibliography-subsequent-ibid-classic-no-url.csl |  2 +-
 chicago-notes-bibliography-subsequent-ibid-classic.csl |  2 +-
 chicago-notes-bibliography-subsequent-ibid-no-url.csl  |  2 +-
 chicago-notes-bibliography-subsequent-ibid.csl         |  2 +-
 chicago-notes-bibliography-subsequent-title-no-url.csl |  2 +-
 chicago-notes-bibliography-subsequent-title.csl        |  2 +-
 chicago-notes-bibliography.csl                         |  2 +-
 chicago-shortened-notes-bibliography-17th-edition.csl  |  2 +-
 chicago-shortened-notes-bibliography-access-dates.csl  |  2 +-
 ...d-notes-bibliography-archive-place-first-no-url.csl |  2 +-
 ...hortened-notes-bibliography-archive-place-first.csl |  2 +-
 ...bibliography-classic-archive-place-first-no-url.csl |  2 +-
 ...-notes-bibliography-classic-archive-place-first.csl |  2 +-
 ...ago-shortened-notes-bibliography-classic-no-url.csl |  2 +-
 chicago-shortened-notes-bibliography-classic.csl       |  2 +-
 chicago-shortened-notes-bibliography-no-url.csl        |  2 +-
 ...s-bibliography-subsequent-author-classic-no-url.csl |  2 +-
 ...ed-notes-bibliography-subsequent-author-classic.csl |  2 +-
 ...ned-notes-bibliography-subsequent-author-no-url.csl |  2 +-
 ...bliography-subsequent-author-title-17th-edition.csl |  2 +-
 ...-shortened-notes-bibliography-subsequent-author.csl |  2 +-
 ...notes-bibliography-subsequent-ibid-17th-edition.csl |  2 +-
 ...tes-bibliography-subsequent-ibid-classic-no-url.csl |  2 +-
 ...ened-notes-bibliography-subsequent-ibid-classic.csl |  2 +-
 ...tened-notes-bibliography-subsequent-ibid-no-url.csl |  2 +-
 ...go-shortened-notes-bibliography-subsequent-ibid.csl |  2 +-
 ...ened-notes-bibliography-subsequent-title-no-url.csl |  2 +-
 ...o-shortened-notes-bibliography-subsequent-title.csl |  2 +-
 chicago-shortened-notes-bibliography.csl               |  2 +-
 taylor-and-francis-chicago-author-date.csl             | 10 +++++++---
 61 files changed, 115 insertions(+), 79 deletions(-)

diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index 922ff8ab39..e7dab54ea9 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -3238,7 +3238,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4192,9 +4195,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-access-dates.csl b/chicago-author-date-access-dates.csl
index 68963864e2..5664c00522 100644
--- a/chicago-author-date-access-dates.csl
+++ b/chicago-author-date-access-dates.csl
@@ -3227,7 +3227,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4148,9 +4151,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-archive-place-first-no-url.csl b/chicago-author-date-archive-place-first-no-url.csl
index 6f3ed541f5..0b0cd026ea 100644
--- a/chicago-author-date-archive-place-first-no-url.csl
+++ b/chicago-author-date-archive-place-first-no-url.csl
@@ -3227,7 +3227,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4125,9 +4128,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-archive-place-first.csl b/chicago-author-date-archive-place-first.csl
index 4529f4b16e..a81fa95d47 100644
--- a/chicago-author-date-archive-place-first.csl
+++ b/chicago-author-date-archive-place-first.csl
@@ -3227,7 +3227,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4135,9 +4138,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-classic-no-url.csl b/chicago-author-date-classic-no-url.csl
index c8972754a8..8e362e9c43 100644
--- a/chicago-author-date-classic-no-url.csl
+++ b/chicago-author-date-classic-no-url.csl
@@ -3221,7 +3221,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4133,9 +4136,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-classic.csl b/chicago-author-date-classic.csl
index da8fe819cb..dbe160f0d4 100644
--- a/chicago-author-date-classic.csl
+++ b/chicago-author-date-classic.csl
@@ -3221,7 +3221,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4143,9 +4146,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date-no-url.csl b/chicago-author-date-no-url.csl
index 16f7fe5990..a15e41d57d 100644
--- a/chicago-author-date-no-url.csl
+++ b/chicago-author-date-no-url.csl
@@ -3227,7 +3227,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4139,9 +4142,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index bc2c207791..b1d73ac791 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -3227,7 +3227,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4149,9 +4152,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>
diff --git a/chicago-in-text-full-no-url.csl b/chicago-in-text-full-no-url.csl
index 0e57e329be..5aefc5ff62 100644
--- a/chicago-in-text-full-no-url.csl
+++ b/chicago-in-text-full-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-full.csl b/chicago-in-text-full.csl
index 8cbc9c8876..2a3ca063fa 100644
--- a/chicago-in-text-full.csl
+++ b/chicago-in-text-full.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-no-url.csl b/chicago-in-text-shortened-author-no-url.csl
index 0e5aaa5e99..5e14ff5522 100644
--- a/chicago-in-text-shortened-author-no-url.csl
+++ b/chicago-in-text-shortened-author-no-url.csl
@@ -3119,7 +3119,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-title-no-url.csl b/chicago-in-text-shortened-author-title-no-url.csl
index 1a26f9256a..f708940381 100644
--- a/chicago-in-text-shortened-author-title-no-url.csl
+++ b/chicago-in-text-shortened-author-title-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author-title.csl b/chicago-in-text-shortened-author-title.csl
index 523016b21f..4aa2bf5e1a 100644
--- a/chicago-in-text-shortened-author-title.csl
+++ b/chicago-in-text-shortened-author-title.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-in-text-shortened-author.csl b/chicago-in-text-shortened-author.csl
index c80e913e0d..4b11bcc4a5 100644
--- a/chicago-in-text-shortened-author.csl
+++ b/chicago-in-text-shortened-author.csl
@@ -3119,7 +3119,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-17th-edition.csl b/chicago-notes-bibliography-17th-edition.csl
index 7bf9c2d251..4d52a6c3e8 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -4705,7 +4705,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-access-dates.csl b/chicago-notes-bibliography-access-dates.csl
index c9dc95a219..d686813253 100644
--- a/chicago-notes-bibliography-access-dates.csl
+++ b/chicago-notes-bibliography-access-dates.csl
@@ -4714,7 +4714,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-annotated-abstract.csl b/chicago-notes-bibliography-annotated-abstract.csl
index 8f708a4276..86ad8bdad1 100644
--- a/chicago-notes-bibliography-annotated-abstract.csl
+++ b/chicago-notes-bibliography-annotated-abstract.csl
@@ -4714,7 +4714,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-annotated.csl b/chicago-notes-bibliography-annotated.csl
index 883fb04d00..963ca2bf37 100644
--- a/chicago-notes-bibliography-annotated.csl
+++ b/chicago-notes-bibliography-annotated.csl
@@ -4714,7 +4714,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-archive-place-first-no-url.csl b/chicago-notes-bibliography-archive-place-first-no-url.csl
index bf32cf5b73..c0ef8b10e5 100644
--- a/chicago-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-archive-place-first-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-archive-place-first.csl b/chicago-notes-bibliography-archive-place-first.csl
index 65a2351e49..1f0e4c5a6e 100644
--- a/chicago-notes-bibliography-archive-place-first.csl
+++ b/chicago-notes-bibliography-archive-place-first.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
index 2c02b4691d..49928d986d 100644
--- a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-archive-place-first.csl b/chicago-notes-bibliography-classic-archive-place-first.csl
index 52cf8570b0..3be5996ed1 100644
--- a/chicago-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic-no-url.csl b/chicago-notes-bibliography-classic-no-url.csl
index 5111e530c9..4cd14ba3f3 100644
--- a/chicago-notes-bibliography-classic-no-url.csl
+++ b/chicago-notes-bibliography-classic-no-url.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-classic.csl b/chicago-notes-bibliography-classic.csl
index 6b614d4cb5..97a7b105bd 100644
--- a/chicago-notes-bibliography-classic.csl
+++ b/chicago-notes-bibliography-classic.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-no-url.csl b/chicago-notes-bibliography-no-url.csl
index 6ff2787c4a..712a5a2e45 100644
--- a/chicago-notes-bibliography-no-url.csl
+++ b/chicago-notes-bibliography-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
index f062beaf9d..6580f92e8c 100644
--- a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-classic.csl b/chicago-notes-bibliography-subsequent-author-classic.csl
index 1ce8e57706..d8f49e0e5d 100644
--- a/chicago-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-no-url.csl b/chicago-notes-bibliography-subsequent-author-no-url.csl
index 5f219344e3..6acca4168b 100644
--- a/chicago-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
index 06e6412173..d32a8054fa 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -4705,7 +4705,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-author.csl b/chicago-notes-bibliography-subsequent-author.csl
index ac73addb40..22452756fd 100644
--- a/chicago-notes-bibliography-subsequent-author.csl
+++ b/chicago-notes-bibliography-subsequent-author.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
index 7b0f508f3b..ff5ca831d2 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -4705,7 +4705,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 22f9ea8a77..944f4fd41d 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic.csl b/chicago-notes-bibliography-subsequent-ibid-classic.csl
index f0963aa175..15e5714dc3 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic.csl
@@ -4708,7 +4708,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
index 5080a15251..c437c56521 100644
--- a/chicago-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-ibid.csl b/chicago-notes-bibliography-subsequent-ibid.csl
index 8c10dac78c..cb9cebdc5f 100644
--- a/chicago-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-notes-bibliography-subsequent-ibid.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-title-no-url.csl b/chicago-notes-bibliography-subsequent-title-no-url.csl
index abd4ce6284..063793f287 100644
--- a/chicago-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-title-no-url.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography-subsequent-title.csl b/chicago-notes-bibliography-subsequent-title.csl
index 93ad70664c..e424750eda 100644
--- a/chicago-notes-bibliography-subsequent-title.csl
+++ b/chicago-notes-bibliography-subsequent-title.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-notes-bibliography.csl b/chicago-notes-bibliography.csl
index 666f1f1bbf..17a6a604ba 100644
--- a/chicago-notes-bibliography.csl
+++ b/chicago-notes-bibliography.csl
@@ -4713,7 +4713,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-17th-edition.csl b/chicago-shortened-notes-bibliography-17th-edition.csl
index 343ef78f8b..22af4fdc48 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -3280,7 +3280,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-access-dates.csl b/chicago-shortened-notes-bibliography-access-dates.csl
index 364dba8806..81737ec2e2 100644
--- a/chicago-shortened-notes-bibliography-access-dates.csl
+++ b/chicago-shortened-notes-bibliography-access-dates.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
index 9e49f6483a..b774d38ff6 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first.csl b/chicago-shortened-notes-bibliography-archive-place-first.csl
index 6a2f1279b6..17379231e8 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
index d2dc222c9b..d6ccdf6aea 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
index 5cbc206d10..a34cd334bc 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic-no-url.csl b/chicago-shortened-notes-bibliography-classic-no-url.csl
index d1899f5c54..ff45069ecd 100644
--- a/chicago-shortened-notes-bibliography-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-no-url.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-classic.csl b/chicago-shortened-notes-bibliography-classic.csl
index b6fcc9e165..bae96d797e 100644
--- a/chicago-shortened-notes-bibliography-classic.csl
+++ b/chicago-shortened-notes-bibliography-classic.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-no-url.csl b/chicago-shortened-notes-bibliography-no-url.csl
index 997caa3aa3..ee3bcee94f 100644
--- a/chicago-shortened-notes-bibliography-no-url.csl
+++ b/chicago-shortened-notes-bibliography-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
index fbbb4a4dc7..858bbf3958 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
index 8f773e3732..ecf61fe2ec 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
index 5aa65f6b7b..f42a486937 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
index 60f44ea9bc..62072d8d26 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -3280,7 +3280,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author.csl b/chicago-shortened-notes-bibliography-subsequent-author.csl
index 20af4904a9..2b618b1676 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
index 50add34edc..190f71f1f9 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -3280,7 +3280,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 5685ba2a41..ca30ca482c 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
index 6486999cee..3eb936006b 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
@@ -3283,7 +3283,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
index 9177e1bf0e..4958fb317b 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid.csl b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
index ab2cc88103..478d6dd021 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
index 8a07c4ed15..7844720efa 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title.csl b/chicago-shortened-notes-bibliography-subsequent-title.csl
index 9406ab288d..ce39febc85 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/chicago-shortened-notes-bibliography.csl b/chicago-shortened-notes-bibliography.csl
index 1ee0afdbb1..6ecc0a32fe 100644
--- a/chicago-shortened-notes-bibliography.csl
+++ b/chicago-shortened-notes-bibliography.csl
@@ -3289,7 +3289,7 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
           <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
+          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
diff --git a/taylor-and-francis-chicago-author-date.csl b/taylor-and-francis-chicago-author-date.csl
index e1e22500f3..96a39140ae 100644
--- a/taylor-and-francis-chicago-author-date.csl
+++ b/taylor-and-francis-chicago-author-date.csl
@@ -3222,7 +3222,10 @@
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <!-- avoid possible repetition of `container-title` with author-date: -->
           <choose>
-            <if type="webpage" variable="container-title container-title-short"/>
+            <if variable="publisher">
+              <text text-case="title" variable="container-title"/>
+            </if>
+            <else-if type="webpage" variable="container-title container-title-short"/>
             <else>
               <text text-case="title" variable="container-title"/>
             </else>
@@ -4176,9 +4179,10 @@
             <choose>
               <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
               <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="container-title container-title-short">
+              <if type="webpage" variable="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
                 <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </if>
+              </else-if>
             </choose>
           </group>
           <text macro="date"/>

From b1c35ff5e4d0551498b720ff10df88b737ddb310 Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:01:43 +0100
Subject: [PATCH 4/5] Regularize variables indicating published serial works

---
 chicago-author-date-17th-edition.csl                 |  6 ++++--
 chicago-author-date-access-dates.csl                 |  6 ++++--
 chicago-author-date-archive-place-first-no-url.csl   |  6 ++++--
 chicago-author-date-archive-place-first.csl          |  6 ++++--
 chicago-author-date-classic-no-url.csl               |  6 ++++--
 chicago-author-date-classic.csl                      |  6 ++++--
 chicago-author-date-no-url.csl                       |  6 ++++--
 chicago-author-date.csl                              |  6 ++++--
 chicago-in-text-full-no-url.csl                      | 12 ++++++++----
 chicago-in-text-full.csl                             | 12 ++++++++----
 chicago-in-text-shortened-author-no-url.csl          |  6 ++++--
 chicago-in-text-shortened-author-title-no-url.csl    |  6 ++++--
 chicago-in-text-shortened-author-title.csl           |  6 ++++--
 chicago-in-text-shortened-author.csl                 |  6 ++++--
 chicago-notes-archive-place-first-no-url.csl         |  6 ++++--
 chicago-notes-archive-place-first.csl                |  6 ++++--
 chicago-notes-bibliography-17th-edition.csl          | 12 ++++++++----
 chicago-notes-bibliography-access-dates.csl          | 12 ++++++++----
 chicago-notes-bibliography-annotated-abstract.csl    | 12 ++++++++----
 chicago-notes-bibliography-annotated.csl             | 12 ++++++++----
 ...notes-bibliography-archive-place-first-no-url.csl | 12 ++++++++----
 chicago-notes-bibliography-archive-place-first.csl   | 12 ++++++++----
 ...bliography-classic-archive-place-first-no-url.csl | 12 ++++++++----
 ...otes-bibliography-classic-archive-place-first.csl | 12 ++++++++----
 chicago-notes-bibliography-classic-no-url.csl        | 12 ++++++++----
 chicago-notes-bibliography-classic.csl               | 12 ++++++++----
 chicago-notes-bibliography-no-url.csl                | 12 ++++++++----
 ...bibliography-subsequent-author-classic-no-url.csl | 12 ++++++++----
 ...-notes-bibliography-subsequent-author-classic.csl | 12 ++++++++----
 ...o-notes-bibliography-subsequent-author-no-url.csl | 12 ++++++++----
 ...iography-subsequent-author-title-17th-edition.csl | 12 ++++++++----
 chicago-notes-bibliography-subsequent-author.csl     | 12 ++++++++----
 ...tes-bibliography-subsequent-ibid-17th-edition.csl | 12 ++++++++----
 ...s-bibliography-subsequent-ibid-classic-no-url.csl | 12 ++++++++----
 ...go-notes-bibliography-subsequent-ibid-classic.csl | 12 ++++++++----
 ...ago-notes-bibliography-subsequent-ibid-no-url.csl | 12 ++++++++----
 chicago-notes-bibliography-subsequent-ibid.csl       | 12 ++++++++----
 ...go-notes-bibliography-subsequent-title-no-url.csl | 12 ++++++++----
 chicago-notes-bibliography-subsequent-title.csl      | 12 ++++++++----
 chicago-notes-bibliography.csl                       | 12 ++++++++----
 chicago-notes-classic-archive-place-first-no-url.csl |  6 ++++--
 chicago-notes-classic-archive-place-first.csl        |  6 ++++--
 chicago-notes-classic-no-url.csl                     |  6 ++++--
 chicago-notes-classic.csl                            |  6 ++++--
 chicago-notes-no-url.csl                             |  6 ++++--
 ...es-publisher-place-archive-place-first-no-url.csl |  6 ++++--
 ...ago-notes-publisher-place-archive-place-first.csl |  6 ++++--
 ...r-place-label-page-archive-place-first-no-url.csl |  6 ++++--
 ...ublisher-place-label-page-archive-place-first.csl |  6 ++++--
 chicago-notes-publisher-place-no-url.csl             |  6 ++++--
 chicago-notes-publisher-place.csl                    |  6 ++++--
 chicago-notes.csl                                    |  6 ++++--
 ...ago-shortened-notes-bibliography-17th-edition.csl |  6 ++++--
 ...ago-shortened-notes-bibliography-access-dates.csl |  6 ++++--
 ...notes-bibliography-archive-place-first-no-url.csl |  6 ++++--
 ...rtened-notes-bibliography-archive-place-first.csl |  6 ++++--
 ...bliography-classic-archive-place-first-no-url.csl |  6 ++++--
 ...otes-bibliography-classic-archive-place-first.csl |  6 ++++--
 ...o-shortened-notes-bibliography-classic-no-url.csl |  6 ++++--
 chicago-shortened-notes-bibliography-classic.csl     |  6 ++++--
 chicago-shortened-notes-bibliography-no-url.csl      |  6 ++++--
 ...bibliography-subsequent-author-classic-no-url.csl |  6 ++++--
 ...-notes-bibliography-subsequent-author-classic.csl |  6 ++++--
 ...d-notes-bibliography-subsequent-author-no-url.csl |  6 ++++--
 ...iography-subsequent-author-title-17th-edition.csl |  6 ++++--
 ...hortened-notes-bibliography-subsequent-author.csl |  6 ++++--
 ...tes-bibliography-subsequent-ibid-17th-edition.csl |  6 ++++--
 ...s-bibliography-subsequent-ibid-classic-no-url.csl |  6 ++++--
 ...ed-notes-bibliography-subsequent-ibid-classic.csl |  6 ++++--
 ...ned-notes-bibliography-subsequent-ibid-no-url.csl |  6 ++++--
 ...-shortened-notes-bibliography-subsequent-ibid.csl |  6 ++++--
 ...ed-notes-bibliography-subsequent-title-no-url.csl |  6 ++++--
 ...shortened-notes-bibliography-subsequent-title.csl |  6 ++++--
 chicago-shortened-notes-bibliography.csl             |  6 ++++--
 taylor-and-francis-chicago-author-date.csl           |  6 ++++--
 75 files changed, 404 insertions(+), 202 deletions(-)

diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index e7dab54ea9..d95b496f32 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -2429,7 +2429,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2576,7 +2577,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-access-dates.csl b/chicago-author-date-access-dates.csl
index 5664c00522..f46736e401 100644
--- a/chicago-author-date-access-dates.csl
+++ b/chicago-author-date-access-dates.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-archive-place-first-no-url.csl b/chicago-author-date-archive-place-first-no-url.csl
index 0b0cd026ea..5872bac4ce 100644
--- a/chicago-author-date-archive-place-first-no-url.csl
+++ b/chicago-author-date-archive-place-first-no-url.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-archive-place-first.csl b/chicago-author-date-archive-place-first.csl
index a81fa95d47..8580c82ac3 100644
--- a/chicago-author-date-archive-place-first.csl
+++ b/chicago-author-date-archive-place-first.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-classic-no-url.csl b/chicago-author-date-classic-no-url.csl
index 8e362e9c43..d35f26665f 100644
--- a/chicago-author-date-classic-no-url.csl
+++ b/chicago-author-date-classic-no-url.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-classic.csl b/chicago-author-date-classic.csl
index dbe160f0d4..5344c39b3e 100644
--- a/chicago-author-date-classic.csl
+++ b/chicago-author-date-classic.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date-no-url.csl b/chicago-author-date-no-url.csl
index a15e41d57d..9632039c0b 100644
--- a/chicago-author-date-no-url.csl
+++ b/chicago-author-date-no-url.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index b1d73ac791..921c5ea4bd 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -2412,7 +2412,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2559,7 +2560,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-full-no-url.csl b/chicago-in-text-full-no-url.csl
index 5aefc5ff62..4df1a76708 100644
--- a/chicago-in-text-full-no-url.csl
+++ b/chicago-in-text-full-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-full.csl b/chicago-in-text-full.csl
index 2a3ca063fa..688c9ada7f 100644
--- a/chicago-in-text-full.csl
+++ b/chicago-in-text-full.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-shortened-author-no-url.csl b/chicago-in-text-shortened-author-no-url.csl
index 5e14ff5522..3f7bd12add 100644
--- a/chicago-in-text-shortened-author-no-url.csl
+++ b/chicago-in-text-shortened-author-no-url.csl
@@ -2390,7 +2390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2516,7 +2517,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-shortened-author-title-no-url.csl b/chicago-in-text-shortened-author-title-no-url.csl
index f708940381..5258090adf 100644
--- a/chicago-in-text-shortened-author-title-no-url.csl
+++ b/chicago-in-text-shortened-author-title-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-shortened-author-title.csl b/chicago-in-text-shortened-author-title.csl
index 4aa2bf5e1a..4c75c140cd 100644
--- a/chicago-in-text-shortened-author-title.csl
+++ b/chicago-in-text-shortened-author-title.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-in-text-shortened-author.csl b/chicago-in-text-shortened-author.csl
index 4b11bcc4a5..8f1d653329 100644
--- a/chicago-in-text-shortened-author.csl
+++ b/chicago-in-text-shortened-author.csl
@@ -2390,7 +2390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2516,7 +2517,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-archive-place-first-no-url.csl b/chicago-notes-archive-place-first-no-url.csl
index 5e0fd2231a..dbdedce2c4 100644
--- a/chicago-notes-archive-place-first-no-url.csl
+++ b/chicago-notes-archive-place-first-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-archive-place-first.csl b/chicago-notes-archive-place-first.csl
index 736fd03ab5..0f62894705 100644
--- a/chicago-notes-archive-place-first.csl
+++ b/chicago-notes-archive-place-first.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-17th-edition.csl b/chicago-notes-bibliography-17th-edition.csl
index 4d52a6c3e8..599fdd8609 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -3353,7 +3353,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3383,7 +3384,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3640,7 +3642,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3661,7 +3664,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-access-dates.csl b/chicago-notes-bibliography-access-dates.csl
index d686813253..7adb3cf218 100644
--- a/chicago-notes-bibliography-access-dates.csl
+++ b/chicago-notes-bibliography-access-dates.csl
@@ -3360,7 +3360,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3390,7 +3391,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3647,7 +3649,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3668,7 +3671,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-annotated-abstract.csl b/chicago-notes-bibliography-annotated-abstract.csl
index 86ad8bdad1..ccb77995ae 100644
--- a/chicago-notes-bibliography-annotated-abstract.csl
+++ b/chicago-notes-bibliography-annotated-abstract.csl
@@ -3360,7 +3360,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3390,7 +3391,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3647,7 +3649,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3668,7 +3671,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-annotated.csl b/chicago-notes-bibliography-annotated.csl
index 963ca2bf37..e7739aaf1b 100644
--- a/chicago-notes-bibliography-annotated.csl
+++ b/chicago-notes-bibliography-annotated.csl
@@ -3360,7 +3360,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3390,7 +3391,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3647,7 +3649,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3668,7 +3671,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-archive-place-first-no-url.csl b/chicago-notes-bibliography-archive-place-first-no-url.csl
index c0ef8b10e5..4ae6c372bb 100644
--- a/chicago-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-archive-place-first-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-archive-place-first.csl b/chicago-notes-bibliography-archive-place-first.csl
index 1f0e4c5a6e..4aa321b9dd 100644
--- a/chicago-notes-bibliography-archive-place-first.csl
+++ b/chicago-notes-bibliography-archive-place-first.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
index 49928d986d..baac799734 100644
--- a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-classic-archive-place-first.csl b/chicago-notes-bibliography-classic-archive-place-first.csl
index 3be5996ed1..cc90f34d79 100644
--- a/chicago-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-classic-no-url.csl b/chicago-notes-bibliography-classic-no-url.csl
index 4cd14ba3f3..f6ed5e2467 100644
--- a/chicago-notes-bibliography-classic-no-url.csl
+++ b/chicago-notes-bibliography-classic-no-url.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-classic.csl b/chicago-notes-bibliography-classic.csl
index 97a7b105bd..72f6f1730d 100644
--- a/chicago-notes-bibliography-classic.csl
+++ b/chicago-notes-bibliography-classic.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-no-url.csl b/chicago-notes-bibliography-no-url.csl
index 712a5a2e45..f683312318 100644
--- a/chicago-notes-bibliography-no-url.csl
+++ b/chicago-notes-bibliography-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
index 6580f92e8c..afe1f58401 100644
--- a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-author-classic.csl b/chicago-notes-bibliography-subsequent-author-classic.csl
index d8f49e0e5d..e509aa6b37 100644
--- a/chicago-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-author-no-url.csl b/chicago-notes-bibliography-subsequent-author-no-url.csl
index 6acca4168b..28c3b3c8e9 100644
--- a/chicago-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
index d32a8054fa..7e4dd8cce9 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -3353,7 +3353,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3383,7 +3384,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3640,7 +3642,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3661,7 +3664,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-author.csl b/chicago-notes-bibliography-subsequent-author.csl
index 22452756fd..ea046b2a30 100644
--- a/chicago-notes-bibliography-subsequent-author.csl
+++ b/chicago-notes-bibliography-subsequent-author.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
index ff5ca831d2..ca25204cc2 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -3353,7 +3353,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3383,7 +3384,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3640,7 +3642,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3661,7 +3664,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 944f4fd41d..2a52852a72 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic.csl b/chicago-notes-bibliography-subsequent-ibid-classic.csl
index 15e5714dc3..2b323a4e5d 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic.csl
@@ -3356,7 +3356,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3386,7 +3387,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3643,7 +3645,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3664,7 +3667,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
index c437c56521..74ad0d5da3 100644
--- a/chicago-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-ibid.csl b/chicago-notes-bibliography-subsequent-ibid.csl
index cb9cebdc5f..f9a2376211 100644
--- a/chicago-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-notes-bibliography-subsequent-ibid.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-title-no-url.csl b/chicago-notes-bibliography-subsequent-title-no-url.csl
index 063793f287..726aa19cf0 100644
--- a/chicago-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-title-no-url.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography-subsequent-title.csl b/chicago-notes-bibliography-subsequent-title.csl
index e424750eda..cb7fa0d3ed 100644
--- a/chicago-notes-bibliography-subsequent-title.csl
+++ b/chicago-notes-bibliography-subsequent-title.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-bibliography.csl b/chicago-notes-bibliography.csl
index 17a6a604ba..c337b005fd 100644
--- a/chicago-notes-bibliography.csl
+++ b/chicago-notes-bibliography.csl
@@ -3359,7 +3359,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3389,7 +3390,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3646,7 +3648,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
@@ -3667,7 +3670,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-classic-archive-place-first-no-url.csl b/chicago-notes-classic-archive-place-first-no-url.csl
index da6c548605..00a23b0c0c 100644
--- a/chicago-notes-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-classic-archive-place-first-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-classic-archive-place-first.csl b/chicago-notes-classic-archive-place-first.csl
index 2cfc7e02d2..a84e3c1889 100644
--- a/chicago-notes-classic-archive-place-first.csl
+++ b/chicago-notes-classic-archive-place-first.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-classic-no-url.csl b/chicago-notes-classic-no-url.csl
index e1c6a4d5de..c91bdb5929 100644
--- a/chicago-notes-classic-no-url.csl
+++ b/chicago-notes-classic-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-classic.csl b/chicago-notes-classic.csl
index f6a7d196fb..28bf483e98 100644
--- a/chicago-notes-classic.csl
+++ b/chicago-notes-classic.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-no-url.csl b/chicago-notes-no-url.csl
index 0565761076..5d00a1de62 100644
--- a/chicago-notes-no-url.csl
+++ b/chicago-notes-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place-archive-place-first-no-url.csl b/chicago-notes-publisher-place-archive-place-first-no-url.csl
index 630e1f5a4a..afef96ab01 100644
--- a/chicago-notes-publisher-place-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-archive-place-first-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place-archive-place-first.csl b/chicago-notes-publisher-place-archive-place-first.csl
index 68c9455fa1..5fea13022d 100644
--- a/chicago-notes-publisher-place-archive-place-first.csl
+++ b/chicago-notes-publisher-place-archive-place-first.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
index 791f80368f..412a4de4e7 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
@@ -3104,7 +3104,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3246,7 +3247,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first.csl b/chicago-notes-publisher-place-label-page-archive-place-first.csl
index 6fda4835d9..57f437f449 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first.csl
@@ -3104,7 +3104,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3246,7 +3247,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place-no-url.csl b/chicago-notes-publisher-place-no-url.csl
index 33cae7c76a..755391ebe8 100644
--- a/chicago-notes-publisher-place-no-url.csl
+++ b/chicago-notes-publisher-place-no-url.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes-publisher-place.csl b/chicago-notes-publisher-place.csl
index 46c746e201..78a4696e5e 100644
--- a/chicago-notes-publisher-place.csl
+++ b/chicago-notes-publisher-place.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-notes.csl b/chicago-notes.csl
index c75ed0519a..4bd51e9e22 100644
--- a/chicago-notes.csl
+++ b/chicago-notes.csl
@@ -3109,7 +3109,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3251,7 +3252,8 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-17th-edition.csl b/chicago-shortened-notes-bibliography-17th-edition.csl
index 22af4fdc48..a349018ce5 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -2454,7 +2454,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2580,7 +2581,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-access-dates.csl b/chicago-shortened-notes-bibliography-access-dates.csl
index 81737ec2e2..8b20089609 100644
--- a/chicago-shortened-notes-bibliography-access-dates.csl
+++ b/chicago-shortened-notes-bibliography-access-dates.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
index b774d38ff6..8cce14531f 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-archive-place-first.csl b/chicago-shortened-notes-bibliography-archive-place-first.csl
index 17379231e8..15c6a4b8e6 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
index d6ccdf6aea..eb7f2cf076 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
index a34cd334bc..d83ef4fdae 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-classic-no-url.csl b/chicago-shortened-notes-bibliography-classic-no-url.csl
index ff45069ecd..5be5b2b022 100644
--- a/chicago-shortened-notes-bibliography-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-no-url.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-classic.csl b/chicago-shortened-notes-bibliography-classic.csl
index bae96d797e..8cf4fb0f64 100644
--- a/chicago-shortened-notes-bibliography-classic.csl
+++ b/chicago-shortened-notes-bibliography-classic.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-no-url.csl b/chicago-shortened-notes-bibliography-no-url.csl
index ee3bcee94f..44c2580b4b 100644
--- a/chicago-shortened-notes-bibliography-no-url.csl
+++ b/chicago-shortened-notes-bibliography-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
index 858bbf3958..de8804ffe3 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
index ecf61fe2ec..edf7f6cd32 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
index f42a486937..25051815e7 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
index 62072d8d26..c4e004bb3a 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -2454,7 +2454,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2580,7 +2581,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-author.csl b/chicago-shortened-notes-bibliography-subsequent-author.csl
index 2b618b1676..048b9646e1 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
index 190f71f1f9..b899a96183 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -2454,7 +2454,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2580,7 +2581,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
index ca30ca482c..fb86401e24 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
index 3eb936006b..5415e46194 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
@@ -2457,7 +2457,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2583,7 +2584,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
index 4958fb317b..f40f84d971 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid.csl b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
index 478d6dd021..5f7a36536e 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
index 7844720efa..4ee802b169 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography-subsequent-title.csl b/chicago-shortened-notes-bibliography-subsequent-title.csl
index ce39febc85..d105a51331 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/chicago-shortened-notes-bibliography.csl b/chicago-shortened-notes-bibliography.csl
index 6ecc0a32fe..870793076d 100644
--- a/chicago-shortened-notes-bibliography.csl
+++ b/chicago-shortened-notes-bibliography.csl
@@ -2461,7 +2461,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2587,7 +2588,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
diff --git a/taylor-and-francis-chicago-author-date.csl b/taylor-and-francis-chicago-author-date.csl
index 96a39140ae..becd019c77 100644
--- a/taylor-and-francis-chicago-author-date.csl
+++ b/taylor-and-francis-chicago-author-date.csl
@@ -2413,7 +2413,8 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if match="any" variable="available-date status"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2560,7 +2561,8 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume"/>
+        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
+        <else-if variable="issued"/>
         <else-if variable="available-date">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->

From 2855df14cfff3e695c7d3654f1d644ac713660ea Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Fri, 3 Apr 2026 13:27:47 +0100
Subject: [PATCH 5/5] Remove redundant `display-and-sort` (default)

---
 chicago-author-date-17th-edition.csl                            | 2 +-
 chicago-author-date-access-dates.csl                            | 2 +-
 chicago-author-date-archive-place-first-no-url.csl              | 2 +-
 chicago-author-date-archive-place-first.csl                     | 2 +-
 chicago-author-date-classic-no-url.csl                          | 2 +-
 chicago-author-date-classic.csl                                 | 2 +-
 chicago-author-date-no-url.csl                                  | 2 +-
 chicago-author-date.csl                                         | 2 +-
 chicago-in-text-full-no-url.csl                                 | 2 +-
 chicago-in-text-full.csl                                        | 2 +-
 chicago-in-text-shortened-author-no-url.csl                     | 2 +-
 chicago-in-text-shortened-author-title-no-url.csl               | 2 +-
 chicago-in-text-shortened-author-title.csl                      | 2 +-
 chicago-in-text-shortened-author.csl                            | 2 +-
 chicago-notes-archive-place-first-no-url.csl                    | 2 +-
 chicago-notes-archive-place-first.csl                           | 2 +-
 chicago-notes-bibliography-17th-edition.csl                     | 2 +-
 chicago-notes-bibliography-access-dates.csl                     | 2 +-
 chicago-notes-bibliography-annotated-abstract.csl               | 2 +-
 chicago-notes-bibliography-annotated.csl                        | 2 +-
 chicago-notes-bibliography-archive-place-first-no-url.csl       | 2 +-
 chicago-notes-bibliography-archive-place-first.csl              | 2 +-
 ...go-notes-bibliography-classic-archive-place-first-no-url.csl | 2 +-
 chicago-notes-bibliography-classic-archive-place-first.csl      | 2 +-
 chicago-notes-bibliography-classic-no-url.csl                   | 2 +-
 chicago-notes-bibliography-classic.csl                          | 2 +-
 chicago-notes-bibliography-no-url.csl                           | 2 +-
 chicago-notes-bibliography-subsequent-author-classic-no-url.csl | 2 +-
 chicago-notes-bibliography-subsequent-author-classic.csl        | 2 +-
 chicago-notes-bibliography-subsequent-author-no-url.csl         | 2 +-
 ...-notes-bibliography-subsequent-author-title-17th-edition.csl | 2 +-
 chicago-notes-bibliography-subsequent-author.csl                | 2 +-
 chicago-notes-bibliography-subsequent-ibid-17th-edition.csl     | 2 +-
 chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl   | 2 +-
 chicago-notes-bibliography-subsequent-ibid-classic.csl          | 2 +-
 chicago-notes-bibliography-subsequent-ibid-no-url.csl           | 2 +-
 chicago-notes-bibliography-subsequent-ibid.csl                  | 2 +-
 chicago-notes-bibliography-subsequent-title-no-url.csl          | 2 +-
 chicago-notes-bibliography-subsequent-title.csl                 | 2 +-
 chicago-notes-bibliography.csl                                  | 2 +-
 chicago-notes-classic-archive-place-first-no-url.csl            | 2 +-
 chicago-notes-classic-archive-place-first.csl                   | 2 +-
 chicago-notes-classic-no-url.csl                                | 2 +-
 chicago-notes-classic.csl                                       | 2 +-
 chicago-notes-no-url.csl                                        | 2 +-
 chicago-notes-publisher-place-archive-place-first-no-url.csl    | 2 +-
 chicago-notes-publisher-place-archive-place-first.csl           | 2 +-
 ...es-publisher-place-label-page-archive-place-first-no-url.csl | 2 +-
 ...ago-notes-publisher-place-label-page-archive-place-first.csl | 2 +-
 chicago-notes-publisher-place-no-url.csl                        | 2 +-
 chicago-notes-publisher-place.csl                               | 2 +-
 chicago-notes.csl                                               | 2 +-
 chicago-shortened-notes-bibliography-17th-edition.csl           | 2 +-
 chicago-shortened-notes-bibliography-access-dates.csl           | 2 +-
 ...-shortened-notes-bibliography-archive-place-first-no-url.csl | 2 +-
 chicago-shortened-notes-bibliography-archive-place-first.csl    | 2 +-
 ...ed-notes-bibliography-classic-archive-place-first-no-url.csl | 2 +-
 ...shortened-notes-bibliography-classic-archive-place-first.csl | 2 +-
 chicago-shortened-notes-bibliography-classic-no-url.csl         | 2 +-
 chicago-shortened-notes-bibliography-classic.csl                | 2 +-
 chicago-shortened-notes-bibliography-no-url.csl                 | 2 +-
 ...ened-notes-bibliography-subsequent-author-classic-no-url.csl | 2 +-
 ...o-shortened-notes-bibliography-subsequent-author-classic.csl | 2 +-
 ...go-shortened-notes-bibliography-subsequent-author-no-url.csl | 2 +-
 ...-notes-bibliography-subsequent-author-title-17th-edition.csl | 2 +-
 chicago-shortened-notes-bibliography-subsequent-author.csl      | 2 +-
 ...hortened-notes-bibliography-subsequent-ibid-17th-edition.csl | 2 +-
 ...rtened-notes-bibliography-subsequent-ibid-classic-no-url.csl | 2 +-
 ...ago-shortened-notes-bibliography-subsequent-ibid-classic.csl | 2 +-
 chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl | 2 +-
 chicago-shortened-notes-bibliography-subsequent-ibid.csl        | 2 +-
 ...ago-shortened-notes-bibliography-subsequent-title-no-url.csl | 2 +-
 chicago-shortened-notes-bibliography-subsequent-title.csl       | 2 +-
 chicago-shortened-notes-bibliography.csl                        | 2 +-
 taylor-and-francis-chicago-author-date.csl                      | 2 +-
 75 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index d95b496f32..f7eee44803 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 17th edition (author-date)</title>
diff --git a/chicago-author-date-access-dates.csl b/chicago-author-date-access-dates.csl
index f46736e401..e76ae8393a 100644
--- a/chicago-author-date-access-dates.csl
+++ b/chicago-author-date-access-dates.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, access dates)</title>
diff --git a/chicago-author-date-archive-place-first-no-url.csl b/chicago-author-date-archive-place-first-no-url.csl
index 5872bac4ce..bcc4f09141 100644
--- a/chicago-author-date-archive-place-first-no-url.csl
+++ b/chicago-author-date-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, archival references with place first, without URLs)</title>
diff --git a/chicago-author-date-archive-place-first.csl b/chicago-author-date-archive-place-first.csl
index 8580c82ac3..acbe3d9c53 100644
--- a/chicago-author-date-archive-place-first.csl
+++ b/chicago-author-date-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, archival references with place first)</title>
diff --git a/chicago-author-date-classic-no-url.csl b/chicago-author-date-classic-no-url.csl
index d35f26665f..ebc97a6209 100644
--- a/chicago-author-date-classic-no-url.csl
+++ b/chicago-author-date-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, classic variants, without URLs)</title>
diff --git a/chicago-author-date-classic.csl b/chicago-author-date-classic.csl
index 5344c39b3e..bea87c9a7f 100644
--- a/chicago-author-date-classic.csl
+++ b/chicago-author-date-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, classic variants)</title>
diff --git a/chicago-author-date-no-url.csl b/chicago-author-date-no-url.csl
index 9632039c0b..2f305cdff7 100644
--- a/chicago-author-date-no-url.csl
+++ b/chicago-author-date-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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, without URLs)</title>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index 921c5ea4bd..a6556a4a35 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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>
diff --git a/chicago-in-text-full-no-url.csl b/chicago-in-text-full-no-url.csl
index 4df1a76708..be03d0f6d3 100644
--- a/chicago-in-text-full-no-url.csl
+++ b/chicago-in-text-full-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text full citations, without URLs)</title>
diff --git a/chicago-in-text-full.csl b/chicago-in-text-full.csl
index 688c9ada7f..0ae54875ad 100644
--- a/chicago-in-text-full.csl
+++ b/chicago-in-text-full.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text full citations)</title>
diff --git a/chicago-in-text-shortened-author-no-url.csl b/chicago-in-text-shortened-author-no-url.csl
index 3f7bd12add..9d10f717ae 100644
--- a/chicago-in-text-shortened-author-no-url.csl
+++ b/chicago-in-text-shortened-author-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text shortened author-only citations, without URLs)</title>
diff --git a/chicago-in-text-shortened-author-title-no-url.csl b/chicago-in-text-shortened-author-title-no-url.csl
index 5258090adf..aade19706e 100644
--- a/chicago-in-text-shortened-author-title-no-url.csl
+++ b/chicago-in-text-shortened-author-title-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text shortened author-title citations, without URLs)</title>
diff --git a/chicago-in-text-shortened-author-title.csl b/chicago-in-text-shortened-author-title.csl
index 4c75c140cd..b8f3b466c2 100644
--- a/chicago-in-text-shortened-author-title.csl
+++ b/chicago-in-text-shortened-author-title.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text shortened author-title citations)</title>
diff --git a/chicago-in-text-shortened-author.csl b/chicago-in-text-shortened-author.csl
index 8f1d653329..3ec330a2f9 100644
--- a/chicago-in-text-shortened-author.csl
+++ b/chicago-in-text-shortened-author.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " 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 (in-text shortened author-only citations)</title>
diff --git a/chicago-notes-archive-place-first-no-url.csl b/chicago-notes-archive-place-first-no-url.csl
index dbdedce2c4..a7dc26637c 100644
--- a/chicago-notes-archive-place-first-no-url.csl
+++ b/chicago-notes-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-archive-place-first.csl b/chicago-notes-archive-place-first.csl
index 0f62894705..e2771eab8f 100644
--- a/chicago-notes-archive-place-first.csl
+++ b/chicago-notes-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, archival references with place first)</title>
diff --git a/chicago-notes-bibliography-17th-edition.csl b/chicago-notes-bibliography-17th-edition.csl
index 599fdd8609..6b4835bbb2 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (notes and bibliography)</title>
diff --git a/chicago-notes-bibliography-access-dates.csl b/chicago-notes-bibliography-access-dates.csl
index 7adb3cf218..10bd30abde 100644
--- a/chicago-notes-bibliography-access-dates.csl
+++ b/chicago-notes-bibliography-access-dates.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, access dates)</title>
diff --git a/chicago-notes-bibliography-annotated-abstract.csl b/chicago-notes-bibliography-annotated-abstract.csl
index ccb77995ae..ca29245637 100644
--- a/chicago-notes-bibliography-annotated-abstract.csl
+++ b/chicago-notes-bibliography-annotated-abstract.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and annotated bibliography with abstract)</title>
diff --git a/chicago-notes-bibliography-annotated.csl b/chicago-notes-bibliography-annotated.csl
index e7739aaf1b..30d0ee3cad 100644
--- a/chicago-notes-bibliography-annotated.csl
+++ b/chicago-notes-bibliography-annotated.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and annotated bibliography)</title>
diff --git a/chicago-notes-bibliography-archive-place-first-no-url.csl b/chicago-notes-bibliography-archive-place-first-no-url.csl
index 4ae6c372bb..6f91cff809 100644
--- a/chicago-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-bibliography-archive-place-first.csl b/chicago-notes-bibliography-archive-place-first.csl
index 4aa321b9dd..11cb286434 100644
--- a/chicago-notes-bibliography-archive-place-first.csl
+++ b/chicago-notes-bibliography-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, archival references with place first)</title>
diff --git a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
index baac799734..37898b739a 100644
--- a/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, classic variants, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-bibliography-classic-archive-place-first.csl b/chicago-notes-bibliography-classic-archive-place-first.csl
index cc90f34d79..68b8533331 100644
--- a/chicago-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-notes-bibliography-classic-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, classic variants, archival references with place first)</title>
diff --git a/chicago-notes-bibliography-classic-no-url.csl b/chicago-notes-bibliography-classic-no-url.csl
index f6ed5e2467..7aa14d82ae 100644
--- a/chicago-notes-bibliography-classic-no-url.csl
+++ b/chicago-notes-bibliography-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, classic variants, without URLs)</title>
diff --git a/chicago-notes-bibliography-classic.csl b/chicago-notes-bibliography-classic.csl
index 72f6f1730d..319d49a1e2 100644
--- a/chicago-notes-bibliography-classic.csl
+++ b/chicago-notes-bibliography-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, classic variants)</title>
diff --git a/chicago-notes-bibliography-no-url.csl b/chicago-notes-bibliography-no-url.csl
index f683312318..753ec8f774 100644
--- a/chicago-notes-bibliography-no-url.csl
+++ b/chicago-notes-bibliography-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
index afe1f58401..04c0619feb 100644
--- a/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent author-only citations, classic variants, without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-author-classic.csl b/chicago-notes-bibliography-subsequent-author-classic.csl
index e509aa6b37..3cafb3c8da 100644
--- a/chicago-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-notes-bibliography-subsequent-author-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent author-only citations, classic variants)</title>
diff --git a/chicago-notes-bibliography-subsequent-author-no-url.csl b/chicago-notes-bibliography-subsequent-author-no-url.csl
index 28c3b3c8e9..245c9e8347 100644
--- a/chicago-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-author-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent author-only citations, without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
index 7e4dd8cce9..f48ae68502 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (notes and bibliography, subsequent author-title)</title>
diff --git a/chicago-notes-bibliography-subsequent-author.csl b/chicago-notes-bibliography-subsequent-author.csl
index ea046b2a30..c3adca52d4 100644
--- a/chicago-notes-bibliography-subsequent-author.csl
+++ b/chicago-notes-bibliography-subsequent-author.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent author-only citations)</title>
diff --git a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
index ca25204cc2..458108f9fe 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (notes and bibliography, subsequent ibid.)</title>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
index 2a52852a72..0b051c7cb0 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent ibid., classic variants, without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-ibid-classic.csl b/chicago-notes-bibliography-subsequent-ibid-classic.csl
index 2b323a4e5d..ceee92d551 100644
--- a/chicago-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent ibid., classic variants)</title>
diff --git a/chicago-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
index 74ad0d5da3..51bd51b6a7 100644
--- a/chicago-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent ibid., without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-ibid.csl b/chicago-notes-bibliography-subsequent-ibid.csl
index f9a2376211..dac3da8f30 100644
--- a/chicago-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-notes-bibliography-subsequent-ibid.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent ibid.)</title>
diff --git a/chicago-notes-bibliography-subsequent-title-no-url.csl b/chicago-notes-bibliography-subsequent-title-no-url.csl
index 726aa19cf0..17e44143a0 100644
--- a/chicago-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-notes-bibliography-subsequent-title-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent title-only citations, without URLs)</title>
diff --git a/chicago-notes-bibliography-subsequent-title.csl b/chicago-notes-bibliography-subsequent-title.csl
index cb7fa0d3ed..590f4debea 100644
--- a/chicago-notes-bibliography-subsequent-title.csl
+++ b/chicago-notes-bibliography-subsequent-title.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography, subsequent title-only citations)</title>
diff --git a/chicago-notes-bibliography.csl b/chicago-notes-bibliography.csl
index c337b005fd..d1bea3e639 100644
--- a/chicago-notes-bibliography.csl
+++ b/chicago-notes-bibliography.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes and bibliography)</title>
diff --git a/chicago-notes-classic-archive-place-first-no-url.csl b/chicago-notes-classic-archive-place-first-no-url.csl
index 00a23b0c0c..139fc25be3 100644
--- a/chicago-notes-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-classic-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, classic variants, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-classic-archive-place-first.csl b/chicago-notes-classic-archive-place-first.csl
index a84e3c1889..d57646e624 100644
--- a/chicago-notes-classic-archive-place-first.csl
+++ b/chicago-notes-classic-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, classic variants, archival references with place first)</title>
diff --git a/chicago-notes-classic-no-url.csl b/chicago-notes-classic-no-url.csl
index c91bdb5929..db900d025d 100644
--- a/chicago-notes-classic-no-url.csl
+++ b/chicago-notes-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, classic variants, without URLs)</title>
diff --git a/chicago-notes-classic.csl b/chicago-notes-classic.csl
index 28bf483e98..4739d1240a 100644
--- a/chicago-notes-classic.csl
+++ b/chicago-notes-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, classic variants)</title>
diff --git a/chicago-notes-no-url.csl b/chicago-notes-no-url.csl
index 5d00a1de62..ff2db57f41 100644
--- a/chicago-notes-no-url.csl
+++ b/chicago-notes-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, without URLs)</title>
diff --git a/chicago-notes-publisher-place-archive-place-first-no-url.csl b/chicago-notes-publisher-place-archive-place-first-no-url.csl
index afef96ab01..cf046e5243 100644
--- a/chicago-notes-publisher-place-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-publisher-place-archive-place-first.csl b/chicago-notes-publisher-place-archive-place-first.csl
index 5fea13022d..7fb476d595 100644
--- a/chicago-notes-publisher-place-archive-place-first.csl
+++ b/chicago-notes-publisher-place-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher, archival references with place first)</title>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
index 412a4de4e7..7b120b2d28 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher, page abbreviations, archival references with place first, without URLs)</title>
diff --git a/chicago-notes-publisher-place-label-page-archive-place-first.csl b/chicago-notes-publisher-place-label-page-archive-place-first.csl
index 57f437f449..09557cf0ff 100644
--- a/chicago-notes-publisher-place-label-page-archive-place-first.csl
+++ b/chicago-notes-publisher-place-label-page-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher, page abbreviations, archival references with place first)</title>
diff --git a/chicago-notes-publisher-place-no-url.csl b/chicago-notes-publisher-place-no-url.csl
index 755391ebe8..2bbdcf44e5 100644
--- a/chicago-notes-publisher-place-no-url.csl
+++ b/chicago-notes-publisher-place-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher, without URLs)</title>
diff --git a/chicago-notes-publisher-place.csl b/chicago-notes-publisher-place.csl
index 78a4696e5e..144d5a70df 100644
--- a/chicago-notes-publisher-place.csl
+++ b/chicago-notes-publisher-place.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography, place of publication substituted for publisher)</title>
diff --git a/chicago-notes.csl b/chicago-notes.csl
index 4bd51e9e22..c61f317b9b 100644
--- a/chicago-notes.csl
+++ b/chicago-notes.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (notes without bibliography)</title>
diff --git a/chicago-shortened-notes-bibliography-17th-edition.csl b/chicago-shortened-notes-bibliography-17th-edition.csl
index a349018ce5..92fe088550 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (shortened notes and bibliography)</title>
diff --git a/chicago-shortened-notes-bibliography-access-dates.csl b/chicago-shortened-notes-bibliography-access-dates.csl
index 8b20089609..41e1d3aea3 100644
--- a/chicago-shortened-notes-bibliography-access-dates.csl
+++ b/chicago-shortened-notes-bibliography-access-dates.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, access dates)</title>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
index 8cce14531f..570f1c0916 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, archival references with place first, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-archive-place-first.csl b/chicago-shortened-notes-bibliography-archive-place-first.csl
index 15c6a4b8e6..43d06955c8 100644
--- a/chicago-shortened-notes-bibliography-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, archival references with place first)</title>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
index eb7f2cf076..0bee389bfd 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, classic variants, archival references with place first, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
index d83ef4fdae..3f9b91d5df 100644
--- a/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
+++ b/chicago-shortened-notes-bibliography-classic-archive-place-first.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, classic variants, archival references with place first)</title>
diff --git a/chicago-shortened-notes-bibliography-classic-no-url.csl b/chicago-shortened-notes-bibliography-classic-no-url.csl
index 5be5b2b022..90cc51ca3e 100644
--- a/chicago-shortened-notes-bibliography-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, classic variants, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-classic.csl b/chicago-shortened-notes-bibliography-classic.csl
index 8cf4fb0f64..b345c06471 100644
--- a/chicago-shortened-notes-bibliography-classic.csl
+++ b/chicago-shortened-notes-bibliography-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, classic variants)</title>
diff --git a/chicago-shortened-notes-bibliography-no-url.csl b/chicago-shortened-notes-bibliography-no-url.csl
index 44c2580b4b..bfa6224770 100644
--- a/chicago-shortened-notes-bibliography-no-url.csl
+++ b/chicago-shortened-notes-bibliography-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
index de8804ffe3..ba1f9ce3f6 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent author-only citations, classic variants, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
index edf7f6cd32..e86e0974dd 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent author-only citations, classic variants)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
index 25051815e7..6b110c9fdd 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent author-only citations, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
index c4e004bb3a..8cacc68f53 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (shortened notes and bibliography, subsequent author-title)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-author.csl b/chicago-shortened-notes-bibliography-subsequent-author.csl
index 048b9646e1..15d089f347 100644
--- a/chicago-shortened-notes-bibliography-subsequent-author.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-author.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent author-only citations)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
index b899a96183..b4917d8839 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 17th edition (shortened notes and bibliography, subsequent ibid.)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
index fb86401e24..173c3ce2c6 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent ibid., classic variants, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
index 5415e46194..89b2c53562 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-classic.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent ibid., classic variants)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
index f40f84d971..0f80473c4e 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent ibid., without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-ibid.csl b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
index 5f7a36536e..2929f0441b 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent ibid.)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
index 4ee802b169..82e64d2774 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title-no-url.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent title-only citations, without URLs)</title>
diff --git a/chicago-shortened-notes-bibliography-subsequent-title.csl b/chicago-shortened-notes-bibliography-subsequent-title.csl
index d105a51331..a155960236 100644
--- a/chicago-shortened-notes-bibliography-subsequent-title.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-title.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography, subsequent title-only citations)</title>
diff --git a/chicago-shortened-notes-bibliography.csl b/chicago-shortened-notes-bibliography.csl
index 870793076d..538655f65c 100644
--- a/chicago-shortened-notes-bibliography.csl
+++ b/chicago-shortened-notes-bibliography.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " 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 (shortened notes and bibliography)</title>
diff --git a/taylor-and-francis-chicago-author-date.csl b/taylor-and-francis-chicago-author-date.csl
index becd019c77..cca804731f 100644
--- a/taylor-and-francis-chicago-author-date.csl
+++ b/taylor-and-francis-chicago-author-date.csl
@@ -1,5 +1,5 @@
 <?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="expanded" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" and="text" class="in-text" page-range-format="expanded" 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>Taylor &amp; Francis Journals Standard Reference Style Guide: Chicago author-date version 2.0</title>