Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.153.2.22 -r1.153.2.23
--- openacs-4/packages/xowiki/xowiki.info	25 Nov 2016 14:46:19 -0000	1.153.2.22
+++ openacs-4/packages/xowiki/xowiki.info	27 Jan 2017 14:37:55 -0000	1.153.2.23
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d15" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d15.apm">
+    <version name="5.9.1d16" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d16.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2016-09-08</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d15"/>
+        <provides url="xowiki" version="5.9.1d16"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d13"/>
@@ -65,7 +65,7 @@
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.9.0"/>
         <requires url="general-comments" version="5.9.0"/>
-        <requires url="xotcl-core" version="0.150"/>
+        <requires url="xotcl-core" version="0.153"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.485.2.44 -r1.485.2.45
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Jan 2017 23:29:54 -0000	1.485.2.44
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Jan 2017 14:37:55 -0000	1.485.2.45
@@ -1470,6 +1470,7 @@
 
     @return cr item object
   } {
+
     #
     # We handle here just loading object instances via item_id, since
     # only live_revisions are kept in xowiki_form_instance_item_index.
@@ -1485,9 +1486,10 @@
     }
 
     $object set item_id $item_id
-    set success [$object db_0or1row [my qn fetch_from_view_item_id] {
+    set sql [::xo::dc prepare -name xowiki_form_instance_item_view -argtypes integer {
       select * from xowiki_form_instance_item_view where item_id = :item_id
     }]
+    set success [$object db_0or1row [my qn fetch_from_view_item_id] $sql]
     if {$success == 0} {
       error [subst {
         The form page with item_id $item_id was not found in the xowiki_form_instance_item_index.