Index: /home/mh/eclipse/SVN/Slim/Web/Pages.pm
===================================================================
--- /home/mh/eclipse/SVN/Slim/Web/Pages.pm	(revision 3152)
+++ /home/mh/eclipse/SVN/Slim/Web/Pages.pm	(working copy)
@@ -69,14 +69,7 @@
 				my $terms = shift;
 				my $type = shift || 'track';
 
-				my $sortBy = 'title';
-				my %find   = ();
-
-				for my $string (@{$terms}) {
-					push @{$find{'track.titlesort'}}, [ $string ];
-				}
-
-				return $ds->find($type, \%find, $sortBy);
+return $ds->find($type, { "track.titlesort" => $terms }, 'title');
 			},
 
 			'listItem' => sub {
Index: /home/mh/eclipse/SVN/Slim/Buttons/Search.pm
===================================================================
--- /home/mh/eclipse/SVN/Slim/Buttons/Search.pm	(revision 3152)
+++ /home/mh/eclipse/SVN/Slim/Buttons/Search.pm	(working copy)
@@ -205,7 +205,7 @@
 	# search which is effectively \b for the query. We might (should?)
 	# deal with alternate separator characters other than space.
 	if (Slim::Utils::Prefs::get('searchSubString')) {
-		return $term;
+return [ $term ];
 	}
 
 	return [ $term, "* $term" ];