Index: branches/release-33/lib/MT/Template/Context/Search.pm
===================================================================
--- branches/release-33/lib/MT/Template/Context/Search.pm (revision 1640)
+++ branches/release-33/lib/MT/Template/Context/Search.pm (revision 1708)
@@ -9,5 +9,5 @@
 use strict;
 use base qw( MT::Template::Context );
-use MT::Util qw( encode_url );
+use MT::Util qw( encode_url decode_html );
 
 sub load_core_tags {
@@ -134,8 +134,8 @@
 	my ( $ctx, $args, $cond ) = @_;
 
-    my $search_string = encode_url($ctx->stash('search_string'));
+    my $search_string = decode_html( $ctx->stash('search_string') ) ;
     my $cgipath = $ctx->_hdlr_cgi_path($args);
     my $script = $ctx->{config}->SearchScript;
-    my $link = $cgipath.$script . '?search=' . $search_string;
+    my $link = $cgipath.$script . '?search=' . encode_url( $search_string );
     if ( my $mode = $ctx->stash('mode') ) {
         $mode = encode_url($mode);