Index: openacs-4/packages/faq-portlet/www/faq-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/faq-portlet/www/faq-portlet.tcl	16 Feb 2019 09:33:45 -0000	1.19.2.1
+++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl	1 Mar 2019 10:21:59 -0000	1.19.2.2
@@ -28,7 +28,7 @@
 
 set shaded_p $config(shaded_p)
 set list_of_package_ids $config(package_id)
-set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
+set one_instance_p [expr {[llength $list_of_package_ids] == 1}]
 
 template::list::create -name faqs -multirow faqs -key faq_id -no_data [_ faq-portlet.no_faqs] -elements {
     faq_name {
Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v
diff -u -r1.31.2.1 -r1.31.2.2
--- openacs-4/packages/categories/tcl/category-trees-procs.tcl	15 Feb 2019 18:18:00 -0000	1.31.2.1
+++ openacs-4/packages/categories/tcl/category-trees-procs.tcl	1 Mar 2019 10:27:05 -0000	1.31.2.2
@@ -374,7 +374,7 @@
                 set tree [list]
             }
             set tree_id_old $tree_id
-            lappend tree [list $category_id [ad_decode "$invalid_p$deprecated_p" "" f t] $cur_level]
+            lappend tree [list $category_id [expr {"$invalid_p$deprecated_p" eq "" ? f : t}] $cur_level]
             if { $right_ind - $left_ind > 1} {
                 incr cur_level 1
                 set invalid_p "$invalid_p$deprecated_p"
@@ -405,7 +405,7 @@
         set invalid_p ""
         set tree [list]
         db_foreach flush_cache "" {
-            lappend tree [list $category_id [ad_decode "$invalid_p$deprecated_p" "" f t] $cur_level]
+            lappend tree [list $category_id [expr {"$invalid_p$deprecated_p" eq "" ? f : t}] $cur_level]
             if { $right_ind - $left_ind > 1} {
                 incr cur_level 1
                 set invalid_p "$invalid_p$deprecated_p"