diff --git a/cypress/integration/persistent-identifiers.spec.js b/cypress/integration/persistent-identifiers.spec.js
index 17b05538..9d32be25 100644
--- a/cypress/integration/persistent-identifiers.spec.js
+++ b/cypress/integration/persistent-identifiers.spec.js
@@ -1,228 +1,228 @@
 /**
  * Copyright (C) 2019-2020  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 let origin, originBadgeUrl, originBrowseUrl;
 let url, urlPrefix;
 let cntSWHID, cntSWHIDWithContext;
 let dirSWHID, dirSWHIDWithContext;
 let relSWHID, relSWHIDWithContext;
 let revSWHID, revSWHIDWithContext;
 let snpSWHID, snpSWHIDWithContext;
 let testsData;
 const firstSelLine = 6;
 const lastSelLine = 12;
 
 describe('Persistent Identifiers Tests', function() {
 
   before(function() {
     origin = this.origin[1];
     url = `${this.Urls.browse_origin_content()}?origin_url=${origin.url}&path=${origin.content[0].path}`;
     url = `${url}&release=${origin.release}#L${firstSelLine}-L${lastSelLine}`;
     originBadgeUrl = this.Urls.swh_badge('origin', origin.url);
     originBrowseUrl = `${this.Urls.browse_origin()}?origin_url=${origin.url}`;
     cy.visit(url).window().then(win => {
       urlPrefix = `${win.location.protocol}//${win.location.hostname}`;
       if (win.location.port) {
         urlPrefix += `:${win.location.port}`;
       }
       const swhids = win.swh.webapp.getSwhIdsContext();
       cntSWHID = swhids.content.swhid;
       cntSWHIDWithContext = swhids.content.swhid_with_context;
       cntSWHIDWithContext += `;lines=${firstSelLine}-${lastSelLine}`;
       dirSWHID = swhids.directory.swhid;
       dirSWHIDWithContext = swhids.directory.swhid_with_context;
       revSWHID = swhids.revision.swhid;
       revSWHIDWithContext = swhids.revision.swhid_with_context;
       relSWHID = swhids.release.swhid;
       relSWHIDWithContext = swhids.release.swhid_with_context;
       snpSWHID = swhids.snapshot.swhid;
       snpSWHIDWithContext = swhids.snapshot.swhid_with_context;
 
       testsData = [
         {
           'objectType': 'content',
           'objectSWHIDs': [cntSWHIDWithContext, cntSWHID],
           'badgeUrl': this.Urls.swh_badge('content', swhids.content.object_id),
           'badgeSWHIDUrl': this.Urls.swh_badge_swhid(cntSWHID),
           'browseUrl': this.Urls.browse_swhid(cntSWHIDWithContext)
         },
         {
           'objectType': 'directory',
           'objectSWHIDs': [dirSWHIDWithContext, dirSWHID],
           'badgeUrl': this.Urls.swh_badge('directory', swhids.directory.object_id),
           'badgeSWHIDUrl': this.Urls.swh_badge_swhid(dirSWHID),
           'browseUrl': this.Urls.browse_swhid(dirSWHIDWithContext)
         },
         {
           'objectType': 'release',
           'objectSWHIDs': [relSWHIDWithContext, relSWHID],
           'badgeUrl': this.Urls.swh_badge('release', swhids.release.object_id),
           'badgeSWHIDUrl': this.Urls.swh_badge_swhid(relSWHID),
           'browseUrl': this.Urls.browse_swhid(relSWHIDWithContext)
         },
         {
           'objectType': 'revision',
           'objectSWHIDs': [revSWHIDWithContext, revSWHID],
           'badgeUrl': this.Urls.swh_badge('revision', swhids.revision.object_id),
           'badgeSWHIDUrl': this.Urls.swh_badge_swhid(revSWHID),
           'browseUrl': this.Urls.browse_swhid(revSWHIDWithContext)
         },
         {
           'objectType': 'snapshot',
           'objectSWHIDs': [snpSWHIDWithContext, snpSWHID],
           'badgeUrl': this.Urls.swh_badge('snapshot', swhids.snapshot.object_id),
           'badgeSWHIDUrl': this.Urls.swh_badge_swhid(snpSWHID),
           'browseUrl': this.Urls.browse_swhid(snpSWHIDWithContext)
         }
       ];
 
     });
   });
 
   beforeEach(function() {
     cy.visit(url);
   });
 
   it('should open and close identifiers tab when clicking on handle', function() {
     cy.get('#swh-identifiers')
       .should('have.class', 'ui-slideouttab-ready');
 
     cy.get('.ui-slideouttab-handle')
       .click();
 
     cy.get('#swh-identifiers')
       .should('have.class', 'ui-slideouttab-open');
 
     cy.get('.ui-slideouttab-handle')
       .click();
 
     cy.get('#swh-identifiers')
       .should('not.have.class', 'ui-slideouttab-open');
 
   });
 
   it('should display identifiers with permalinks for browsed objects', function() {
     cy.get('.ui-slideouttab-handle')
       .click();
 
     for (let td of testsData) {
       cy.get(`a[href="#swhid-tab-${td.objectType}"]`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType}`)
         .should('be.visible');
 
       cy.get(`#swhid-tab-${td.objectType} .swhid`)
-        .contains(td.objectSWHIDs[0])
+        .should('have.text', td.objectSWHIDs[0].replace(/;/g, ';\n'))
         .should('have.attr', 'href', this.Urls.browse_swhid(td.objectSWHIDs[0]));
 
     }
 
   });
 
   it('should update other object identifiers contextual info when toggling context checkbox', function() {
     cy.get('.ui-slideouttab-handle')
       .click();
 
     for (let td of testsData) {
 
       cy.get(`a[href="#swhid-tab-${td.objectType}"]`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType} .swhid`)
-        .contains(td.objectSWHIDs[0])
+        .should('have.text', td.objectSWHIDs[0].replace(/;/g, ';\n'))
         .should('have.attr', 'href', this.Urls.browse_swhid(td.objectSWHIDs[0]));
 
       cy.get(`#swhid-tab-${td.objectType} .swhid-option`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType} .swhid`)
         .contains(td.objectSWHIDs[1])
         .should('have.attr', 'href', this.Urls.browse_swhid(td.objectSWHIDs[1]));
 
       cy.get(`#swhid-tab-${td.objectType} .swhid-option`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType} .swhid`)
-        .contains(td.objectSWHIDs[0])
+        .should('have.text', td.objectSWHIDs[0].replace(/;/g, ';\n'))
         .should('have.attr', 'href', this.Urls.browse_swhid(td.objectSWHIDs[0]));
     }
 
   });
 
   it('should display swh badges in identifiers tab for browsed objects', function() {
     cy.get('.ui-slideouttab-handle')
       .click();
 
     const originBadgeUrl = this.Urls.swh_badge('origin', origin.url);
 
     for (let td of testsData) {
       cy.get(`a[href="#swhid-tab-${td.objectType}"]`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType} .swh-badge-origin`)
         .should('have.attr', 'src', originBadgeUrl);
 
       cy.get(`#swhid-tab-${td.objectType} .swh-badge-${td.objectType}`)
         .should('have.attr', 'src', td.badgeUrl);
 
     }
 
   });
 
   it('should display badge integration info when clicking on it', function() {
 
     cy.get('.ui-slideouttab-handle')
       .click();
 
     for (let td of testsData) {
       cy.get(`a[href="#swhid-tab-${td.objectType}"]`)
         .click();
 
       cy.get(`#swhid-tab-${td.objectType} .swh-badge-origin`)
         .click()
         .wait(500);
 
       for (let badgeType of ['html', 'md', 'rst']) {
         cy.get(`.modal .swh-badge-${badgeType}`)
           .contains(`${urlPrefix}${originBrowseUrl}`)
           .contains(`${urlPrefix}${originBadgeUrl}`);
       }
 
       cy.get('.modal.show .close')
         .click()
         .wait(500);
 
       cy.get(`#swhid-tab-${td.objectType} .swh-badge-${td.objectType}`)
         .click()
         .wait(500);
 
       for (let badgeType of ['html', 'md', 'rst']) {
         cy.get(`.modal .swh-badge-${badgeType}`)
           .contains(`${urlPrefix}${td.browseUrl}`)
           .contains(`${urlPrefix}${td.badgeSWHIDUrl}`);
       }
 
       cy.get('.modal.show .close')
         .click()
         .wait(500);
 
     }
   });
 
   it('should be possible to retrieve SWHIDs context from JavaScript', function() {
     cy.window().then(win => {
       const swhIdsContext = win.swh.webapp.getSwhIdsContext();
       for (let testData of testsData) {
         assert.isTrue(swhIdsContext.hasOwnProperty(testData.objectType));
         assert.equal(swhIdsContext[testData.objectType].swhid,
                      testData.objectSWHIDs.slice(-1)[0]);
       }
     });
   });
 
 });
diff --git a/swh/web/assets/src/bundles/browse/swhid-utils.js b/swh/web/assets/src/bundles/browse/swhid-utils.js
index a5661661..51b8a80b 100644
--- a/swh/web/assets/src/bundles/browse/swhid-utils.js
+++ b/swh/web/assets/src/bundles/browse/swhid-utils.js
@@ -1,122 +1,122 @@
 /**
  * Copyright (C) 2018-2019  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 import ClipboardJS from 'clipboard';
 import 'thirdparty/jquery.tabSlideOut/jquery.tabSlideOut';
 import 'thirdparty/jquery.tabSlideOut/jquery.tabSlideOut.css';
 
 import {BREAKPOINT_SM} from 'utils/constants';
 
 export function swhIdObjectTypeToggled(event) {
   event.preventDefault();
   $(event.target).tab('show');
 }
 
 export function swhIdContextOptionToggled(event) {
   event.stopPropagation();
   let swhIdElt = $(event.target).closest('.swhid-ui').find('.swhid');
   let swhIdWithContext = $(event.target).data('swhid-with-context');
   let swhIdWithContextUrl = $(event.target).data('swhid-with-context-url');
   let currentSwhId = swhIdElt.text();
   if ($(event.target).prop('checked')) {
-    currentSwhId = swhIdWithContext;
     swhIdElt.attr('href', swhIdWithContextUrl);
+    currentSwhId = swhIdWithContext.replace(/;/g, ';\n');
   } else {
     const pos = currentSwhId.indexOf(';');
     if (pos !== -1) {
       currentSwhId = currentSwhId.slice(0, pos);
     }
     swhIdElt.attr('href', '/' + currentSwhId + '/');
   }
   swhIdElt.text(currentSwhId);
 
   addLinesInfo();
 }
 
 function addLinesInfo() {
   let swhIdElt = $('#swhid-tab-content').find('.swhid');
-  let currentSwhId = swhIdElt.text();
+  let currentSwhId = swhIdElt.text().replace(/;\n/g, ';');
   let lines = [];
   let linesPart = ';lines=';
   let linesRegexp = new RegExp(/L(\d+)/g);
   let line = linesRegexp.exec(window.location.hash);
   while (line) {
     lines.push(parseInt(line[1]));
     line = linesRegexp.exec(window.location.hash);
   }
   if (lines.length > 0) {
     linesPart += lines[0];
   }
   if (lines.length > 1) {
     linesPart += '-' + lines[1];
   }
 
   if ($('#swhid-context-option-content').prop('checked')) {
     currentSwhId = currentSwhId.replace(/;lines=\d+-*\d*/g, '');
     if (lines.length > 0) {
       currentSwhId += linesPart;
     }
 
-    swhIdElt.text(currentSwhId);
+    swhIdElt.text(currentSwhId.replace(/;/g, ';\n'));
     swhIdElt.attr('href', '/' + currentSwhId + '/');
   }
 }
 
 $(document).ready(() => {
   new ClipboardJS('.btn-swhid-copy', {
     text: trigger => {
       let swhId = $(trigger).closest('.swhid-ui').find('.swhid').text();
-      return swhId;
+      return swhId.replace(/;\n/g, ';');
     }
   });
 
   new ClipboardJS('.btn-swhid-url-copy', {
     text: trigger => {
       let swhIdUrl = $(trigger).closest('.swhid-ui').find('.swhid').attr('href');
       return window.location.origin + swhIdUrl;
     }
   });
 
   if (window.innerWidth * 0.7 > 1000) {
     $('#swh-identifiers').css('width', '1000px');
   }
 
   let tabSlideOptions = {
     tabLocation: 'right',
     clickScreenToCloseFilters: ['.ui-slideouttab-panel', '.modal'],
     offset: function() {
       const width = $(window).width();
       if (width < BREAKPOINT_SM) {
         return '250px';
       } else {
         return '200px';
       }
     }
   };
   // ensure tab scrolling on small screens
   if (window.innerHeight < 600 || window.innerWidth < 500) {
     tabSlideOptions['otherOffset'] = '20px';
   }
 
   // initiate the sliding identifiers tab
   $('#swh-identifiers').tabSlideOut(tabSlideOptions);
 
   // set the tab visible once the close animation is terminated
   $('#swh-identifiers').css('display', 'block');
   $('.swhid-context-option').trigger('click');
 
   // highlighted code lines changed
   $(window).on('hashchange', () => {
     addLinesInfo();
   });
 
   // highlighted code lines removed
   $('body').click(() => {
     addLinesInfo();
   });
 
 });