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 -N -r1.485.2.55 -r1.485.2.56
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Feb 2017 10:03:30 -0000	1.485.2.55
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Feb 2017 17:01:13 -0000	1.485.2.56
@@ -1327,7 +1327,7 @@
   FormPage instproc hstore_attributes {} {
     # Per default, we save all instance attributes in hstore, but a
     # subclass/object might have different requirements.
-    return [my instance_attributes]
+    return ${:instance_attributes}
   }
 
   #
@@ -1350,11 +1350,10 @@
       state = :state}
 
     if {$useHstore} {
-      set hkey [::xowiki::hstore::dict_as_hkey $instance_attributes]
+      set hkey [::xowiki::hstore::dict_as_hkey [my hstore_attributes]]
       append updateVars ", hkey = '$hkey'"
     }
 
-
     set rows [xo::dc dml update_xowiki_form_instance_item_index [subst {
       update xowiki_form_instance_item_index
       set $updateVars
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.37.2.12 -r1.37.2.13
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	20 Feb 2017 09:39:05 -0000	1.37.2.12
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	25 Feb 2017 17:01:13 -0000	1.37.2.13
@@ -130,7 +130,9 @@
     ns_log notice "$package_id: ::xo::Package initialize took [expr {$t1-$t0}]ms"
     set t0 $t1
 
-    if {![::xo::dc has_hstore] && [$package_id get_parameter use_hstore 0] } {return 0}
+    if {![::xo::dc has_hstore] && [$package_id get_parameter use_hstore 0] } {
+      return 0
+    }
 
     set sql {
       select * from xowiki_form_instance_item_view