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.542.2.122 -r1.542.2.123
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Nov 2021 17:23:28 -0000	1.542.2.122
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Nov 2021 14:53:55 -0000	1.542.2.123
@@ -4366,7 +4366,7 @@
           if {$op eq "contains"} {
             #make approximate query
             set lhs_var instance_attributes
-            set rhs $rhs_expr
+            set sql_rhs $rhs_expr
             lappend sql_clause [subst -nocommands $op_map($op,sql)]
           }
           set lhs_var "\[dict get \$__ia $lhs\]"
Index: openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl,v
diff -u -r1.1.2.19 -r1.1.2.20
--- openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	25 Nov 2021 13:30:13 -0000	1.1.2.19
+++ openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl	25 Nov 2021 14:53:55 -0000	1.1.2.20
@@ -802,7 +802,7 @@
 
         ? {::xowiki::FormPage filter_expression \
                "betreuer contains en:person1" &&} \
-            {tcl {{en:person1} in [dict get $__ia betreuer]} h {} vars {betreuer {}} sql {{instance_attributes like '%en:person1%'}}} \
+            {tcl {({en:person1} in [dict get $__ia betreuer])} h {} vars {betreuer {}} sql {{instance_attributes like '%en:person1%'}}} \
             filter_expr_where_3
 
         ? {::xowiki::FormPage filter_expression \
@@ -812,7 +812,7 @@
 
         ? {::xowiki::FormPage filter_expression \
                "_state= closed|accepted || x = 1" ||} \
-            {tcl {[lsearch -exact {closed accepted} [:property _state]] > -1||[dict get $__ia x] eq {1}} h x=>1 vars {x {}} sql {{state in ('closed','accepted')}}} \
+            {tcl {[lsearch -exact {closed accepted} [:property _state]] > -1||([dict get $__ia x] eq {1})} h x=>1 vars {x {}} sql {{state in ('closed','accepted')}}} \
             filter_expr_unless_1