Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.46.2.3 -r1.46.2.4
--- openacs-4/packages/search/search.info	2 Mar 2021 13:47:22 -0000	1.46.2.3
+++ openacs-4/packages/search/search.info	22 Apr 2021 18:50:00 -0000	1.46.2.4
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d4" url="http://openacs.org/repository/download/apm/search-5.10.0d4.apm">
+    <version name="5.10.0d5" url="http://openacs.org/repository/download/apm/search-5.10.0d5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Site wide search</summary>
         <release-date>2017-08-06</release-date>
@@ -18,9 +18,9 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="search" version="5.10.0d4"/>
+        <provides url="search" version="5.10.0d5"/>
         <requires url="acs-service-contract" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.10.0d23"/>
+        <requires url="acs-tcl" version="5.10.0d45"/>
         <requires url="acs-templating" version="5.9.1"/>
 
         <callbacks>
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.41.2.2 -r1.41.2.3
--- openacs-4/packages/search/www/search.tcl	22 Feb 2021 17:01:44 -0000	1.41.2.2
+++ openacs-4/packages/search/www/search.tcl	22 Apr 2021 18:50:00 -0000	1.41.2.3
@@ -3,7 +3,7 @@
     @creation-date September 01, 2001
     @cvs-id $Id$
 } {
-    q:trim
+    q:printable,trim
     {t:trim ""}
     {offset:naturalnum,notnull 0}
     {num:range(0|200) 0}
@@ -93,8 +93,10 @@
 set urlencoded_query [ad_urlencode $q]
 
 set params [list $q $offset $limit $user_id $df]
-if {$search_package_id eq "" && [parameter::get -package_id $package_id -parameter SubsiteSearchP -default 1]
-    && [subsite::main_site_id] != [ad_conn subsite_id]} {
+if {$search_package_id eq ""
+    && [parameter::get -package_id $package_id -parameter SubsiteSearchP -default 1]
+    && [subsite::main_site_id] != [ad_conn subsite_id]
+} {
     # We are in a subsite and SubsiteSearchP is true
     set subsite_packages [concat [ad_conn subsite_id] [subsite::util::packages -node_id [ad_conn node_id]]]
     lappend params $subsite_packages