Index: openacs-4/packages/xowf/tcl/xowf-includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-includelet-procs.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/xowf/tcl/xowf-includelet-procs.tcl	27 Oct 2014 16:42:03 -0000	1.2
+++ openacs-4/packages/xowf/tcl/xowf-includelet-procs.tcl	27 Nov 2015 13:25:04 -0000	1.2.2.1
@@ -116,10 +116,10 @@
     my instvar items
     set t [TableWidget new -volatile \
                -columns {
-                 Field package -label Package
-                 AnchorField wf -label Workflow
-                 AnchorField title -label "Todo"
-                 Field state -label [::xowiki::FormPage::slot::state set pretty_name]
+                 Field create package -label Package
+                 AnchorField create wf -label Workflow
+                 AnchorField create title -label "Todo"
+                 Field create state -label [::xowiki::FormPage::slot::state set pretty_name]
                }]
     foreach i [$items children] {
       $i instvar wf_name name title state xowiki_form_page_id pid parent_id
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.200.2.5 -r1.200.2.6
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	16 Oct 2015 10:27:24 -0000	1.200.2.5
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	27 Nov 2015 13:24:37 -0000	1.200.2.6
@@ -964,21 +964,21 @@
                      -party_id [::xo::cc set untrusted_user_id]]
     set show_heritage $admin_p
 
-    TableWidget t1 -volatile \
+    TableWidget create t1 -volatile \
         -set allow_edit $allow_edit \
         -set allow_delete $allow_delete \
         -set show_heritage $admin_p \
         -columns {
-          Field date -label [_ xowiki.Page-last_modified]
+          Field create date -label [_ xowiki.Page-last_modified]
           if {[[my info parent] set allow_edit]} {
-            AnchorField edit -CSSclass edit-item-button -label "" -html {style "padding-right: 2px;"} -richtext 1
+            AnchorField create edit -CSSclass edit-item-button -label "" -html {style "padding-right: 2px;"} -richtext 1
           }
           if {[[my info parent] set show_heritage]} {
-            AnchorField inherited -label "" -CSSclass inherited
+            AnchorField create inherited -label "" -CSSclass inherited
           } 
-          AnchorField title -label [::xowiki::Page::slot::title set pretty_name]
+          AnchorField create title -label [::xowiki::Page::slot::title set pretty_name]
           if {[[my info parent] set allow_delete]} {
-            AnchorField delete -CSSclass delete-item-button -label "" -richtext 1
+            AnchorField create delete -CSSclass delete-item-button -label "" -richtext 1
           }
         }
 
@@ -1061,9 +1061,9 @@
     my get_parameters
     ::xo::Page requireCSS "/resources/acs-templating/lists.css"
 
-    TableWidget t1 -volatile \
+    TableWidget create t1 -volatile \
         -columns {
-          AnchorField title -label [::xowiki::Page::slot::title set pretty_name]
+          AnchorField create title -label [::xowiki::Page::slot::title set pretty_name]
         }
     
     xo::dc foreach get_pages \
@@ -1113,10 +1113,10 @@
       #
       my append title " in last $interval"
 
-      TableWidget t1 -volatile \
+      TableWidget create t1 -volatile \
           -columns {
-            AnchorField title -label [::xowiki::Page::slot::title set pretty_name]
-            Field users -label [_ xowiki.includelet-visitors] -html { align right }
+            AnchorField create title -label [::xowiki::Page::slot::title set pretty_name]
+            Field create users -label [_ xowiki.includelet-visitors] -html { align right }
           }
       set since_condition [::xo::dc since_interval_condition time $interval]
       xo::dc foreach get_pages \
@@ -1136,11 +1136,11 @@
                }
     } else {
 
-      TableWidget t1 -volatile \
+      TableWidget create t1 -volatile \
           -columns {
-            AnchorField title -label [::xowiki::Page::slot::title set pretty_name]
-            Field count -label [_ xowiki.includelets-visits] -html { align right }
-            Field users -label [_ xowiki.includelet-visitors] -html { align right }
+            AnchorField create title -label [::xowiki::Page::slot::title set pretty_name]
+            Field create count -label [_ xowiki.includelets-visits] -html { align right }
+            Field create users -label [_ xowiki.includelet-visitors] -html { align right }
           }
       xo::dc foreach get_pages \
           [::xo::dc select \
@@ -1229,10 +1229,10 @@
     my get_parameters
     ::xo::Page requireCSS "/resources/acs-templating/lists.css"
     
-    TableWidget t1 -volatile \
+    TableWidget create t1 -volatile \
         -columns {
-          Field user  -label [_ xowiki.includelet-visitors] -html { align right }
-          Field count -label [_ xowiki.includelets-visits] -html { align right }
+          Field create user  -label [_ xowiki.includelet-visitors] -html { align right }
+          Field create count -label [_ xowiki.includelets-visits] -html { align right }
         }
     ::xo::dc foreach most-frequent-visistors \
         [::xo::dc select \
@@ -1276,9 +1276,9 @@
     my get_parameters
     ::xo::Page requireCSS "/resources/acs-templating/lists.css"
 
-    TableWidget t1 -volatile \
+    TableWidget create t1 -volatile \
         -columns {
-          AnchorField title -label [::xowiki::Page::slot::title set pretty_name]
+          AnchorField create title -label [::xowiki::Page::slot::title set pretty_name]
         }
     set user_id [::xo::cc user_id]
     set or_clause "or i.item_id in (
@@ -3631,10 +3631,10 @@
       #
       # standard table encoder
       #
-      TableWidget t1 -volatile \
+      TableWidget create t1 -volatile \
           -columns {
-            Field value -orderby value -label value
-            Field count -orderby count -label count
+            Field create value -orderby value -label value
+            Field create count -orderby count -label count
           }
       
       lassign [split $orderby ,] att order
@@ -3886,27 +3886,27 @@
 
     set cols ""
     if {[info exists use_button(edit)]} {
-      append cols {AnchorField _edit -CSSclass edit-item-button -label "" \
+      append cols {AnchorField  create _edit -CSSclass edit-item-button -label "" \
                        -html {style "padding: 2px;"} -no_csv 1 -richtext 1} \n
     }
     if {[info exists use_button(view)]} {
-      append cols {AnchorField _view -CSSclass view-item-button -label "" \
+      append cols {AnchorField  create _view -CSSclass view-item-button -label "" \
                        -html {style "padding: 2px;"} -no_csv 1 -richtext 1} \n
     }
     foreach fn $field_names {
       if {[info exists __hidden($fn)]} continue
-      append cols [list AnchorField _$fn \
+      append cols [list AnchorField  create _$fn \
                        -label [$__ff($fn) label] \
                        -richtext 1 \
                        -orderby _$fn \
                       ] \n
     }
     if {[info exists use_button(delete)]} {
       #append cols [list ImageField_DeleteIcon _delete -label "" -no_csv 1] \n
-      append cols [list AnchorField _delete -CSSclass delete-item-button -label "" -no_csv 1 -richtext 1] \n
+      append cols [list AnchorField create _delete -CSSclass delete-item-button -label "" -no_csv 1 -richtext 1] \n
     }
 
-    set cmd [list TableWidget t1 -volatile -columns $cols]
+    set cmd [list TableWidget create t1 -volatile -columns $cols]
     if {$renderer ne ""} {
       lappend cmd -renderer $renderer
     } else {
Index: openacs-4/packages/xowiki/tcl/xowiki-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-init.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/tcl/xowiki-init.tcl	10 Sep 2015 08:10:40 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/tcl/xowiki-init.tcl	27 Nov 2015 13:24:37 -0000	1.1.2.3
@@ -6,7 +6,7 @@
 # are usable. If we would do thisduring loading, we would have
 # problems with not-yet loaded library files from other packages.
 #
-if {[nsv_exists xowiki must_update_hkeys]} {
+if {[nsv_exists xowiki must_update_hkeys] && [nsv_get xowiki must_update_hkeys]} {
     ::xowiki::hstore::update_update_all_form_instances
     nsv_unset xowiki must_update_hkeys
 }