Index: Slim/Web/Pages/Search.pm
===================================================================
--- Slim/Web/Pages/Search.pm	(revision 12397)
+++ Slim/Web/Pages/Search.pm	(working copy)
@@ -368,6 +368,10 @@
 		} elsif ($type eq 'album') {
 
 			$form{'hierarchy'} = 'album,track';
+		
+		} elsif ($type eq 'genre') {
+		
+			$form{'hierarchy'} = 'genre,contributor,album,track';
 		}
 
 		$obj->displayAsHTML(\%form, $descend);
Index: strings.txt
===================================================================
--- strings.txt	(revision 12397)
+++ strings.txt	(working copy)
@@ -11262,6 +11262,12 @@
 	SV	Låtar som matchar
 	ZH_CN	歌曲标¢˜匹配
 
+GENREMATCHING
+	EN	Genre matching
+
+GENRESMATCHING
+	EN	Genres matching
+
 MORE
 	DE	Mehr
 	EN	More
Index: Slim/Schema/Genre.pm
===================================================================
--- Slim/Schema/Genre.pm	(revision 12397)
+++ Slim/Schema/Genre.pm	(working copy)
@@ -48,6 +48,8 @@
 sub displayAsHTML {
 	my ($self, $form, $descend, $sort) = @_;
 
+	$form->{'text'}       = $self->name;
+
 	my $Imports = Slim::Music::Import->importers;
 
 	for my $mixer (keys %{$Imports}) {