--- SlimServer_6.5_v2007-04-27/Slim/Web/Pages/Search.pm	2007-03-28 10:09:14.000000000 +0200
+++ SlimServer_6.5_cvs/Slim/Web/Pages/Search.pm	2007-04-28 16:40:38.000000000 +0200
@@ -35,7 +35,7 @@
 
 	my $player = $params->{'player'};
 	my $query  = $params->{'query'};
-
+	
 	# set some defaults for the template
 	$params->{'browse_list'}  = " ";
 	$params->{'numresults'}   = -1;
@@ -43,7 +43,7 @@
 	$params->{'artwork'}      = 0;
 
 	# short circuit
-	if (!defined($query) || ($params->{'manualSearch'} && !$query)) {
+	if (!defined($query) || ($params->{'manualSearch'} && $query eq '')) {
 		return Slim::Web::HTTP::filltemplatefile("search.html", $params);
 	}
 
@@ -271,7 +271,7 @@
 	my ($params, $rs, $qstring, $advancedSearch) = @_;
 
 	my $player = $params->{'player'};
-	my $query  = $params->{'query'}  || '';
+	my $query  = defined($params->{'query'}) ? $params->{'query'} : '';
 	my $type   = lc($rs->result_source->source_name) || 'track';
 	my $count  = $rs->count || return 0;