diff --git a/authorities/detail.pl b/authorities/detail.pl
index 4589c62f83..b2532385d9 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -143,7 +143,14 @@ sub build_tabs {
                                      . C4::Koha::display_marc_indicators($field) 
                                      . ' - '
                                      . $tagslib->{$field->tag()}->{lib};
+                      $tag_data{tag_number} = $tag;
+                      $tag_data{tag_desc} = $tagslib->{$field->tag()}->{lib};
                       $tag_data{subfield} = \@subfields_data;
+                      if ($tag >= 10){ # no indicator for theses tag
+                            $tag_data{ind1} = $field->indicator(1);
+                            $tag_data{ind2} = $field->indicator(2);
+                      }
+
                       push (@loop_data, \%tag_data);
                     }
                   }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
index 2dc44b4eda..27aecc9d43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -64,7 +64,11 @@
         [% IF ( innerloo.tag ) %]
             <div class="tag">
             <div class="tag_title">
-                [% innerloo.tag %]
+                <span class="tag_num">[% innerloo.tag_number | html %]</span>
+                [% IF (innerloo.defined("ind1") ) %]
+                    <span class="tag_ind1">[% innerloo.ind1 %]</span><span class="tag_ind2">[% innerloo.ind2 | html %]</span>
+                [% END %]
+                [% IF (innerloo.tag_desc) %]<span class="dashwrapper"> -</span> <span class="tag_desc">[% innerloo.tag_desc | html %]</span>[% END %]
             </div>
         [% ELSE %]
             <div class="tag">
@@ -72,9 +76,9 @@
         [% FOREACH subfiel IN innerloo.subfield %]
             <p>
                 <label class="labelsubfield">&nbsp;
-                [% UNLESS ( subfiel.hide_marc ) %]<b>[% subfiel.marc_subfield %]</b>[% END %]
-                <span title="[% subfiel.long_desc %]">[% subfiel.short_desc %]</span></label>
-                [% subfiel.marc_value %]
+                [% UNLESS ( subfiel.hide_marc ) %]<b>[% subfiel.marc_subfield | html %]</b>[% END %]
+                <span title="[% subfiel.long_desc | html %]" class="desc">[% subfiel.short_desc | html %]</span></label>
+                [% subfiel.marc_value | html %]
                 [% IF ( subfiel.link ) %]
                     <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=[% subfiel.link %]&amp;operator==&amp;type=intranet&amp;value=[% subfiel.marc_value |url %]">
                         <img src="[% interface %]/[% theme %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value %]">