diff --git a/iso690-full-note-cs.csl b/iso690-full-note-cs.csl
index 6e449e31b5d..a49190b323e 100644
--- a/iso690-full-note-cs.csl
+++ b/iso690-full-note-cs.csl
@@ -14,7 +14,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Czech ISO-690, full note.</summary>
-    <updated>2020-05-25T10:00:00+00:00</updated>
+    <updated>2020-05-30T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="cs">
@@ -235,21 +235,17 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
           <date variable="issued">
-            <date-part name="year" range-delimiter="&#8211;"/>
+            <date-part name="year" range-delimiter="&#160;&#8211;&#160;"/>
           </date>
-          <choose>
-            <if variable="volume">
-              <text term="volume" form="short" suffix="&#160;"/>
-              <text variable="volume"/>
-            </if>
-          </choose>
-        </group>
-        <choose>
-          <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix="&#160;"/>
+          <group delimiter="&#160;">
+            <text term="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter="&#160;">
+            <text term="issue" form="short"/>
             <text variable="issue"/>
-          </if>
-        </choose>
+          </group>
+        </group>
       </if>
       <else-if type="webpage" match="any">
         <date variable="issued">
diff --git a/pravnik.csl b/pravnik.csl
index 4bddd272dbe..eca2de38921 100644
--- a/pravnik.csl
+++ b/pravnik.csl
@@ -15,7 +15,7 @@
     <category field="law"/>
     <issn>0231-6625</issn>
     <summary>Suitable for Právník - a journal published by the Institute of State and Law of the Czech Academy of Sciences.</summary>
-    <updated>2020-05-25T10:00:00+00:00</updated>
+    <updated>2020-05-30T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="cs">
@@ -220,21 +220,17 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
           <date variable="issued">
-            <date-part name="year" range-delimiter="&#8211;"/>
+            <date-part name="year" range-delimiter="&#160;&#8211;&#160;"/>
           </date>
-          <choose>
-            <if variable="volume">
-              <text term="volume" form="short" suffix="&#160;"/>
-              <text variable="volume"/>
-            </if>
-          </choose>
-        </group>
-        <choose>
-          <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix="&#160;"/>
+          <group delimiter="&#160;">
+            <text term="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter="&#160;">
+            <text term="issue" form="short"/>
             <text variable="issue"/>
-          </if>
-        </choose>
+          </group>
+        </group>
       </if>
       <else-if type="webpage" match="any">
         <date variable="issued">