diff --git a/documents-d-archeologie-francaise.csl b/documents-d-archeologie-francaise.csl
index bea70aa7a1..478f6c912a 100644
--- a/documents-d-archeologie-francaise.csl
+++ b/documents-d-archeologie-francaise.csl
@@ -595,22 +595,26 @@
           </group>
         </else-if>
         <else>
-          <group>
-            <text macro="responsability" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="medium" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="date" suffix=". "/>
-            <text macro="edition" suffix=". "/>
-            <text macro="publisher-place" suffix="&#160;: "/>
-            <text macro="publisher" suffix=". "/>
-            <text macro="accessed" suffix=". "/>
-            <text macro="collection" suffix=". "/>
-            <text macro="page" suffix=". "/>
-            <text macro="isbn" suffix=". "/>
-            <text macro="url" suffix=". "/>
-          <text macro="archive" prefix=" (" suffix=")."/>
+          <group suffix="." delimiter=", ">
+            <text macro="responsability"/>
+            <group delimiter=". ">
+              <text macro="year-date"/>
+              <text macro="title"/>
+              <text macro="medium"/>
+              <text macro="genre"/>
+              <text macro="date"/>
+              <text macro="edition"/>
+              <group delimiter="&#160;: ">
+                <text macro="publisher-place"/>
+                <text macro="publisher"/>
+              </group>
+              <text macro="accessed"/>
+              <text macro="collection"/>
+              <text macro="page"/>
+              <text macro="isbn"/>
+              <text macro="url"/>
+              <text macro="archive" prefix="(" suffix=")"/>
+            </group>
           </group>
         </else>
       </choose>
diff --git a/harvard-kings-college-london.csl b/harvard-kings-college-london.csl
index 6059a9ee8c..1c5026e44b 100644
--- a/harvard-kings-college-london.csl
+++ b/harvard-kings-college-london.csl
@@ -250,8 +250,8 @@
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" '" suffix="', "/>
           <group prefix=" " delimiter=" ">
+            <text macro="title" quotes="true" suffix=","/>
             <text term="in"/>
             <text macro="editor"/>
             <text variable="container-title" font-style="italic" suffix="."/>
@@ -265,19 +265,19 @@
           </group>
         </else-if>
         <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
+          <group suffix=". " prefix=" " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor"/>
           </group>
-          <text variable="container-title" prefix=" "/>
-          <text macro="access" prefix=" " suffix=". "/>
-          <group prefix=" " suffix=".">
-            <group prefix=" ">
+          <text variable="container-title" suffix=" "/>
+          <text macro="access" suffix=". "/>
+          <group suffix="." delimiter=" ">
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix=" (" suffix=")"/>
               <text macro="issued"/>
             </group>
-            <group prefix=" ">
+            <group>
               <label variable="locator" form="short"/>
               <text macro="pages"/>
             </group>
diff --git a/harvard-university-of-gloucestershire.csl b/harvard-university-of-gloucestershire.csl
index 1257823015..3851266d77 100644
--- a/harvard-university-of-gloucestershire.csl
+++ b/harvard-university-of-gloucestershire.csl
@@ -183,9 +183,9 @@
           </group>
         </else-if>
         <else>
-          <group suffix=", ">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
+          <group suffix=", " prefix=" " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor-translator"/>
           </group>
           <group prefix=" " suffix=" ">
             <text variable="container-title" font-style="italic"/>
diff --git a/harvard-university-of-the-west-of-england.csl b/harvard-university-of-the-west-of-england.csl
index 7fad3e1df0..aeec61643a 100644
--- a/harvard-university-of-the-west-of-england.csl
+++ b/harvard-university-of-the-west-of-england.csl
@@ -221,8 +221,8 @@
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix=". "/>
           <group prefix=" " delimiter=" ">
+            <text macro="title" suffix="."/>
             <text term="in" text-case="capitalize-first" suffix=":"/>
             <text macro="editor" suffix=". "/>
             <text variable="container-title" font-style="italic" suffix="."/>
@@ -236,21 +236,23 @@
           </group>
         </else-if>
         <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-          <text macro="online" prefix=" " suffix=". "/>
-          <group prefix=" " suffix=".">
-            <group prefix=" ">
-              <text variable="volume"/>
-              <text variable="issue" prefix=" (" suffix=")"/>
-              <text macro="issued"/>
+          <group prefix=" " suffix="." delimiter=". ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="editor"/>
             </group>
-            <group prefix=" ">
-              <label variable="locator" form="short"/>
-              <text macro="pages"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="online"/>
+            <group>
+              <group prefix=" ">
+                <text variable="volume"/>
+                <text variable="issue" prefix=" (" suffix=")"/>
+                <text macro="issued"/>
+              </group>
+              <group prefix=" ">
+                <label variable="locator" form="short"/>
+                <text macro="pages"/>
+              </group>
             </group>
           </group>
         </else>
diff --git a/norma-portuguesa-405.csl b/norma-portuguesa-405.csl
index 49cad48314..8afe8c5013 100644
--- a/norma-portuguesa-405.csl
+++ b/norma-portuguesa-405.csl
@@ -304,13 +304,13 @@
         <text variable="number" prefix=" (Relatório n." suffix=")."/>
       </else-if>
       <else-if type="article-newspaper" match="any">
-        <date variable="issued">
-          <date-part name="day" prefix=" (" suffix=" "/>
-          <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-          <date-part name="year" suffix="). "/>
+        <date variable="issued" prefix=" ("  suffix="). " delimiter=" ">
+          <date-part name="day"/>
+          <date-part name="month" form="short" suffix="." text-case="lowercase"/>
+          <date-part name="year"/>
         </date>
-        <text variable="volume" prefix=" " suffix=":"/>
-        <text variable="issue" suffix=" "/>
+        <text variable="volume" suffix=":"/>
+        <text variable="issue"/>
         <text variable="page" prefix=" "/>
       </else-if>
       <else-if type="webpage" match="any">
@@ -355,7 +355,7 @@
             <text macro="container-contributors" suffix=". "/>
             <text macro="medium"/>
             <text macro="locators" suffix=" "/>
-            <text macro="access" prefix=" "/>
+            <text macro="access"/>
           </group>
         </if>
         <else-if type="map">
diff --git a/nucleic-acids-research.csl b/nucleic-acids-research.csl
index dabf986c70..c88c370828 100644
--- a/nucleic-acids-research.csl
+++ b/nucleic-acids-research.csl
@@ -88,8 +88,8 @@
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix=". "/>
           <group prefix=" " delimiter=" " suffix=".">
+            <text macro="title" suffix="."/>
             <text term="in" text-case="capitalize-first"/>
             <group delimiter=", ">
               <text macro="editor"/>
diff --git a/oxford-studies-on-the-roman-economy.csl b/oxford-studies-on-the-roman-economy.csl
index 08990e04c3..e2e4e562ea 100644
--- a/oxford-studies-on-the-roman-economy.csl
+++ b/oxford-studies-on-the-roman-economy.csl
@@ -204,7 +204,7 @@
         </else-if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" quotes="true" prefix=" " suffix=", "/>
-          <group prefix=" ">
+          <group>
             <text term="in" suffix=" "/>
             <text macro="editor-bib" suffix=", "/>
             <text variable="container-title" font-style="italic"/>
diff --git a/padagogische-hochschule-fachhochschule-nordwestschweiz.csl b/padagogische-hochschule-fachhochschule-nordwestschweiz.csl
index 3168e4407d..8a133d5487 100644
--- a/padagogische-hochschule-fachhochschule-nordwestschweiz.csl
+++ b/padagogische-hochschule-fachhochschule-nordwestschweiz.csl
@@ -266,9 +266,9 @@
  
       <if type="article-newspaper">
         <group prefix=" " delimiter=", ">
-          <group>
-            <text variable="edition" suffix=" "/>
-            <text term="edition" prefix=" "/>
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
           </group>
           <group prefix="(" suffix=")">
             <text term="section" form="short" suffix=" " />
diff --git a/palaeontologia-electronica.csl b/palaeontologia-electronica.csl
index 1599e4bc4c..ce749a3bf3 100644
--- a/palaeontologia-electronica.csl
+++ b/palaeontologia-electronica.csl
@@ -160,9 +160,9 @@
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
           <text macro="edition"/>
-          <group>
-            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-            <number variable="number-of-volumes" form="numeric" prefix=" 1-"/>
+          <group delimiter=" ">
+            <text term="volume" form="short" plural="true" text-case="capitalize-first"/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
           </group>
           <group>
             <number variable="volume" form="numeric"/>
diff --git a/palaios.csl b/palaios.csl
index d04d94239d..08971a88ef 100644
--- a/palaios.csl
+++ b/palaios.csl
@@ -164,7 +164,7 @@
         </else-if>
         <else>
           <text variable="title" prefix=" " suffix=": "/>
-          <group prefix=" " delimiter=", " suffix=".">
+          <group delimiter=", " suffix=".">
             <text macro="editor-translator"/>
             <text variable="container-title"/>
             <text variable="volume" prefix="v. "/>
diff --git a/philosophia-scientiae.csl b/philosophia-scientiae.csl
index 2afcc33077..321d533237 100644
--- a/philosophia-scientiae.csl
+++ b/philosophia-scientiae.csl
@@ -35,7 +35,7 @@
           <if variable="author">
             <names variable="editor translator" delimiter=". ">
               <label form="short" text-case="capitalize-first" suffix=" "/>
-              <name and="text" prefix=" " delimiter=", " initialize-with=". "/>
+              <name and="text" delimiter=", " initialize-with=". "/>
             </names>
           </if>
         </choose>
@@ -58,7 +58,7 @@
                   <group>
                     <names variable="container-author">
                       <label form="verb-short" prefix=" " suffix=" " strip-periods="true"/>
-                      <name and="text" prefix=" " delimiter=", " initialize-with=". "/>
+                      <name and="text" delimiter=", " initialize-with=". "/>
                     </names>
                   </group>
                 </if>
@@ -271,18 +271,18 @@
   <macro name="publisher">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group prefix=" ">
-          <group suffix="; ">
+        <group prefix=" " delimiter="; ">
+          <group delimiter=" ">
             <text variable="collection-title"/>
-            <text variable="collection-number" prefix=" "/>
+            <text variable="collection-number"/>
           </group>
-          <group suffix="; ">
-            <text term="volume" form="short" suffix=" "/>
+          <group delimiter=" ">
+            <text term="volume" form="short"/>
             <number variable="volume" form="numeric"/>
           </group>
-          <group suffix="; ">
-            <number variable="number-of-volumes" form="numeric" suffix=" "/>
-            <text term="volume" form="short" prefix=" " suffix=" " plural="true"/>
+          <group delimiter=" ">
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" plural="true"/>
           </group>
         </group>
       </if>
@@ -291,9 +291,9 @@
           <text variable="collection-title"/>
           <text variable="collection-number" prefix=" "/>
         </group>
-        <group suffix="; ">
-          <number variable="number-of-volumes" form="numeric" suffix=" "/>
-          <text term="volume" form="short" prefix=" " suffix=" " plural="true"/>
+        <group suffix=" ; " delimiter=" ">
+          <number variable="number-of-volumes" form="numeric"/>
+          <text term="volume" form="short" plural="true"/>
         </group>
         <choose>
           <if variable="page" match="none">
diff --git a/pisa-university-press.csl b/pisa-university-press.csl
index 69f38a188f..0667aa6e6d 100644
--- a/pisa-university-press.csl
+++ b/pisa-university-press.csl
@@ -268,12 +268,12 @@
       <else-if type="chapter paper-conference" match="any">
         <text variable="title" suffix=", " quotes="true"/>
         <text macro="container" suffix=" "/>
-        <text variable="publisher-place" prefix=" (" suffix=": "/>
+        <text variable="publisher-place" prefix="(" suffix=": "/>
         <group delimiter=", " suffix=")">
           <text variable="publisher"/>
           <text macro="issuance"/>
         </group>
-        <text variable="volume" prefix=" vol. " suffix=" "/>
+        <text variable="volume" prefix=" vol. "/>
         <text variable="page" prefix=" "/>
       </else-if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
diff --git a/preslia.csl b/preslia.csl
index 5c32403753..880c18f26d 100644
--- a/preslia.csl
+++ b/preslia.csl
@@ -131,9 +131,9 @@
           </group>
         </else-if>
         <else-if type="article-journal">
-          <group suffix=". ">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
+          <group suffix=". " prefix=" " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor-translator"/>
           </group>
           <choose>
             <if variable="issue">
@@ -149,9 +149,9 @@
           </choose>
         </else-if>
         <else>
-          <group suffix=". ">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
+          <group suffix=". " prefix=" " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor-translator"/>
           </group>
           <group delimiter=" " suffix=".">
             <text variable="container-title" font-style="italic" suffix="."/>
diff --git a/proceedings-of-the-royal-society-b.csl b/proceedings-of-the-royal-society-b.csl
index 8af2e13bf1..7bc7c14ed6 100644
--- a/proceedings-of-the-royal-society-b.csl
+++ b/proceedings-of-the-royal-society-b.csl
@@ -48,11 +48,11 @@
     </names>
   </macro>
   <macro name="publisher">
-    <text variable="publisher-place" suffix=": "/>
-    <text variable="publisher" suffix="."/>
-    <group suffix=". ">
-      <text macro="accessed-date" prefix=" "/>
+    <group delimiter=": " suffix=". ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
     </group>
+    <text macro="accessed-date" suffix=". "/>
   </macro>
   <macro name="accessed-date">
     <choose>
diff --git a/revista-ciencias-tecnicas-agropecuarias.csl b/revista-ciencias-tecnicas-agropecuarias.csl
index 31bb2f37ff..20d80e06fd 100644
--- a/revista-ciencias-tecnicas-agropecuarias.csl
+++ b/revista-ciencias-tecnicas-agropecuarias.csl
@@ -430,7 +430,7 @@
             <text macro="translator" suffix=", "/>
             <text macro="editor" suffix=", "/>
             <text variable="container-title" font-style="italic" suffix=", "/>
-            <text variable="collection-title" prefix=" ser. " suffix=", "/>
+            <text variable="collection-title" prefix="ser. " suffix=", "/>
             <text macro="collection-editor" prefix="edit. ser. " suffix=", "/>
             <text macro="edition" suffix=", "/>
             <text macro="isbn" suffix=", "/>
@@ -449,7 +449,7 @@
             <text macro="title" prefix="¨" suffix="¨, "/>
             <text macro="online" font-style="italic"/>
             <text variable="event" prefix="En: " suffix=", " font-style="italic"/>
-            <text variable="collection-title" prefix=" ser. " suffix=", "/>
+            <text variable="collection-title" prefix="ser. " suffix=", "/>
             <text macro="isbn" suffix=", "/>
             <text macro="doi" suffix=", "/>
             <text macro="page" prefix="pp. " suffix=", "/>
@@ -534,7 +534,7 @@
             <text macro="title" prefix="¨" suffix="¨, "/>
             <text macro="online" font-style="italic"/>
             <text variable="container-title" font-style="italic" suffix=", "/>
-            <text variable="collection-title" prefix=" ser. " suffix=", "/>
+            <text variable="collection-title" prefix="ser. " suffix=", "/>
             <text variable="event" prefix="En: " suffix=", "/>
             <text macro="medium" suffix=", "/>
             <text macro="genre" suffix=", "/>
diff --git a/revista-virtual-de-quimica.csl b/revista-virtual-de-quimica.csl
index 85e9bc439c..c21708ae97 100644
--- a/revista-virtual-de-quimica.csl
+++ b/revista-virtual-de-quimica.csl
@@ -62,10 +62,12 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group>
-      <text variable="publisher" strip-periods="false"/>
-      <text variable="publisher-place" prefix=": " suffix=", "/>
-      <text macro="year-date" prefix=" "/>
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="publisher" strip-periods="false"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="year-date"/>
     </group>
   </macro>
   <macro name="edition">
diff --git a/revue-archeologique-du-centre-de-la-france.csl b/revue-archeologique-du-centre-de-la-france.csl
index 7f78f84abe..5bb1026acf 100644
--- a/revue-archeologique-du-centre-de-la-france.csl
+++ b/revue-archeologique-du-centre-de-la-france.csl
@@ -41,7 +41,7 @@
     </names>
   </macro>
   <macro name="journal-no-author">
-    <group prefix="" suffix=",">
+    <group suffix=",">
       <text variable="container-title" form="short" font-style="italic"/>
       <text variable="volume" prefix=", " form="short"/>
       <text variable="issue" prefix=", " form="short"/>
@@ -114,7 +114,7 @@
       <else>
         <choose>
           <if variable="publisher-place">
-            <text variable="publisher-place" prefix="" suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
           </if>
           <else>
             <text value="[s.l.]&#160;, "/>
@@ -134,7 +134,7 @@
       </if>
       <else-if variable="URL">
         <text value="URL : " prefix=". "/>
-        <group prefix="" suffix="">
+        <group>
           <text variable="URL"/>
         </group>
       </else-if>
@@ -143,9 +143,9 @@
   <macro name="accessed-date">
     <choose>
       <if variable="URL">
-        <group prefix=", " suffix="" delimiter=" ">
+        <group prefix=", " delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -155,7 +155,7 @@
       <else-if variable="DOI">
         <group prefix="(" suffix=")" delimiter=" ">
           <text value="consulté le"/>
-          <date variable="accessed" suffix="">
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
@@ -193,7 +193,7 @@
           </choose>
         </if>
         <else>
-          <text variable="title" suffix=""/>
+          <text variable="title"/>
         </else>
       </choose>
     </group>
@@ -214,7 +214,7 @@
   <macro name="collection">
     <choose>
       <if variable="collection-number">
-        <text variable="collection-title" prefix=""/>
+        <text variable="collection-title"/>
         <text variable="collection-number" prefix=" n° " suffix=", "/>
       </if>
       <else>
@@ -239,13 +239,13 @@
   </macro>
   <macro name="webpageinfo">
     <text variable="note" prefix="Tome " suffix=" | "/>
-    <text macro="year-date" prefix="" suffix=","/>
+    <text macro="year-date" suffix=","/>
   </macro>
   <macro name="parution">
     <date variable="issued">
       <date-part name="day" suffix=" "/>
       <date-part name="month" suffix=" "/>
-      <date-part name="year" suffix=""/>
+      <date-part name="year"/>
     </date>
   </macro>
   <citation disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
@@ -266,18 +266,18 @@
       <key variable="issued"/>
     </sort>
     <layout>
-      <group prefix="" suffix="" delimiter=" ">
+      <group delimiter=" ">
         <text macro="author-short"/>
         <text macro="year-date"/>
         <text variable="year-suffix" prefix=" "/>
       </group>
-      <group display="block" delimiter="" prefix="" suffix="">
+      <group display="block" delimiter="">
         <text macro="author"/>
-        <text macro="title" prefix="" suffix=", "/>
+        <text macro="title" suffix=", "/>
         <choose>
           <if type="thesis">
             <text variable="genre" suffix=". "/>
-            <text macro="publisher" prefix=" "/>
+            <text macro="publisher"/>
             <text variable="number-of-pages" suffix=" p."/>
           </if>
           <else-if type="bill book graphic legal_case legislation motion_picture report song manuscript" match="any">
@@ -299,11 +299,11 @@
             <group prefix=" ">
               <text value="in" suffix=" : " font-style="italic"/>
               <text macro="editor-biblio" suffix=" (dir.)"/>
-              <text variable="event" prefix=", " suffix="" font-style="italic"/>
+              <text variable="event" prefix=", " font-style="italic"/>
               <text macro="journal-title" prefix=", "/>
             </group>
-            <text variable="collection-title" prefix="" suffix=", "/>
-            <text macro="publisher" prefix=" "/>
+            <text variable="collection-title" suffix=", "/>
+            <text macro="publisher"/>
             <text variable="page" prefix=" p. " suffix="."/>
           </else-if>
           <else-if type="webpage" match="any">
@@ -322,7 +322,7 @@
             <group prefix=" ">
               <text macro="journal-title"/>
             </group>
-            <text variable="volume" prefix="" form="short"/>
+            <text variable="volume" form="short"/>
             <text variable="issue" prefix=", " form="short"/>
             <text variable="page" prefix="&#160;:&#160;" suffix="."/>
           </else-if>
@@ -332,7 +332,7 @@
               <date variable="issued" suffix=".">
                 <date-part name="day" suffix=" "/>
                 <date-part name="month" suffix=" "/>
-                <date-part name="year" suffix=""/>
+                <date-part name="year"/>
               </date>
             </group>
             <group suffix=". ">
diff --git a/risk-analysis.csl b/risk-analysis.csl
index 0c838f4ca9..4d4dc72a14 100644
--- a/risk-analysis.csl
+++ b/risk-analysis.csl
@@ -102,17 +102,17 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" ">
-            <label variable="page" form="short" text-case="capitalize-first"/>
-            <text variable="page" prefix=" " suffix=" "/>
+            <label variable="page" form="short" text-case="capitalize-first" suffix=" "/>
+            <text variable="page" suffix=" "/>
             <text term="in" text-case="lowercase" suffix=" "/>
             <text macro="editor" suffix=". "/>
-            <text variable="container-title" text-case="title" prefix=" " suffix="."/>
-            <text variable="volume" prefix="Vol " suffix="."/>
-            <text macro="edition" prefix=" "/>
-            <text variable="collection-title" prefix=" " suffix="."/>
-            <group suffix=".">
-              <text macro="publisher" prefix=" "/>
-              <group suffix="." prefix=", ">
+            <text variable="container-title" text-case="title" suffix=". "/>
+            <text variable="volume" prefix="Vol " suffix=". "/>
+            <text macro="edition" suffix=" "/>
+            <text variable="collection-title" suffix=". "/>
+            <group suffix="." delimiter=", ">
+              <text macro="publisher"/>
+              <group>
                 <date variable="issued">
                   <date-part name="year"/>
                 </date>
diff --git a/society-for-historical-archaeology.csl b/society-for-historical-archaeology.csl
index b6404cc513..5203fc39e4 100644
--- a/society-for-historical-archaeology.csl
+++ b/society-for-historical-archaeology.csl
@@ -213,9 +213,9 @@
   <macro name="locators-article">
     <choose>
       <if type="article-newspaper">
-        <group prefix=", ">
-          <text variable="edition" suffix=" "/>
-          <text term="edition" prefix=" "/>
+        <group prefix=", " delimiter=" ">
+          <text variable="edition"/>
+          <text term="edition"/>
         </group>
       </if>
       <else-if type="article-journal">
diff --git a/sociology-of-health-and-illness.csl b/sociology-of-health-and-illness.csl
index 1c1c118094..e2c0cb5489 100644
--- a/sociology-of-health-and-illness.csl
+++ b/sociology-of-health-and-illness.csl
@@ -216,8 +216,8 @@
           </group>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix=". "/>
           <group prefix=" " delimiter=" ">
+            <text macro="title" suffix="."/>
             <text term="in" text-case="capitalize-first"/>
             <text macro="editor" suffix=" "/>
             <text variable="container-title" font-style="italic" suffix="."/>
@@ -231,21 +231,23 @@
           </group>
         </else-if>
         <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-          <text macro="online" prefix=" " suffix=". "/>
-          <group prefix=" " suffix=".">
-            <group prefix=" ">
-              <text variable="volume"/>
-              <text variable="issue" prefix=" (" suffix=")"/>
-              <text macro="issued"/>
+          <group delimiter=". " prefix=" " suffix=".">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="editor"/>
             </group>
-            <group prefix=" ">
-              <label variable="page" form="short"/>
-              <text macro="pages"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="online"/>
+            <group delimiter=" ">
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix=" (" suffix=")"/>
+                <text macro="issued"/>
+              </group>
+              <group>
+                <label variable="page" form="short"/>
+                <text macro="pages"/>
+              </group>
             </group>
           </group>
         </else>
diff --git a/standards-in-genomic-sciences.csl b/standards-in-genomic-sciences.csl
index 8ee72469ad..6df0cc2fb2 100644
--- a/standards-in-genomic-sciences.csl
+++ b/standards-in-genomic-sciences.csl
@@ -182,13 +182,11 @@
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
             <text variable="container-title" font-style="italic" form="short" suffix=" "/>
-            <group delimiter=";" prefix=" ">
+            <group delimiter=";">
               <date variable="issued">
                 <date-part name="year"/>
               </date>
-              <group>
-                <text variable="volume" font-weight="bold"/>
-              </group>
+              <text variable="volume" font-weight="bold"/>
             </group>
             <text variable="page" prefix=":"/>
           </group>
diff --git a/stem-cells.csl b/stem-cells.csl
index 23556712ee..97fb0dea8e 100644
--- a/stem-cells.csl
+++ b/stem-cells.csl
@@ -194,7 +194,7 @@
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
             <text variable="container-title" font-weight="bold" form="short" prefix=" " suffix=" " text-case="uppercase"/>
-            <group delimiter=";" prefix=" ">
+            <group delimiter=";">
               <date variable="issued">
                 <date-part name="year"/>
               </date>
diff --git a/the-british-journal-of-sociology.csl b/the-british-journal-of-sociology.csl
index 290398f12b..1431283bc7 100644
--- a/the-british-journal-of-sociology.csl
+++ b/the-british-journal-of-sociology.csl
@@ -80,7 +80,7 @@
         <text variable="title" font-style="italic"/>
       </if>
       <else>
-        <text variable="title"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -148,7 +148,7 @@
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" '" suffix="'"/>
+          <text macro="title" prefix=" "/>
           <group prefix=" " delimiter=" ">
             <text term="in"/>
             <text macro="editor"/>
@@ -167,9 +167,9 @@
           </group>
         </else-if>
         <else>
-          <group suffix="', ">
-            <text macro="title" prefix=" '"/>
-            <text macro="editor" prefix=" "/>
+          <group prefix=" " suffix=", " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor"/>
           </group>
           <group prefix=" " suffix=".">
             <text variable="container-title" font-style="italic"/>
diff --git a/the-journal-of-adhesive-dentistry.csl b/the-journal-of-adhesive-dentistry.csl
index e94db5c9e6..001425f091 100644
--- a/the-journal-of-adhesive-dentistry.csl
+++ b/the-journal-of-adhesive-dentistry.csl
@@ -87,8 +87,10 @@
       <text macro="title" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="editor" prefix=" " suffix=" "/>
-          <text macro="publisher" prefix=" "/>
+          <group delimiter=" " prefix=" ">
+            <text macro="editor"/>
+            <text macro="publisher"/>
+          </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " suffix=". ">
diff --git a/the-open-university-numeric-superscript.csl b/the-open-university-numeric-superscript.csl
index 5b477f2bb6..fb734c2b67 100644
--- a/the-open-university-numeric-superscript.csl
+++ b/the-open-university-numeric-superscript.csl
@@ -140,12 +140,12 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
-          <group prefix=", ">
+          <group prefix=", " delimiter=" ">
             <text term="in"/>
-            <text macro="editor" prefix=" " suffix=", "/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-            <text variable="collection-title" prefix=" " suffix=","/>
-            <group suffix="." delimiter=", ">
+            <group delimiter=", " suffix=".">
+              <text macro="editor"/>
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
               <text macro="publisher" prefix=" "/>
               <text macro="pages"/>
             </group>
diff --git a/the-open-university-numeric.csl b/the-open-university-numeric.csl
index 7433529fa9..c08cee7ad3 100644
--- a/the-open-university-numeric.csl
+++ b/the-open-university-numeric.csl
@@ -135,12 +135,12 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
-          <group prefix=", ">
+          <group prefix=", " delimiter=" ">
             <text term="in"/>
-            <text macro="editor" prefix=" " suffix=", "/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-            <text variable="collection-title" prefix=" " suffix=","/>
-            <group suffix="." delimiter=", ">
+            <group delimiter=", " suffix=".">
+              <text macro="editor"/>
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
               <text macro="publisher" prefix=" "/>
               <text macro="pages"/>
             </group>
diff --git a/theory-culture-and-society.csl b/theory-culture-and-society.csl
index 99d51f4a93..81d6c1d515 100644
--- a/theory-culture-and-society.csl
+++ b/theory-culture-and-society.csl
@@ -4,7 +4,7 @@
     <title>Theory, Culture &amp; Society</title>
     <id>http://www.zotero.org/styles/theory-culture-and-society</id>
     <link href="http://www.zotero.org/styles/theory-culture-and-society" rel="self"/>
-    <link href="http://www.uk.sagepub.com/repository/binaries/doc/TCS_Notes_for_Contributors.doc" rel="documentation"/>
+    <link href="http://www.uk.sagepub.com/journals/Journal200853/manuscriptSubmission" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
@@ -117,28 +117,24 @@
             </group>
           </if>
           <else-if variable="URL">
-            <text value="URL"/>
-            <group delimiter=" " prefix=" (consulted" suffix="): ">
-              <date variable="accessed" prefix=" " delimiter=" ">
+            <group delimiter=" " prefix=" " >
+              <text value="URL"/>
+              <date variable="accessed" prefix="(consulted" suffix="):" delimiter=" ">
                 <date-part name="month" form="long"/>
                 <date-part name="year"/>
               </date>
-            </group>
-            <group>
               <text variable="URL"/>
             </group>
           </else-if>
         </choose>
       </else-if>
       <else-if variable="URL">
-        <text value="URL "/>
-        <group delimiter=" " prefix=" (consulted" suffix="): ">
-          <date variable="accessed" prefix=" " delimiter=" ">
+        <group delimiter=" " prefix=" " >
+          <text value="URL"/>
+          <date variable="accessed" prefix="(consulted" suffix="):" delimiter=" ">
             <date-part name="month" form="long"/>
             <date-part name="year"/>
           </date>
-        </group>
-        <group>
           <text variable="URL"/>
         </group>
       </else-if>
diff --git a/transplantation.csl b/transplantation.csl
index a97d63d546..c409cec332 100644
--- a/transplantation.csl
+++ b/transplantation.csl
@@ -128,8 +128,10 @@
       <text macro="title" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="edition" prefix=" " suffix=" "/>
-          <text macro="publisher2" prefix=" "/>
+          <group prefix=" " delimiter=" ">
+            <text macro="edition"/>
+            <text macro="publisher2"/>
+          </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " suffix=". ">
diff --git a/united-nations-conference-on-trade-and-development.csl b/united-nations-conference-on-trade-and-development.csl
index 7f8e90b58d..a871b39ba1 100644
--- a/united-nations-conference-on-trade-and-development.csl
+++ b/united-nations-conference-on-trade-and-development.csl
@@ -113,9 +113,9 @@
   <macro name="access-date">
     <choose>
       <if type="webpage">
-        <text value="See" prefix=" " suffix=" "/>
-        <text variable="URL" prefix=" " font-style="normal"/>
         <group prefix=" " delimiter=" ">
+          <text value="See"/>
+          <text variable="URL" font-style="normal"/>
           <group prefix="(" suffix=")">
             <text term="accessed" suffix=" "/>
             <date variable="accessed">
diff --git a/universita-di-bologna-lettere.csl b/universita-di-bologna-lettere.csl
index 83f85900cb..6590fad0bb 100644
--- a/universita-di-bologna-lettere.csl
+++ b/universita-di-bologna-lettere.csl
@@ -286,8 +286,10 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-        <text term="volume" form="short" prefix=", " suffix=" "/>
-        <text variable="volume" prefix=" "/>
+        <group delimiter=" "  prefix=", ">
+          <text term="volume" form="short"/>
+          <text variable="volume"/>
+        </group>
         <group prefix=", ">
           <text term="issue" form="short" suffix=" "/>
           <number variable="issue"/>
diff --git a/universite-laval-departement-dinformation-et-de-communication.csl b/universite-laval-departement-dinformation-et-de-communication.csl
index d190407eff..48b5445698 100644
--- a/universite-laval-departement-dinformation-et-de-communication.csl
+++ b/universite-laval-departement-dinformation-et-de-communication.csl
@@ -188,7 +188,7 @@
       <choose>
         <if type="thesis">
           <text variable="genre" suffix=". "/>
-          <text macro="publisher" prefix=" "/>
+          <text macro="publisher"/>
           <text variable="number-of-pages" suffix=" p."/>
         </if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
diff --git a/urban-habitats.csl b/urban-habitats.csl
index 4a3ab631cb..46e95dd3ef 100644
--- a/urban-habitats.csl
+++ b/urban-habitats.csl
@@ -143,16 +143,18 @@
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <text macro="pages" prefix=" "/>
-          <text term="in" prefix=" " suffix=" "/>
-          <group prefix=" " delimiter=", " suffix=",">
+          <text macro="title" prefix=" " suffix=". "/>
+          <text macro="pages" suffix=" "/>
+          <text term="in" suffix=" "/>
+          <group delimiter=", " suffix=".">
             <text variable="container-title" font-style="italic"/>
             <text variable="collection-title"/>
             <text variable="event"/>
+            <group delimiter=". ">
+              <text macro="editor"/>
+              <text macro="publisher"/>
+            </group>
           </group>
-          <text macro="editor" prefix=" " suffix="."/>
-          <text macro="publisher" prefix=" " suffix="."/>
         </else-if>
         <else-if type="thesis">
           <group prefix=" " suffix="." delimiter=". ">
diff --git a/wheaton-college-phd-in-biblical-and-theological-studies.csl b/wheaton-college-phd-in-biblical-and-theological-studies.csl
index abb16fc6f5..109ac25987 100644
--- a/wheaton-college-phd-in-biblical-and-theological-studies.csl
+++ b/wheaton-college-phd-in-biblical-and-theological-studies.csl
@@ -309,8 +309,10 @@
         <text term="in" suffix=" "/>
         <choose>
           <if variable="volume" match="any">
-            <text term="volume" form="short" suffix=" "/>
-            <text variable="volume" prefix=" " suffix=" of "/>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume" suffix=" of "/>
+            </group>
           </if>
         </choose>
       </else-if>
@@ -331,8 +333,10 @@
         <text term="in" text-case="capitalize-first" suffix=" "/>
         <choose>
           <if variable="volume" match="any">
-            <text term="volume" form="short" suffix=" "/>
-            <text variable="volume" prefix=" " suffix=" of "/>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume" suffix=" of "/>
+            </group>
           </if>
         </choose>
       </else-if>
diff --git a/who-europe-harvard.csl b/who-europe-harvard.csl
index 3d893ce9a2..4a2c7acd19 100644
--- a/who-europe-harvard.csl
+++ b/who-europe-harvard.csl
@@ -229,10 +229,10 @@
           </else-if>
           <else-if type="article-newspaper broadcast" match="any">
             <group suffix=".">
-              <text macro="title" suffix="."/>
-              <group suffix=", ">
-                <text variable="container-title" prefix=" " font-style="italic"/>
-                <text variable="publisher-place" prefix=" (" suffix=")"/>
+              <text macro="title" suffix=". "/>
+              <group suffix=", " delimiter=" ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="publisher-place" prefix="(" suffix=")"/>
               </group>
               <group>
                 <date variable="issued">
diff --git a/who-europe-numeric.csl b/who-europe-numeric.csl
index ec1d919548..fd7a8e251c 100644
--- a/who-europe-numeric.csl
+++ b/who-europe-numeric.csl
@@ -182,7 +182,7 @@
                 <if variable="editor">
                   <text term="in" text-case="capitalize-first" suffix=": " prefix=" "/>
                   <text macro="editor" suffix=" "/>
-                  <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+                  <text variable="container-title" font-style="italic" suffix="."/>
                   <text variable="volume" prefix="Vol" suffix="."/>
                   <text macro="edition" prefix=" "/>
                   <text variable="collection-title" suffix="."/>
@@ -220,10 +220,10 @@
           </else-if>
           <else-if type="article-newspaper broadcast" match="any">
             <group suffix=".">
-              <text macro="title" suffix="."/>
-              <group suffix=", ">
-                <text variable="container-title" prefix=" " font-style="italic"/>
-                <text variable="publisher-place" prefix=" (" suffix=")"/>
+              <text macro="title" suffix=". "/>
+              <group suffix=", " delimiter=" ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="publisher-place" prefix="(" suffix=")"/>
               </group>
               <group>
                 <date variable="issued">
diff --git a/zeitschrift-fur-medienwissenschaft.csl b/zeitschrift-fur-medienwissenschaft.csl
index ae51fede0f..cce6136301 100644
--- a/zeitschrift-fur-medienwissenschaft.csl
+++ b/zeitschrift-fur-medienwissenschaft.csl
@@ -229,7 +229,7 @@
     <choose>
       <if variable="collection-editor">
         <text prefix=", " term="editor" form="verb-short" text-case="lowercase" suffix=". "/>
-        <text prefix=" " macro="secondary-collection-contributors"/>
+        <text macro="secondary-collection-contributors"/>
       </if>
     </choose>
   </macro>