Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.239.2.51 -r1.239.2.52
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	26 Aug 2020 18:35:00 -0000	1.239.2.51
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	27 Aug 2020 09:44:23 -0000	1.239.2.52
@@ -4312,12 +4312,16 @@
     }
 
     if {![info exists form_item_id]} {
-      # Start for search for form in the directory of the including
-      # form.  The provided package_id and parent_id refers to the
-      # form instances, not to the forms.
+      #
+      # Resolve forms by name, since we have no id.  The variable
+      # "$form" can be acutally refer to multiple forms in the ususal
+      # syntax, therefore the result has the plural form.
+      #
       set form_item_ids [::$package_id instantiate_forms \
                              -parent_id $parent_id \
-                             -default_lang [$o lang]]
+                             -default_lang [$o lang] \
+                             -forms $form \
+                            ]
       if {$form_item_ids eq ""} {
         return -code error "could not load form '$form' (default-language [$o lang])"
       }