diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index ce972056dd..ede593e118 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -506,11 +506,13 @@
 
 <h1>Suggestions management</h1>
 
-<label for="branchcode">Viewing suggestions for library:</label>
-<select name="branchcode" id="branchcode">
-    <option value="__ANY__">Any</option>
-    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
-</select>
+[% IF ( displayby != "branchcode" ) %]
+    <label for="branchcode">Viewing suggestions for library:</label>
+    <select name="branchcode" id="branchcode">
+        <option value="__ANY__">Any</option>
+        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
+    </select>
+[% END %]
 
 
 [% FOR m IN messages %]
@@ -540,6 +542,7 @@
                 [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
                 [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered
                 [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown
+                [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any
                 [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %]
             [% ELSE %]
                 [% IF ( suggestion.suggestiontype ) %]
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 4f5c915e53..560a524c77 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -61,8 +61,9 @@ sub GetCriteriumDesc{
         }
         return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
     }
-    return Koha::Libraries->find($criteriumvalue)->branchname
-        if $displayby =~ /branchcode/;
+    if ( $displayby =~ /branchcode/ ) {
+        return $criteriumvalue ? Koha::Libraries->find($criteriumvalue)->branchname : "__ANY__";
+    }
     if ( $displayby =~ /itemtype/ ) {
         my $av = Koha::AuthorisedValues->search({ category => 'SUGGEST_FORMAT', authorised_value => $criteriumvalue });
         return $av->count ? $av->next->lib : 'Unknown';