diff --git a/masarykova-univerzita-pravnicka-fakulta.csl b/masarykova-univerzita-pravnicka-fakulta.csl
index 49efc26847e..c6cdff54eda 100644
--- a/masarykova-univerzita-pravnicka-fakulta.csl
+++ b/masarykova-univerzita-pravnicka-fakulta.csl
@@ -14,7 +14,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Masaryk University, Faculty of Law</summary>
-    <updated>2020-04-18T10:00:00+00:00</updated>
+    <updated>2020-05-14T10: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">
@@ -22,7 +22,7 @@
       <term name="accessed" form="short">cit.</term>
       <term name="editor" form="short">
         <single>ed.</single>
-        <multiple>eds.</multiple>
+        <multiple>eds</multiple>
       </term>
     </terms>
   </locale>
@@ -44,14 +44,14 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
@@ -63,14 +63,14 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
@@ -82,14 +82,14 @@
     <choose>
       <if variable="author">
         <names variable="author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". " form="short">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". " form="short">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
@@ -113,7 +113,7 @@
     <choose>
       <if variable="container-author">
         <names variable="container-author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
         </names>
@@ -122,7 +122,7 @@
         <choose>
           <if type="chapter paper-conference" match="any">
             <names variable="editor">
-              <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+              <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
                 <name-part name="family" text-case="capitalize-first"/>
               </name>
               <label prefix=" (" form="short" plural="contextual" suffix=")."/>
@@ -136,7 +136,7 @@
     <choose>
       <if variable="container-author">
         <names variable="container-author">
-          <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+          <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
             <name-part name="family" text-case="capitalize-first"/>
           </name>
         </names>
@@ -145,7 +145,7 @@
         <choose>
           <if type="chapter paper-conference" match="any">
             <names variable="editor">
-              <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with=". ">
+              <name name-as-sort-order="all" sort-separator=",&#160;" delimiter=", " initialize-with=". ">
                 <name-part name="family" text-case="capitalize-first"/>
               </name>
               <label prefix=" (" form="short" plural="contextual" suffix=")."/>
@@ -237,7 +237,7 @@
   <macro name="publisher-place">
     <group delimiter="; ">
       <choose>
-        <if variable="publisher-place accessed DOI URL" match="any">
+        <if variable="publisher-place URL" match="any">
           <text variable="publisher-place"/>
         </if>
       </choose>
@@ -246,7 +246,7 @@
   <macro name="printers">
     <group delimiter="; ">
       <choose>
-        <if variable="publisher accessed DOI URL" match="any">
+        <if variable="publisher URL" match="any">
           <text variable="publisher"/>
         </if>
       </choose>
@@ -258,29 +258,40 @@
       <text macro="printers"/>
     </group>
   </macro>
+  <macro name="issued-year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <date variable="issued">
-          <date-part name="year" range-delimiter="&#8211;"/>
-        </date>
         <choose>
-          <if variable="volume">
-            <text prefix=", " term="volume" form="short" suffix=". "/>
-            <text variable="volume"/>
+          <if variable="issued" match="any">
+            <date variable="issued">
+              <date-part name="year" range-delimiter="&#8211;"/>
+            </date>
           </if>
+          <else>
+            <choose>
+              <if variable="volume">
+                <text term="volume" form="short" suffix="&#160;"/>
+                <text variable="volume"/>
+              </if>
+            </choose>
+          </else>
         </choose>
         <choose>
           <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix=". "/>
+            <text prefix=", " term="issue" form="short" suffix="&#160;"/>
             <text variable="issue"/>
           </if>
         </choose>
       </if>
       <else-if type="webpage" match="any">
         <date variable="issued">
-          <date-part name="day" suffix=". "/>
-          <date-part name="month" suffix=". " form="numeric"/>
+          <date-part name="day" suffix=".&#160;"/>
+          <date-part name="month" suffix=".&#160;" form="numeric"/>
           <date-part name="year"/>
         </date>
       </else-if>
@@ -298,7 +309,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
-    <label variable="locator" form="short" suffix=". "/>
+    <label variable="locator" form="short" suffix="&#160;"/>
     <text variable="locator"/>
   </macro>
   <macro name="collection">
@@ -313,31 +324,29 @@
   <macro name="identifier">
     <group delimiter="; ">
       <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="doi: "/>
+        <if variable="URL">
+          <text variable="URL"/>
         </if>
-        <else>
-          <text variable="URL" prefix=""/>
-        </else>
       </choose>
     </group>
   </macro>
   <macro name="medium">
     <choose>
-      <if variable="accessed DOI URL" match="any">
-        <text term="online" prefix="[" suffix="]"/>
+      <if variable="URL" match="any">
+        <choose>
+          <if type="webpage">
+            <text term="online" prefix="[" suffix="]"/>
+          </if>
+        </choose>
       </if>
-      <else>
-        <text variable="archive" prefix="[" suffix="]"/>
-      </else>
     </choose>
   </macro>
   <macro name="quoted">
     <group prefix="[" suffix="]">
-      <text term="accessed" form="short" suffix=". "/>
+      <text term="accessed" form="short" suffix="&#160;"/>
       <date variable="accessed">
-        <date-part name="day" suffix=". "/>
-        <date-part name="month" suffix=". " form="numeric"/>
+        <date-part name="day" suffix=".&#160;"/>
+        <date-part name="month" suffix=".&#160;" form="numeric"/>
         <date-part name="year"/>
       </date>
     </group>
@@ -357,6 +366,11 @@
         <else-if position="subsequent">
           <text macro="contributors-short" suffix=". "/>
           <text macro="title-short" font-style="italic"/>
+          <choose>
+            <if variable="author" match="none">
+              <text prefix=", " macro="issued-year"/>
+            </if>
+          </choose>
           <text macro="locator-or-period"/>
         </else-if>
         <else>
@@ -367,11 +381,11 @@
               <text macro="container"/>
               <text prefix=". " variable="volume" text-case="capitalize-first"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier" suffix="."/>
+                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <choose>
@@ -400,11 +414,11 @@
               </choose>
               <text macro="container"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier" suffix="."/>
+                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
                   <text prefix=". " macro="issued"/>
@@ -418,10 +432,10 @@
               <text macro="container"/>
               <text prefix=". " macro="issued"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier" suffix="."/>
+                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
                   <text macro="locator-or-period"/>
@@ -442,11 +456,11 @@
               <text macro="title-long" font-style="italic"/>
               <text prefix=" " macro="medium"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier" suffix="."/>
+                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <choose>
@@ -494,13 +508,13 @@
           <text macro="container-full"/>
           <text prefix=". " variable="volume" text-case="capitalize-first"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " macro="identifier" suffix="."/>
+              <text prefix=". " macro="identifier"/>
             </if>
             <else-if variable="issued" match="none">
               <text prefix=". " macro="edition" suffix="."/>
@@ -536,10 +550,10 @@
           <text macro="container-full"/>
           <text prefix=". " macro="issued"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " macro="identifier" suffix="."/>
+              <text prefix=". " macro="identifier"/>
             </if>
             <else>
               <text prefix=", " macro="page-range" suffix="."/>
@@ -552,10 +566,10 @@
           <text macro="container-full"/>
           <text prefix=". " macro="issued"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " macro="identifier" suffix="."/>
+              <text prefix=". " macro="identifier"/>
             </if>
             <else>
               <text prefix=", " macro="page-range" suffix="."/>
@@ -570,18 +584,18 @@
           <text prefix=", " variable="genre"/>
           <text prefix=", " variable="publisher" suffix="."/>
         </else-if>
-        <else>
+        <else-if type="bill legal_case legislation" match="none">
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" font-style="italic"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=" " macro="medium"/>
               <text prefix=". " macro="secondary-contributors"/>
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued"/>
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " macro="identifier" suffix="."/>
+              <text prefix=". " macro="identifier"/>
             </if>
             <else-if variable="issued" match="none">
               <text prefix=" " macro="medium" suffix="."/>
@@ -599,7 +613,7 @@
               <text prefix=". " macro="collection" suffix="."/>
             </else>
           </choose>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>