diff --git a/chicago-author-date-17th-edition.csl b/chicago-author-date-17th-edition.csl
index 42d6a9d1c0..f7eee44803 100644
--- a/chicago-author-date-17th-edition.csl
+++ b/chicago-author-date-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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>
@@ -2424,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>
@@ -2571,14 +2577,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3230,7 +3238,16 @@
       <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 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>
@@ -4175,7 +4192,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3219,7 +3227,16 @@
       <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 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>
@@ -4131,7 +4148,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3219,7 +3227,16 @@
       <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 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>
@@ -4108,7 +4125,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3219,7 +3227,16 @@
       <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 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>
@@ -4118,7 +4135,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3213,7 +3221,16 @@
       <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 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>
@@ -4116,7 +4133,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3213,7 +3221,16 @@
       <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 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>
@@ -4126,7 +4143,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3219,7 +3227,16 @@
       <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 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>
@@ -4122,7 +4139,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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>
@@ -2407,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>
@@ -2554,14 +2560,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3219,7 +3227,16 @@
       <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 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>
@@ -4132,7 +4149,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-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..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 94910026be..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 b442fc2f75..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>
@@ -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">
@@ -2394,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>
@@ -2520,14 +2517,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3121,6 +3120,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 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 6067e30d73..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 c120fcb6f7..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 c8e0d4d8e4..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>
@@ -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">
@@ -2394,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>
@@ -2520,14 +2517,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3121,6 +3120,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 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-archive-place-first-no-url.csl b/chicago-notes-archive-place-first-no-url.csl
index 9f9abfba30..a7dc26637c 100644
--- a/chicago-notes-archive-place-first-no-url.csl
+++ b/chicago-notes-archive-place-first-no-url.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3113,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>
@@ -3255,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3486,7 +3485,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..e2771eab8f 100644
--- a/chicago-notes-archive-place-first.csl
+++ b/chicago-notes-archive-place-first.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3113,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>
@@ -3255,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3486,7 +3485,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..6b4835bbb2 100644
--- a/chicago-notes-bibliography-17th-edition.csl
+++ b/chicago-notes-bibliography-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3357,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>
@@ -3387,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>
@@ -3644,14 +3642,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3664,14 +3664,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4153,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"/>
@@ -4706,6 +4708,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 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 90d8fbe53a..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>
@@ -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">
@@ -3364,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>
@@ -3394,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>
@@ -3651,14 +3649,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3671,14 +3671,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4160,7 +4162,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 +4717,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 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 bc80f19c2d..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>
@@ -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">
@@ -3364,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>
@@ -3394,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>
@@ -3651,14 +3649,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3671,14 +3671,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4160,7 +4162,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 +4717,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 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 9e390a2992..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>
@@ -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">
@@ -3364,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>
@@ -3394,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>
@@ -3651,14 +3649,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3671,14 +3671,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4160,7 +4162,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 +4717,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 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 afc13d0b07..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 9eeee74acf..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 8e6d8989b2..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 53ca0bc558..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 85ef047f2f..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 33dae70e9e..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 2a38e9ae89..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 69a2e96c73..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 3345c27c07..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 770698feff..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 8c90b2a1f1..f48ae68502 100644
--- a/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-author-title-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3357,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>
@@ -3387,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>
@@ -3644,14 +3642,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3664,14 +3664,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4153,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"/>
@@ -4706,6 +4708,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 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 61a7f75e48..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 c038c0f741..458108f9fe 100644
--- a/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3357,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>
@@ -3387,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>
@@ -3644,14 +3642,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3664,14 +3664,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4153,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"/>
@@ -4706,6 +4708,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 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 8137f6bfde..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 fe76c41aab..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>
@@ -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">
@@ -3360,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>
@@ -3390,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>
@@ -3647,14 +3645,16 @@
   <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 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) -->
             <!-- 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 +3667,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4156,7 +4158,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 +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 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 1cf28887fe..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 6a057b94cd..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 3c808b0724..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 17531e7aab..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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 cfd010e1e7..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>
@@ -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">
@@ -3363,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>
@@ -3393,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>
@@ -3650,14 +3648,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3670,14 +3670,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -4159,7 +4161,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 +4716,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 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-classic-archive-place-first-no-url.csl b/chicago-notes-classic-archive-place-first-no-url.csl
index 9748823167..139fc25be3 100644
--- a/chicago-notes-classic-archive-place-first-no-url.csl
+++ b/chicago-notes-classic-archive-place-first-no-url.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..d57646e624 100644
--- a/chicago-notes-classic-archive-place-first.csl
+++ b/chicago-notes-classic-archive-place-first.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..db900d025d 100644
--- a/chicago-notes-classic-no-url.csl
+++ b/chicago-notes-classic-no-url.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..4739d1240a 100644
--- a/chicago-notes-classic.csl
+++ b/chicago-notes-classic.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..ff2db57f41 100644
--- a/chicago-notes-no-url.csl
+++ b/chicago-notes-no-url.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3119,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>
@@ -3261,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3492,8 +3485,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..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,9 +1,9 @@
 <?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>
-    <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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..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>
@@ -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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..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>
@@ -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">
@@ -3114,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>
@@ -3256,14 +3247,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3487,8 +3480,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..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>
@@ -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">
@@ -3114,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>
@@ -3256,14 +3247,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3487,8 +3480,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..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>
@@ -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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..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>
@@ -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">
@@ -3115,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>
@@ -3257,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3488,8 +3485,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..c61f317b9b 100644
--- a/chicago-notes.csl
+++ b/chicago-notes.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -3119,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>
@@ -3261,14 +3252,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3492,7 +3485,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..92fe088550 100644
--- a/chicago-shortened-notes-bibliography-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -2458,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>
@@ -2584,14 +2581,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3282,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 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 7572226abb..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 a87918842f..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 b0fb81ac06..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 52c82922de..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 8752d617b9..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 d8a9e08a66..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 2ddda7bbcf..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 d047abd4d8..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 7542cc1b84..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 09039a3dcf..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 bed0e6a9a8..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 7da6bfd385..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,9 +1,9 @@
 <?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>
-    <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">
@@ -2458,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>
@@ -2584,14 +2581,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3282,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 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 ae6ffe5ef9..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 80bbb44400..b4917d8839 100644
--- a/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
+++ b/chicago-shortened-notes-bibliography-subsequent-ibid-17th-edition.csl
@@ -1,9 +1,9 @@
 <?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>
-    <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">
@@ -2458,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>
@@ -2584,14 +2581,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3282,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 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 ed8727ebe3..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 a7ddaf7c18..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>
@@ -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">
@@ -2461,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>
@@ -2587,14 +2584,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3285,6 +3284,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 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 dcc0292b43..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 c87b3c6f32..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 eb0164dc79..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 cfcd1f1c5d..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 0ca5f5648f..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>
@@ -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">
@@ -2465,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>
@@ -2591,14 +2588,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3291,6 +3290,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 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 341dca1ad2..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>
@@ -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>
@@ -2408,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>
@@ -2555,14 +2561,16 @@
   <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 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) -->
             <!-- 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"/>
@@ -3214,7 +3222,16 @@
       <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 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>
@@ -4159,7 +4176,17 @@
           <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="publisher"/>
+              <else-if type="webpage" variable="container-title container-title-short">
+                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
+              </else-if>
+            </choose>
+          </group>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>