diff --git a/Koha/Clubs.pm b/Koha/Clubs.pm
index 618326bc3a..4c3bccabce 100644
--- a/Koha/Clubs.pm
+++ b/Koha/Clubs.pm
@@ -88,7 +88,9 @@ sub get_enrollable {
 
 =head3 filter_out_empty
 
-    Remove clubs without current enrollments.
+    my $filtered_rs = $clubs_rs->filter_out_empty;
+
+Return a new I<Koha::Clubs> resultset, containing only clubs with current enrollments.
 
 =cut
 
@@ -97,10 +99,6 @@ sub filter_out_empty {
     return $self->search(
         {
             -and => [
-                [
-                    { name        => { like => '%x%' } },
-                    { description => { like => '%x%' } },
-                ],
                 { 'club_enrollments.club_id'       => { '!=' => undef } },
                 { 'club_enrollments.date_canceled' => undef },
             ]
diff --git a/reserve/request.pl b/reserve/request.pl
index fd67560d4c..6079089135 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -145,7 +145,12 @@ if($findclub) {
     if( $club ) {
         $club_hold = $club->id;
     } else {
-        my @clubs = Koha::Clubs->search->filter_out_empty;
+        my @clubs = Koha::Clubs->search(
+            [
+                { name        => { like => '%' . $findclub . '%' } },
+                { description => { like => '%' . $findclub . '%' } }
+            ]
+        )->filter_out_empty->as_list;
 
         if( scalar @clubs == 1 ) {
             $club_hold = $clubs[0]->id;