diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
index cc25b9f11d..70904be156 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
@@ -1,6 +1,7 @@
 [% USE raw %]
 [% USE Asset %]
 [% USE AuthorisedValues %]
+[% USE Branches %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% IF ( do_it ) %]Review[% ELSE %]Review tags[% END %] &rsaquo; Tags &rsaquo; Tools &rsaquo; Koha</title>
@@ -64,9 +65,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             [% END %]</p>
             [% END %]
             </td>
-            <td>[% IF ( title.items ) %]<ul style="font-size:80%">[% FOREACH item IN title.items %]
+            <td>[% IF ( title.items.count ) %]<ul style="font-size:80%">[% FOREACH item IN title.items %]
                 <li>
-                    [% item.branchname | html %]
+                    [% Branches.GetName(item.holdingbranch) | html %]
                     <span class="shelvingloc">
                         [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
                     </span>
diff --git a/tags/list.pl b/tags/list.pl
index ac2ccbc8b1..b9aec1aa19 100755
--- a/tags/list.pl
+++ b/tags/list.pl
@@ -23,10 +23,11 @@ use CGI qw ( -utf8 );
 use C4::Auth qw( get_template_and_user );
 use C4::Biblio qw( GetBiblioData );
 use C4::Context;
-use C4::Items qw( GetItemsInfo );
 use C4::Tags qw( get_tag_rows get_tags remove_tag );
 use C4::Output qw( output_html_with_http_headers );
 
+use Koha::Biblios;
+
 my $needed_flags = { tools => 'moderate_tags'
 };    # FIXME: replace when more specific permission is created.
 
@@ -57,11 +58,13 @@ else {
     if ($tag) {
         my $taglist = get_tag_rows( { term => $tag } );
         for ( @{$taglist} ) {
+            # FIXME We should use Koha::Biblio here
             my $dat    = &GetBiblioData( $_->{biblionumber} );
-            my @items = GetItemsInfo( $_->{biblionumber} );
+            my $biblio = Koha::Biblios->find($dat->{biblionumber});
+            my $items = $biblio->items->search_ordered;
             $dat->{biblionumber} = $_->{biblionumber};
             $dat->{tag_id}       = $_->{tag_id};
-            $dat->{items}        = \@items;
+            $dat->{items}        = $items;
             $dat->{TagLoop}      = get_tags(
                 {
                     biblionumber => $_->{biblionumber},