diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 9ea3b2dbb9..010fad7c78 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -979,8 +979,8 @@ sub BuildSummary {
 
         # Other forms
         @otherscript = map { {
-            lang      => $_->subfield('8') || '',
-            term      => $_->subfield('a'),
+            lang      => length ($_->subfield('8')) == 6 ? substr ($_->subfield('8'), 3, 3) : $_->subfield('8') || '',
+            term      => $_->subfield('a') . ($_->subfield('b') ? ', ' . $_->subfield('b') : ''),
             direction => 'ltr',
             field     => $_->tag,
         } } $record->field('7..');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
index 366c695296..2ee4571021 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
@@ -44,6 +44,14 @@
            [% END %]
            </div>
           [% END %]
+          [% IF summary.seefrom %]
+            <div class="authres_seefrom">
+            [% FOREACH see IN summary.seefrom %]
+              [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
+              [% IF ! loop.last %] ; [% END %]
+            [% END %]
+            </div>
+          [% END %]
           [% IF summary.seealso %]
             <div class="authres_seealso">
             [% FOREACH see IN summary.seealso %]
@@ -87,6 +95,10 @@
    [% CASE ['it', 'ita'] %]Italian
    [% CASE ['de', 'ger', 'deu'] %]German
    [% CASE ['es', 'spa'] %]Spanish
+   [% CASE ['heb'] %]Hebrew
+   [% CASE ['ara'] %]Arabic
+   [% CASE ['gre'] %]Greek (modern)
+   [% CASE ['grc'] %]Greek (to 1453)
    [% CASE %][% lang %]
   [% END %]
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
index b113049c24..ea2aa168ae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
@@ -47,6 +47,14 @@
              [% END %]
              </div>
             [% END %]
+            [% IF summary.seefrom %]
+              <div class="authres_seefrom">
+              [% FOREACH see IN summary.seefrom %]
+                 [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
+                 [% IF ! loop.last %] ; [% END %]
+              [% END %]
+              </div>
+            [% END %]
             [% IF summary.seealso %]
               <div class="authres_seealso">
               [% FOREACH see IN summary.seealso %]
@@ -82,3 +90,12 @@
         [% END %]
     [% END %]
 [% END %]
+[% BLOCK language %]
+  [% SWITCH lang %]
+   [% CASE ['heb'] %]Hebrew
+   [% CASE ['ara'] %]Arabic
+   [% CASE ['gre'] %]Greek (modern)
+   [% CASE ['grc'] %]Greek (to 1453)
+   [% CASE %][% lang %]
+  [% END %]
+[% END %]