diff --git a/american-society-for-horticultural-science.csl b/american-society-for-horticultural-science.csl
index 833064cd28b..d27978f5e36 100644
--- a/american-society-for-horticultural-science.csl
+++ b/american-society-for-horticultural-science.csl
@@ -5,214 +5,196 @@
     <title-short>ASHS</title-short>
     <id>http://www.zotero.org/styles/american-society-for-horticultural-science</id>
     <link href="http://www.zotero.org/styles/american-society-for-horticultural-science" rel="self"/>
-    <link href="http://www.zotero.org/styles/revista-de-biologia-tropical" rel="template"/>
-    <link href="https://aggie-horticulture.tamu.edu/syllabi/423/ASHS%20Publ%20Manual%202002.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/springer-basic-author-date" rel="template"/>
+    <link href="https://cdn.ymaws.com/ashs.org/resource/resmgr/publications/ashspubsstylemanualweb.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <category field="botany"/>
-    <updated>2022-06-14T08:25:19+00:00</updated>
+    <updated>2023-05-12T09:18:16+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>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <label variable="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="container">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group delimiter=": ">
-          <text term="in" text-case="capitalize-first" font-style="normal" prefix=". " suffix=" "/>
-          <names variable="editor translator" delimiter=", " suffix=". ">
-            <name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
-            <label form="short" prefix=" (" suffix=")"/>
-          </names>
-        </group>
-        <group delimiter=", ">
-          <text variable="container-title" text-case="title"/>
-          <text variable="collection-title" text-case="title"/>
-        </group>
-      </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group prefix=", " delimiter=", ">
-          <text variable="container-title"/>
-          <text variable="collection-title"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=", " prefix=". ">
-          <text variable="container-title" form="short"/>
-          <text variable="collection-title"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
+  <locale>
+    <terms>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="author-short">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <name form="short" and="text"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text macro="title"/>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-      <et-al font-style="italic"/>
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <choose>
-          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-            <text variable="title" form="short" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" form="short" quotes="true"/>
-          </else>
-        </choose>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-  <macro name="access">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-  </macro>
-  <macro name="title">
+  <macro name="edition">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <group delimiter=", ">
-          <text variable="title"/>
-          <group>
-            <label variable="page" form="short" suffix=" " plural="never"/>
-            <text variable="page"/>
-          </group>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
-        <text variable="title"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="title">
     <choose>
-      <if type="report thesis" match="any">
+      <if type="book">
         <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+          <text variable="title"/>
+          <text macro="edition"/>
         </group>
       </if>
       <else>
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
-    <choose>
-      <if variable="event">
-        <text term="presented at" text-case="capitalize-first" suffix=" "/>
-        <text variable="event"/>
-      </if>
-    </choose>
+  <macro name="year-parenth">
+    <date date-parts="year" form="numeric" variable="issued"/>
   </macro>
-  <macro name="issued">
+  <macro name="access">
     <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+      <if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else-if variable="accessed">
-        <choose>
-          <if type="webpage">
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text term="accessed"/>
             <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" form="short" suffix=" " strip-periods="true"/>
               <date-part name="year"/>
             </date>
-          </if>
-          <else>
-            <text term="no date" form="short"/>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=":" prefix=" ">
-          <text variable="volume"/>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-        <group delimiter=", " prefix=". ">
-          <text macro="edition"/>
-          <text macro="event"/>
-          <text macro="publisher"/>
-          <group>
-            <text variable="genre"/>
-            <text variable="number" prefix=" No. "/>
           </group>
         </group>
       </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <text macro="publisher"/>
-        </group>
-      </else-if>
-      <else-if type="webpage post post-weblog" match="any">
-        <group delimiter=". " prefix=". ">
-          <date form="text" date-parts="year-month-day" variable="issued"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
     <sort>
+      <key variable="issued"/>
       <key macro="author"/>
-      <key macro="issued"/>
     </sort>
-    <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=", ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
         <text macro="author-short"/>
-        <text macro="issued"/>
+        <text macro="year"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+  <bibliography hanging-indent="true">
     <sort>
       <key macro="author"/>
-      <key macro="issued" sort="ascending"/>
+      <key variable="author" sort="ascending"/>
     </sort>
-    <layout>
-      <group suffix=".">
+    <layout suffix=".">
+      <group delimiter=". ">
         <text macro="author"/>
-        <text macro="issued" prefix=". " suffix=". "/>
-        <group>
-          <text macro="title"/>
-          <text macro="container"/>
-        </group>
-        <text macro="locators"/>
+        <text macro="year-parenth"/>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <label plural="never" strip-periods="true" variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
+              </group>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <names variable="editor">
+                  <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                  <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+                </names>
+              </group>
+              <text variable="container-title"/>
+              <text macro="edition"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="article-journal">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=". ">
+                <text variable="container-title" form="short" strip-periods="true"/>
+                <group delimiter=":" prefix=" ">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page" prefix=":"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="container-title" form="short"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text macro="title"/>
+                <text variable="genre" text-case="capitalize-first" prefix="(" suffix=")"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text variable="container-title" form="short"/>
+              <group delimiter=":">
+                <text variable="volume"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+        <text macro="access"/>
       </group>
     </layout>
   </bibliography>
diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index 70e5db1f6ab..1bfd4c29f80 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -1096,14 +1096,8 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
-      </else-if>
       <else>
-        <text value="Original work published"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 82ad9ae3084..201c16c1ce4 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -1095,14 +1095,8 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
-      </else-if>
       <else>
-        <text value="Original work published"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 9ecfac24bc2..15d4d148658 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -501,9 +501,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1598,7 +1595,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1864,7 +1861,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1876,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/apa-cv.csl b/apa-cv.csl
index 0e9f361e217..8d36a8a8d21 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -446,9 +446,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <!-- APA has two description elements following the title:
         title (parenthetical) [bracketed]  -->
   <macro name="title-and-descriptions">
@@ -1345,7 +1342,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1597,7 +1594,7 @@
   <citation et-al-min="21" et-al-use-first="19" et-al-use-last="true">
     <sort>
       <key macro="date-sort-group" sort="descending"/>
-      <key macro="date-sort-date" sort="descending"/>
+      <key macro="date-bib" sort="descending"/>
       <key variable="status"/>
       <key macro="author-bib"/>
       <key macro="title"/>
@@ -1636,7 +1633,7 @@
   <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
       <key macro="date-sort-group" sort="descending"/>
-      <key macro="date-sort-date" sort="descending"/>
+      <key macro="date-bib" sort="descending"/>
       <key variable="status"/>
       <key macro="author-bib"/>
       <key macro="title"/>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 777cc6d13a6..35af4cce24f 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -501,9 +501,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1598,7 +1595,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1864,7 +1861,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1876,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 5c314996729..d3dffbf8ff1 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -1102,14 +1102,8 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
-      </else-if>
       <else>
-        <text value="Original work published"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-no-initials.csl b/apa-no-initials.csl
index b844044aa18..74fe1e3dfc0 100644
--- a/apa-no-initials.csl
+++ b/apa-no-initials.csl
@@ -501,9 +501,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1598,7 +1595,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1864,7 +1861,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1876,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index d9134ea1435..948b03600e0 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -304,9 +304,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1401,7 +1398,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index 42b9b90fa01..2a2d81cbde2 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -304,9 +304,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1401,7 +1398,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 2ede590912d..f25d36c0971 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -1096,14 +1096,8 @@
     <!--This should be localized -->
     <choose>
       <if type="bill legal_case legislation" match="any"/>
-      <else-if type="interview motion_picture song" match="any">
-        <text value="Original work recorded"/>
-      </else-if>
-      <else-if type="broadcast">
-        <text value="Original work broadcast"/>
-      </else-if>
       <else>
-        <text value="Original work published"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index be5cd95adbd..8765b40f36e 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -501,9 +501,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1598,7 +1595,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1864,7 +1861,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1876,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 9524f1928d5..1e5430b81ba 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -501,9 +501,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1598,7 +1595,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1864,7 +1861,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1876,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/apa.csl b/apa.csl
index e8cd9ae64f2..0d11d0702e8 100644
--- a/apa.csl
+++ b/apa.csl
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2022-01-31T14:30:00+00:00</updated>
+    <updated>2022-10-02T20:08:41+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -502,9 +502,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1599,7 +1596,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1865,7 +1862,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1880,7 +1877,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/begell-house-apa.csl b/begell-house-apa.csl
index cd632d19ef4..425f7d514fb 100644
--- a/begell-house-apa.csl
+++ b/begell-house-apa.csl
@@ -41,8 +41,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -110,7 +110,7 @@
       </if>
       <else-if type="interview personal_communication">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -191,7 +191,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -224,9 +224,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -252,7 +249,7 @@
                 <if type="interview personal_communication">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -997,7 +994,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1298,7 +1295,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1571,7 +1568,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1586,7 +1583,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/bio-protocol.csl b/bio-protocol.csl
index 83048b66b4e..32f36b13174 100644
--- a/bio-protocol.csl
+++ b/bio-protocol.csl
@@ -220,9 +220,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1359,7 +1356,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1374,7 +1371,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/citation-compass-apa-note.csl b/citation-compass-apa-note.csl
index 5844fa346ad..4e379fb20b4 100644
--- a/citation-compass-apa-note.csl
+++ b/citation-compass-apa-note.csl
@@ -54,8 +54,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -123,7 +123,7 @@
       </if>
       <else-if type="interview personal_communication">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -204,7 +204,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -237,9 +237,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -265,7 +262,7 @@
                 <if type="interview personal_communication">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1030,7 +1027,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1310,7 +1307,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1580,7 +1577,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout delimiter="; ">
@@ -1597,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/european-review-of-agricultural-economics.csl b/european-review-of-agricultural-economics.csl
index 80d5b9700d1..9945751671f 100644
--- a/european-review-of-agricultural-economics.csl
+++ b/european-review-of-agricultural-economics.csl
@@ -214,9 +214,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1227,7 +1224,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1242,7 +1239,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/fundamental-and-applied-limnology.csl b/fundamental-and-applied-limnology.csl
index 8777a232882..de3f1c499c8 100644
--- a/fundamental-and-applied-limnology.csl
+++ b/fundamental-and-applied-limnology.csl
@@ -47,8 +47,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -116,7 +116,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -197,7 +197,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -230,9 +230,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -258,7 +255,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1023,7 +1020,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1303,7 +1300,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1576,7 +1573,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1593,7 +1590,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/harvard-university-of-the-west-of-england.csl b/harvard-university-of-the-west-of-england.csl
index e5bdfcb075c..408d51fd9bf 100644
--- a/harvard-university-of-the-west-of-england.csl
+++ b/harvard-university-of-the-west-of-england.csl
@@ -12,13 +12,18 @@
     </contributor>
     <category citation-format="author-date"/>
     <summary>Harvard author-date style updated for University of the West of England (UWE) (et-al format updated to comply with UWE Harvard Referencing</summary>
-    <updated>2022-04-10T15:09:45+00:00</updated>
+    <updated>2023-05-02T13:01:26+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
   <macro name="editor">
     <names delimiter=", " variable="editor">
       <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" suffix=")" prefix=" ("/>
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="author">
@@ -42,29 +47,18 @@
     </names>
   </macro>
   <macro name="available-from-access">
-    <choose>
-      <if match="any" variable="URL">
-        <group>
-          <text value="Available from: "/>
-          <choose>
-            <if variable="URL">
-              <text variable="URL"/>
-            </if>
-            <else>
-              <text variable="URL"/>
-            </else>
-          </choose>
-          <group suffix="]" prefix=" [">
-            <text suffix=" " text-case="capitalize-first" term="accessed"/>
-            <date variable="accessed">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-        </group>
-      </if>
-    </choose>
+    <group delimiter=": ">
+      <text term="available at" text-case="capitalize-first"/>
+      <text variable="URL"/>
+    </group>
+    <group suffix="]" prefix=" [">
+      <text suffix=" " text-case="capitalize-first" term="accessed"/>
+      <date variable="accessed">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
   </macro>
   <macro name="italicised-title">
     <text variable="title" font-style="italic"/>
@@ -98,12 +92,10 @@
     </choose>
   </macro>
   <macro name="pages">
-    <choose>
-      <if type="article-journal" match="any">
-        <label text-case="lowercase" variable="page" form="short" plural="contextual"/>
-      </if>
-    </choose>
-    <text variable="page"/>
+    <group delimiter=" ">
+      <label text-case="lowercase" variable="page" form="short" plural="contextual"/>
+      <text variable="page"/>
+    </group>
   </macro>
   <macro name="medium-online">
     <choose>
@@ -113,7 +105,7 @@
       <else>
         <choose>
           <if match="any" variable="DOI URL">
-            <text value="[online]. "/>
+            <text value="[online]"/>
           </if>
         </choose>
       </else>
@@ -280,7 +272,7 @@
       <key macro="author"/>
       <key variable="title"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <text macro="author" font-style="normal"/>
       <text macro="year-date-bibliography" prefix=" (" suffix=")"/>
       <choose>
@@ -310,10 +302,10 @@
       <text macro="translator" prefix=" "/>
       <choose>
         <if type="chapter" match="any">
-          <text term="in" text-case="capitalize-first" suffix=":"/>
+          <text term="in" text-case="capitalize-first" prefix=". " suffix=":"/>
         </if>
         <else-if type="paper-conference" match="all" variable="container-title">
-          <text term="in" text-case="capitalize-first" suffix=": "/>
+          <text term="in" text-case="capitalize-first" prefix=". " suffix=": "/>
         </else-if>
       </choose>
       <choose>
@@ -321,9 +313,9 @@
           <text macro="editor" prefix=" "/>
         </if>
       </choose>
-      <group delimiter=" for " suffix=".">
+      <group delimiter=" for ">
         <text macro="interviewer" prefix=" "/>
-        <text macro="container-title" prefix=" " suffix="."/>
+        <text macro="container-title" prefix=" "/>
       </group>
       <text macro="collection-title"/>
       <text macro="series-episode"/>
@@ -331,7 +323,7 @@
       <text macro="genre"/>
       <text macro="recipient" prefix=" " suffix=","/>
       <text macro="broadcast-details" prefix=" "/>
-      <text macro="day-month"/>
+      <text macro="day-month" prefix=". "/>
       <text macro="medium-online" prefix=" "/>
       <group>
         <text macro="event-name"/>
@@ -344,19 +336,25 @@
       </group>
       <choose>
         <if type="broadcast interview" match="none">
-          <group delimiter=", " prefix=" " suffix=".">
+          <group delimiter=", " prefix=". " suffix=".">
             <group>
               <text macro="volume-number" prefix=" "/>
               <text macro="issue-number" prefix=" "/>
             </group>
-            <text variable="publisher-place"/>
-            <text variable="publisher" prefix=" "/>
+            <choose>
+              <if type="book chapter paper-conference report thesis" match="any">
+                <group delimiter=", ">
+                  <text variable="publisher-place"/>
+                  <text variable="publisher" prefix=" "/>
+                </group>
+              </if>
+            </choose>
             <text macro="pages" prefix=" "/>
             <text macro="graph-or-figure" prefix=" " suffix="."/>
           </group>
         </if>
       </choose>
-      <text suffix="." prefix=" " macro="available-from-access"/>
+      <text macro="available-from-access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/norsk-apa-manual-note.csl b/norsk-apa-manual-note.csl
index fe4cddf45ef..187fcb5d146 100644
--- a/norsk-apa-manual-note.csl
+++ b/norsk-apa-manual-note.csl
@@ -28,8 +28,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -97,7 +97,7 @@
       </if>
       <else-if type="interview personal_communication">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -178,7 +178,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -211,9 +211,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -239,7 +236,7 @@
                 <if type="interview personal_communication">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1004,7 +1001,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1284,7 +1281,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1554,7 +1551,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout delimiter="; ">
@@ -1571,7 +1568,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/norsk-apa-manual.csl b/norsk-apa-manual.csl
index cbfec7058ed..fffa47855ae 100644
--- a/norsk-apa-manual.csl
+++ b/norsk-apa-manual.csl
@@ -56,8 +56,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -125,7 +125,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -206,7 +206,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -239,9 +239,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -267,7 +264,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1032,7 +1029,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1312,7 +1309,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1585,7 +1582,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1600,7 +1597,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/organization-studies.csl b/organization-studies.csl
index 912345484b3..13a9e79bff9 100644
--- a/organization-studies.csl
+++ b/organization-studies.csl
@@ -211,23 +211,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <choose>
-      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-        <date variable="issued" form="numeric"/>
-      </if>
-      <else-if type="paper-conference">
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <date variable="issued" form="numeric"/>
-          </if>
-        </choose>
-      </else-if>
-      <else>
-        <date variable="issued" form="numeric"/>
-      </else>
-    </choose>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1468,7 +1451,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1483,7 +1466,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl b/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
index e65048a4e50..09439bf9fb7 100644
--- a/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
+++ b/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
@@ -38,8 +38,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -107,7 +107,7 @@
       </if>
       <else-if type="interview personal_communication">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -188,7 +188,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -221,9 +221,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -249,7 +246,7 @@
                 <if type="interview personal_communication">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1014,7 +1011,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1317,7 +1314,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1590,7 +1587,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1605,7 +1602,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/the-accounting-review.csl b/the-accounting-review.csl
index 64133cc8699..de71d02fccb 100644
--- a/the-accounting-review.csl
+++ b/the-accounting-review.csl
@@ -395,7 +395,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true">
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
diff --git a/ucl-university-college-apa.csl b/ucl-university-college-apa.csl
index 7f514e6fbfb..532675eba82 100644
--- a/ucl-university-college-apa.csl
+++ b/ucl-university-college-apa.csl
@@ -30,8 +30,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -99,7 +99,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -180,7 +180,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -213,9 +213,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -241,7 +238,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1006,7 +1003,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1286,7 +1283,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
@@ -1566,7 +1563,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1582,7 +1579,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/united-states-international-trade-commission.csl b/united-states-international-trade-commission.csl
index 142bbf5aefa..f63961767b4 100644
--- a/united-states-international-trade-commission.csl
+++ b/united-states-international-trade-commission.csl
@@ -26,12 +26,12 @@
     </contributor>
     <contributor>
       <name>Brian Rose</name>
-      <email>brian.rose@usitc.gov</email>
+      <email>Brian.Rose@usitc.gov</email>
     </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>A bibliographical style file for the United States International Trade Commission</summary>
-    <updated>2023-04-04T12:17:26+00:00</updated>
+    <updated>2023-05-10T12:30:45+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -154,11 +154,18 @@
           </choose>
         </else-if>
         <else-if type="broadcast motion_picture" match="any">
-          <names variable="director"/>
+          <names variable="director">
+            <name form="short" delimiter=", " and="text" sort-separator=" "/>
+          </names>
           <text variable="volume"/>
         </else-if>
+        <else-if type="speech" match="any">
+          <names variable="author contributor" delimiter=", ">
+            <name/>
+          </names>
+        </else-if>
         <else>
-          <names variable="author">
+          <names variable="author contributor">
             <name form="short" and="text" sort-separator=""/>
             <label form="short" prefix=", "/>
             <substitute>
@@ -221,13 +228,17 @@
           </choose>
         </if>
         <else-if type="motion_picture" match="any">
-          <names variable="director"/>
+          <names variable="director">
+            <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+          </names>
         </else-if>
         <else-if type="broadcast" match="any">
-          <names variable="director"/>
+          <names variable="director">
+            <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+          </names>
         </else-if>
         <else>
-          <names variable="author">
+          <names variable="author contributor">
             <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
             <substitute>
               <text macro="editor"/>
@@ -256,8 +267,7 @@
   </macro>
   <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
+      <name prefix="by " and="text"/>
     </names>
   </macro>
   <macro name="interviewer">
@@ -304,12 +314,12 @@
           <else-if type="report" match="any">
             <text variable="title" form="short" text-case="title" font-style="italic"/>
           </else-if>
-          <else-if type="software" match="any">
-            <text variable="title" form="short" text-case="title"/>
+          <else-if type="software dataset" match="any">
+            <text variable="title" form="short"/>
           </else-if>
           <else-if type="speech" match="any"/>
           <else-if type="hearing" match="any">
-            <text variable="title" form="short" text-case="title"/>
+            <text variable="title" form="short"/>
           </else-if>
           <else>
             <text variable="title" form="short" text-case="title" quotes="true"/>
@@ -320,11 +330,23 @@
         <text variable="title" form="short"/>
       </else-if>
       <else-if type="book graphic map song" match="any">
-        <text variable="title" form="short" text-case="title" font-style="italic"/>
-        <group delimiter=" " prefix=", ">
-          <text term="version"/>
-          <text variable="version"/>
-        </group>
+        <choose>
+          <if match="any" variable="version">
+            <group delimiter=" " prefix=", ">
+              <text term="version"/>
+              <text variable="version"/>
+            </group>
+            <text variable="title" form="short" text-case="title" font-style="italic"/>
+          </if>
+          <else-if match="any" variable="volume">
+            <group delimiter="; ">
+              <text variable="volume" font-style="italic"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="title" form="short" font-style="italic"/>
+          </else>
+        </choose>
       </else-if>
       <else-if type="interview patent" match="any">
         <group delimiter=" ">
@@ -357,11 +379,11 @@
       <else-if type="legal_case" match="any">
         <text variable="title" form="short" font-style="italic"/>
       </else-if>
-      <else-if type="software" match="any">
-        <text variable="title" form="short" text-case="title"/>
+      <else-if type="software personal_communication dataset" match="any">
+        <text variable="title" form="short"/>
       </else-if>
       <else-if type="speech" match="any">
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="false"/>
         <date form="text" variable="issued" prefix=", "/>
       </else-if>
       <else>
@@ -380,11 +402,21 @@
           </choose>
         </if>
         <else-if type="book graphic song" match="any">
-          <text variable="title" text-case="title" quotes="false" font-style="italic"/>
-          <group prefix=" (" suffix=")" delimiter=" ">
-            <text term="version"/>
-            <text variable="version"/>
-          </group>
+          <choose>
+            <if match="any" variable="volume">
+              <group delimiter="; ">
+                <text variable="title" font-style="italic"/>
+                <text variable="volume" font-style="italic"/>
+              </group>
+            </if>
+            <else>
+              <text variable="title" text-case="title" quotes="false" font-style="italic"/>
+              <group prefix=" (" suffix=")" delimiter=" ">
+                <text term="version"/>
+                <text variable="version"/>
+              </group>
+            </else>
+          </choose>
         </else-if>
         <else-if variable="reviewed-author">
           <group delimiter=", ">
@@ -424,7 +456,7 @@
         <else-if type="legal_case" match="any">
           <text variable="title" font-style="italic"/>
         </else-if>
-        <else-if type="software" match="any">
+        <else-if type="software speech dataset" match="any">
           <text variable="title"/>
         </else-if>
         <else>
@@ -501,6 +533,9 @@
           <text variable="container-title" suffix=","/>
           <text variable="title" form="short" text-case="title" quotes="true"/>
         </else-if>
+        <else-if type="broadcast" match="any">
+          <text variable="container-title" form="short" font-style="normal"/>
+        </else-if>
         <else-if type="bill legislation legal_case" match="none"/>
       </choose>
     </group>
@@ -515,7 +550,7 @@
           <text variable="container-title"/>
         </if>
         <else-if type="post-weblog">
-          <text variable="container-title" text-case="title" font-style="italic"/>
+          <text variable="container-title" text-case="title" font-style="italic" suffix=" (blog)"/>
         </else-if>
         <else-if type="article-magazine" match="all">
           <choose>
@@ -539,7 +574,7 @@
     <choose>
       <if match="none" type="article-journal">
         <choose>
-          <if match="none" is-numeric="collection-number" type="software">
+          <if match="none" is-numeric="collection-number" type="software dataset">
             <group delimiter=", ">
               <text variable="collection-title" text-case="title"/>
               <text variable="collection-number"/>
@@ -547,9 +582,12 @@
           </if>
           <else-if type="software" match="any">
             <group>
-              <text variable="collection-title" text-case="capitalize-first"/>
+              <text variable="collection-title" text-case="capitalize-first" quotes="true"/>
             </group>
           </else-if>
+          <else-if type="dataset" match="any">
+            <text variable="number" quotes="true"/>
+          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="collection-title" text-case="title"/>
@@ -652,15 +690,11 @@
           <else>
             <group delimiter=", ">
               <text macro="edition-note"/>
-              <group delimiter=" ">
-                <text term="volume" form="short"/>
-                <number variable="volume" form="numeric"/>
-              </group>
               <choose>
                 <if variable="locator" match="none">
                   <group delimiter=" ">
+                    <text term="volume" form="short" text-case="lowercase"/>
                     <number variable="number-of-volumes" form="numeric"/>
-                    <text term="volume" form="short" plural="true"/>
                   </group>
                 </if>
               </choose>
@@ -775,12 +809,8 @@
         <group delimiter=". ">
           <text macro="edition"/>
           <group delimiter=" ">
-            <text term="volume" form="short" text-case="capitalize-first"/>
-            <number variable="volume" form="numeric"/>
-          </group>
-          <group delimiter=" ">
+            <text term="volume" form="short" text-case="title"/>
             <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" plural="true"/>
           </group>
         </group>
       </else-if>
@@ -966,7 +996,7 @@
         <text variable="status"/>
       </else-if>
       <else-if variable="accessed URL" match="all"/>
-      <else-if type="software" match="any"/>
+      <else-if type="software dataset" match="any"/>
       <else>
         <text term="no date" form="short"/>
       </else>
@@ -1001,9 +1031,7 @@
     <choose>
       <if variable="locator" match="none">
         <choose>
-          <if type="article-journal chapter paper-conference" match="any">
-            <text variable="page"/>
-          </if>
+          <if type="article-journal chapter paper-conference" match="any"/>
         </choose>
       </if>
       <else-if type="article-journal">
@@ -1038,7 +1066,6 @@
             <choose>
               <if variable="page">
                 <text variable="volume" suffix=":"/>
-                <text variable="page"/>
               </if>
             </choose>
           </else>
@@ -1330,10 +1357,11 @@
         <else-if type="software" match="all">
           <group>
             <choose>
-              <if match="any" variable="accessed">
+              <if match="any" variable="issued"/>
+              <else-if match="any" variable="accessed">
                 <text term="accessed" suffix=" "/>
                 <date form="text" variable="accessed"/>
-              </if>
+              </else-if>
               <else>
                 <text value="accessed" suffix=" "/>
                 <date form="text" date-parts="year-month-day" variable="issued"/>
@@ -1350,6 +1378,9 @@
           </group>
         </if>
         <else-if type="legal_case" match="none"/>
+        <else-if type="software" match="any">
+          <date form="text" date-parts="year-month-day" variable="issued"/>
+        </else-if>
       </choose>
     </group>
   </macro>
@@ -1378,23 +1409,23 @@
               <text variable="DOI" prefix="https://doi.org/"/>
             </if>
             <else-if type="software" match="any">
-              <text variable="URL"/>
               <group>
                 <choose>
-                  <if match="any" variable="accessed">
-                    <date form="text" variable="accessed" prefix="(accessed " suffix=")"/>
+                  <if match="any" variable="issued">
+                    <date form="text" variable="issued"/>
                   </if>
-                  <else-if match="any" variable="issued">
-                    <date form="text" variable="issued" prefix="(accessed " suffix=")"/>
+                  <else-if match="any" variable="accessed">
+                    <date form="text" variable="accessed" prefix="Accessed "/>
                   </else-if>
                   <else>
                     <text value="(accessed various dates)"/>
                   </else>
                 </choose>
               </group>
+              <text variable="URL"/>
             </else-if>
             <else>
-              <text variable="URL" prefix="Available at "/>
+              <text variable="URL"/>
             </else>
           </choose>
         </if>
@@ -1432,6 +1463,9 @@
           <text variable="collection-number"/>
         </group>
       </else-if>
+      <else-if type="dataset" match="any">
+        <text variable="number"/>
+      </else-if>
       <else>
         <choose>
           <if match="none" is-numeric="collection-number">
@@ -1515,7 +1549,7 @@
                 <date form="text" variable="issued" prefix="[" suffix="?]"/>
               </if>
               <else-if type="speech" match="any"/>
-              <else-if type="software motion_picture" match="any"/>
+              <else-if type="motion_picture" match="any"/>
               <else>
                 <date form="text" date-parts="year-month-day" variable="issued"/>
               </else>
@@ -1527,12 +1561,10 @@
         <text variable="status"/>
       </else-if>
       <else-if match="all" variable="accessed URL"/>
-      <else-if type="software" match="all">
-        <group suffix=".">
-          <text value="Accessed various dates"/>
-        </group>
-      </else-if>
       <else-if type="legislation" match="any"/>
+      <else-if type="software dataset" match="any">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </else-if>
       <else>
         <text term="no date"/>
       </else>
@@ -1565,9 +1597,9 @@
               </group>
               <text macro="issue-note-join-with-space"/>
             </group>
-            <text macro="point-locators-join-with-comma"/>
           </group>
           <text macro="point-locators-join-with-colon"/>
+          <text macro="point-locators-join-with-comma"/>
         </group>
         <text macro="access-note"/>
       </group>
@@ -1583,60 +1615,120 @@
     <layout suffix=".">
       <group delimiter=". ">
         <group delimiter=": ">
-          <group delimiter=", ">
-            <group delimiter=". ">
+          <choose>
+            <if type="webpage post-weblog personal_communication dataset" match="any">
               <group delimiter=". ">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <choose>
-                      <if type="report" match="any">
-                        <group delimiter=", ">
-                          <group delimiter=". ">
-                            <text macro="contributors"/>
-                            <text macro="title"/>
-                            <text macro="issue-map-graphic"/>
-                          </group>
-                          <text macro="description" text-case="capitalize-first"/>
-                          <text macro="secondary-contributors"/>
-                          <group delimiter=", ">
-                            <text macro="container-title"/>
-                            <text macro="container-contributors"/>
-                            <text macro="locators-chapter"/>
-                          </group>
-                          <text macro="locators-join-with-period"/>
-                        </group>
-                      </if>
-                      <else>
-                        <group delimiter=". ">
-                          <group delimiter=". ">
-                            <text macro="contributors"/>
-                            <text macro="title"/>
-                            <text macro="issue-map-graphic"/>
-                          </group>
-                          <text macro="description"/>
-                          <text macro="secondary-contributors"/>
-                          <group delimiter=", ">
-                            <text macro="container-title"/>
-                            <text macro="container-contributors"/>
-                            <text macro="locators-chapter"/>
-                          </group>
-                          <text macro="locators-join-with-period"/>
-                        </group>
-                      </else>
-                    </choose>
-                    <text macro="locators-join-with-comma"/>
+                <group delimiter=". ">
+                  <group delimiter=". ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <choose>
+                          <if type="report" match="any">
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description" text-case="capitalize-first"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </if>
+                          <else>
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </else>
+                        </choose>
+                        <text macro="locators-join-with-comma"/>
+                      </group>
+                      <text macro="locators-join-with-space"/>
+                    </group>
+                    <text macro="collection-title"/>
+                    <text macro="issue-join-with-period"/>
                   </group>
-                  <text macro="locators-join-with-space"/>
+                  <text macro="issue-join-with-space"/>
                 </group>
-                <text macro="collection-title"/>
-                <text macro="issue-join-with-period"/>
+                <text macro="issue-join-with-comma"/>
+                <text macro="locators-journal-join-with-comma"/>
+                <text macro="locators-newspaper"/>
               </group>
-              <text macro="issue-join-with-space"/>
-            </group>
-            <text macro="issue-join-with-comma"/>
-            <text macro="locators-journal-join-with-comma"/>
-            <text macro="locators-newspaper"/>
-          </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <group delimiter=". ">
+                  <group delimiter=". ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <choose>
+                          <if type="report" match="any">
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description" text-case="capitalize-first"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </if>
+                          <else>
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </else>
+                        </choose>
+                        <text macro="locators-join-with-comma"/>
+                      </group>
+                      <text macro="locators-join-with-space"/>
+                    </group>
+                    <text macro="collection-title"/>
+                    <text macro="issue-join-with-period"/>
+                  </group>
+                  <text macro="issue-join-with-space"/>
+                </group>
+                <text macro="issue-join-with-comma"/>
+                <text macro="locators-journal-join-with-comma"/>
+                <text macro="locators-newspaper"/>
+              </group>
+            </else>
+          </choose>
           <text macro="locators-journal-join-with-colon"/>
         </group>
         <text macro="access"/>
diff --git a/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl b/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
index 286d38b9a05..bd252cbe262 100644
--- a/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
+++ b/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
@@ -187,9 +187,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1213,7 +1210,7 @@
     <sort>
       <key macro="author-bib" names-min="3" names-use-first="1"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1228,7 +1225,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>