diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index 1a76f1d998..2527a09021 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -55,6 +55,8 @@ my $authid       = $query->param('authid');
 my $index        = $query->param('index');
 my $tagid        = $query->param('tagid');
 my $relationship = $query->param('relationship');
+my $source       = $query->param('source');
+my $marcflavour  = C4::Context->preference("marcflavour");
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -85,7 +87,10 @@ if ($authid) {
     # Get all values for each distinct subfield and add to subfield loop
     my %done_subfields;
     for ( $field->subfields ) {
-        next if $_->[0] eq '9';    # $9 will be set with authid value
+        if ( $marcflavour eq 'UNIMARC' ) {
+            next if $_->[0] eq '3';    # $3 will be set with authid value (in UNIMARC authority records)
+        }
+        next if $_->[0] eq '9';        # $9 will be set with authid value
         my $letter = $_->[0];
         $letter ||= '@';
         next if defined $done_subfields{$letter};
@@ -94,7 +99,17 @@ if ($authid) {
         $done_subfields{$letter} = 1;
     }
 
-    push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ($relationship);
+    # If a relationship code has been selected, add it to the appropriate
+    # subfield of @subfield_loop, depending on the MARC flavour being used.
+    if ($relationship) {
+        my $relationship_subfield;
+        if ( $marcflavour eq 'UNIMARC' ) {
+            $relationship_subfield = '5';
+        } elsif ( $marcflavour eq 'MARC21' ) {
+            $relationship_subfield = 'w';
+        }
+        push @subfield_loop, { marc_subfield => $relationship_subfield, marc_values => $relationship };
+    }
 
     # Copy the ISNI number over (should one exist) to subfield $o when linking
     # authorities with authorities in UNIMARC instances. This only applies to
@@ -142,7 +157,8 @@ $template->param(
     indicator2    => $indicator2,
     SUBFIELD_LOOP => \@subfield_loop,
     tag_number    => $tag_number,
-    rancor        => $index =~ /rancor$/,
+    rancor        => ( $index =~ /rancor$/ ) ? 1 : 0,
+    source        => $source,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
index 3812099def..2d5ad70bbe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
@@ -1,6 +1,8 @@
 [% USE To %]
+[% USE Koha %]
 [% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
+[% SET marcflavour = Koha.Preference('marcflavour') %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title
     >[% FILTER collapse %]
@@ -38,7 +40,10 @@
                         [%- FOREACH marc_value IN SUBFIELD_LOO.marc_values -%]
                             [%- To.json( marc_value ) | html -%]
                         [%- END -%]
-                    [%- END -%]‡9[% authid | html %]";
+                    [%- END -%]
+                    [% IF ( marcflavour == 'UNIMARC' ) %]‡3[% authid | html %]";
+                    [% ELSIF ( marcflavour == 'MARC21' ) %]‡9[% authid | html %]";
+                    [% END %]
                 [% END %]
                 RancorReplaceField( new_line, "[% indicator1 | html %]", "[% indicator2 | html %]" );
             [% ELSE %]
@@ -167,7 +172,16 @@
                     [% IF ( clear ) %]
                         if (subfield){subfield.value="" ;}
                     [% ELSE %]
-                        if(code.value=='9'){
+                        [% IF ( marcflavour == 'UNIMARC' ) %]
+                            [% IF ( source == 'auth' ) %]
+                                var authid_subfield = "3";
+                            [% ELSIF ( source == 'biblio' ) %]
+                                var authid_subfield = "9";
+                            [% END %]
+                        [% ELSIF ( marcflavour == 'MARC21' ) %]
+                            var authid_subfield = "9";
+                        [% END %]
+                        if(code.value==authid_subfield){
                             subfield.value = "[% To.json(authid) | $raw %]";
                             subfield.className = subfield.className.replace("no_matching_authority_field", "matching_authority_field");
                             break;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index 363ae676a3..46e8eca9b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -156,14 +156,15 @@
         }
 
         function doauth(authid, index, repet){
-            [% IF source == 'auth' %]
+            var source = "[% source | uri %]";
+            if ( source == 'auth' ) {
                 var elem = document.getElementById("special_relationship");
                 var relationship = elem.options[elem.selectedIndex].value;
 
-                jumpfull('blinddetail-biblio-search.pl?authid=' + authid + '&index=' + index + '&repet=' + repet + '&relationship=' + relationship);
-            [% ELSE %]
-                jumpfull('blinddetail-biblio-search.pl?authid=' + authid + '&index=' + index + '&repet=' + repet);
-            [% END %]
+                jumpfull('blinddetail-biblio-search.pl?authid=' + authid + '&index=' + index + '&repet=' + repet + '&source=' + source + '&relationship=' + relationship);
+            } else {
+                jumpfull('blinddetail-biblio-search.pl?authid=' + authid + '&index=' + index + '&repet=' + repet + '&source=' + source);
+            }
         }
     </script>
 [% END %]