diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index 6f89a653b98..d0f5ffdfd18 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -897,36 +897,42 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <choose>
-                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-                    <if variable="event-title">
-                      <text variable="event-title"/>
-                    </if>
-                    <else>
-                      <text variable="event"/>
-                    </else>
-                  </choose>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <choose>
+                        <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                            This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                        <if variable="event-title">
+                          <text variable="event-title"/>
+                        </if>
+                        <else>
+                          <text variable="event"/>
+                        </else>
+                      </choose>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 1b20359e271..1c515b4c2f1 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -896,36 +896,42 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <choose>
-                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-                    <if variable="event-title">
-                      <text variable="event-title"/>
-                    </if>
-                    <else>
-                      <text variable="event"/>
-                    </else>
-                  </choose>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <choose>
+                        <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                            This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                        <if variable="event-title">
+                          <text variable="event-title"/>
+                        </if>
+                        <else>
+                          <text variable="event"/>
+                        </else>
+                      </choose>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index bf0e3f36b8f..a2bbdf461be 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -1552,21 +1552,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-cv.csl b/apa-cv.csl
index 0edf4f0f069..ef4a89a059a 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -1299,21 +1299,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index a2fcfa4a317..691c2e0e0a5 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -1552,21 +1552,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 168cb7deb32..dfc139f1131 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -903,36 +903,42 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <choose>
-                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-                    <if variable="event-title">
-                      <text variable="event-title"/>
-                    </if>
-                    <else>
-                      <text variable="event"/>
-                    </else>
-                  </choose>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <choose>
+                        <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                            This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                        <if variable="event-title">
+                          <text variable="event-title"/>
+                        </if>
+                        <else>
+                          <text variable="event"/>
+                        </else>
+                      </choose>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
diff --git a/apa-no-initials.csl b/apa-no-initials.csl
index 49a20a72c0b..d2fbff38b12 100644
--- a/apa-no-initials.csl
+++ b/apa-no-initials.csl
@@ -1552,21 +1552,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index d49ffa909ae..79a204839fd 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -1355,21 +1355,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index 1edc7a4af82..067bcaf0c17 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -1355,21 +1355,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index a98bb2cf962..bdb2d87a4ae 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -897,36 +897,42 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <choose>
-                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-                    <if variable="event-title">
-                      <text variable="event-title"/>
-                    </if>
-                    <else>
-                      <text variable="event"/>
-                    </else>
-                  </choose>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <choose>
+                        <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                            This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                        <if variable="event-title">
+                          <text variable="event-title"/>
+                        </if>
+                        <else>
+                          <text variable="event"/>
+                        </else>
+                      </choose>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index 8a9de386e03..0abe741b45f 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -1552,21 +1552,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 0fa4010a865..981dd8be4c6 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -1552,21 +1552,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/apa.csl b/apa.csl
index 1171a9f815b..bd45e65e914 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1553,21 +1553,27 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="collection-editor editor editorial-director issue page volume" match="none">
-        <!-- Don't print event info if published in a proceedings -->
-        <group delimiter=", ">
-          <choose>
-            <!-- We expect "event-title" to be used, but applications may not be updated yet.
-                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
-            <if variable="event-title">
-              <text variable="event-title"/>
-            </if>
-            <else>
-              <text variable="event"/>
-            </else>
-          </choose>
-          <text variable="event-place"/>
-        </group>
+      <if variable="event">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <!-- Don't print event info if published in a proceedings -->
+            <group delimiter=", ">
+              <choose>
+                <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                    This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                <if variable="event-title">
+                  <text variable="event-title"/>
+                </if>
+                <else>
+                  <text variable="event"/>
+                </else>
+              </choose>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>