diff --git a/cypress/integration/content-rendering.spec.js b/cypress/integration/content-rendering.spec.js
index 6a693959..42a5ded0 100644
--- a/cypress/integration/content-rendering.spec.js
+++ b/cypress/integration/content-rendering.spec.js
@@ -1,99 +1,99 @@
 /**
- * Copyright (C) 2019  The Software Heritage developers
+ * Copyright (C) 2019-2022  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 {checkLanguageHighlighting, describeSlowTests} from '../utils';
 
 describeSlowTests('Code highlighting tests', function() {
 
   const extensions = require('../fixtures/source-file-extensions.json');
 
   extensions.forEach(ext => {
     it(`should highlight source files with extension ${ext}`, function() {
       cy.request(this.Urls.tests_content_code_extension(ext)).then(response => {
         const data = response.body;
         cy.visit(`${this.Urls.browse_content(data.sha1)}?path=file.${ext}`);
         checkLanguageHighlighting(data.language);
       });
     });
   });
 
   const filenames = require('../fixtures/source-file-names.json');
 
   filenames.forEach(filename => {
     it(`should highlight source files with filenames ${filename}`, function() {
       cy.request(this.Urls.tests_content_code_filename(filename)).then(response => {
         const data = response.body;
         cy.visit(`${this.Urls.browse_content(data.sha1)}?path=${filename}`);
         checkLanguageHighlighting(data.language);
       });
     });
   });
 
 });
 
 describe('Image rendering tests', function() {
   const imgExtensions = ['gif', 'jpeg', 'png', 'webp'];
 
   imgExtensions.forEach(ext => {
     it(`should render image with extension ${ext}`, function() {
       cy.request(this.Urls.tests_content_other_extension(ext)).then(response => {
         const data = response.body;
-        cy.visit(`${this.Urls.browse_content(data.sha1)}?path=file.${ext}`);
+        cy.visit(`${this.Urls.browse_content(data.sha1)}`);
         cy.get('.swh-content img')
           .should('be.visible');
       });
     });
   });
 
 });
 
 describe('PDF rendering test', function() {
 
   function sum(previousValue, currentValue) {
     return previousValue + currentValue;
   }
 
   it(`should render a PDF file`, function() {
     cy.request(this.Urls.tests_content_other_extension('pdf')).then(response => {
       const data = response.body;
-      cy.visit(`${this.Urls.browse_content(data.sha1)}?path=file.pdf`);
+      cy.visit(`${this.Urls.browse_content(data.sha1)}`);
       cy.get('.swh-content canvas')
         .wait(2000)
         .then(canvas => {
           const width = canvas[0].width;
           const height = canvas[0].height;
           const context = canvas[0].getContext('2d');
           const imgData = context.getImageData(0, 0, width, height);
           assert.notEqual(imgData.data.reduce(sum), 0);
         });
     });
   });
 
 });
 
 describe('Jupyter notebook rendering test', function() {
 
   it(`should render a notebook file to HTML`, function() {
     cy.request(this.Urls.tests_content_other_extension('ipynb')).then(response => {
       const data = response.body;
       cy.visit(`${this.Urls.browse_content(data.sha1)}?path=file.ipynb`);
       cy.get('.nb-notebook')
         .should('be.visible')
         .and('not.be.empty');
       cy.get('.nb-cell.nb-markdown-cell')
         .should('be.visible')
         .and('not.be.empty');
       cy.get('.nb-cell.nb-code-cell')
         .should('be.visible')
         .and('not.be.empty');
       cy.get('.MathJax')
         .should('be.visible')
         .and('not.be.empty');
     });
   });
 
 });
diff --git a/swh/web/templates/includes/content-display.html b/swh/web/templates/includes/content-display.html
index f6aa480a..aa1ec399 100644
--- a/swh/web/templates/includes/content-display.html
+++ b/swh/web/templates/includes/content-display.html
@@ -1,85 +1,85 @@
 {% comment %}
-Copyright (C) 2017-2021  The Software Heritage developers
+Copyright (C) 2017-2022  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
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% include "includes/revision-info.html" %}
 
 {% if snapshot_context and snapshot_context.is_empty %}
   {% include "includes/empty-snapshot.html" %}
 {% else %}
   {% if not iframe_mode %}
     <div class="card">
       {% if filename %}
         <div class="swh-content-filename card-header bg-gray-light swh-heading-color">
           {{ filename }}
         </div>
       {% endif %}
   {% endif %}
     <div class="swh-content">
       {% if content_size > max_content_size %}
         Content is too large to be displayed (size is greater than {{ max_content_size|filesizeformat }}).
       {% elif "inode/x-empty" == mimetype %}
         <i>File is empty</i>
-      {% elif filename and filename|default:""|slice:"-5:" == "ipynb" %}
-        <div class="swh-ipynb">
-        </div>
-      {% elif "text/" in mimetype or "application/" in mimetype and encoding != "binary" %}
-        <div class="highlightjs">
-          <pre><code class="{{ language }}">{{ content }}</code></pre>
-        </div>
       {% elif mimetype in browsers_supported_image_mimes and content %}
         <img src="data:{{ mimetype }};base64,{{ content }}"/>
       {% elif "application/pdf" == mimetype %}
         <div class="text-center">
           <div class="py-2">
             <button class="btn btn-default btn-sm" id="pdf-prev">Previous</button>
             <span>Page: <span id="pdf-page-num"></span> / <span id="pdf-page-count"></span></span>
             <button class="btn btn-default btn-sm" id="pdf-next">Next</button>
           </div>
           <canvas id="pdf-canvas"></canvas>
         </div>
+      {% elif filename and filename|default:""|slice:"-5:" == "ipynb" %}
+        <div class="swh-ipynb">
+        </div>
+      {% elif "text/" in mimetype or "application/" in mimetype and encoding != "binary" %}
+        <div class="highlightjs">
+          <pre><code class="{{ language }}">{{ content }}</code></pre>
+        </div>
       {% elif content %}
         Content with mime type {{ mimetype }} and encoding {{ encoding }} cannot be displayed.
       {% else %}
         {% include "includes/http-error.html" %}
       {% endif %}
     </div>
   {% if not iframe_mode %}
     </div>
   {% endif %}
 
   {% if content %}
     <script>
       {% if "application/pdf" == mimetype %}
         swh.webapp.renderPdf({{ top_right_link.url|jsonify }});
       {% elif filename and filename|default:""|slice:"-5:" == "ipynb" %}
         swh.webapp.renderNotebook({{ top_right_link.url|jsonify }}, '.swh-ipynb');
       {% elif content %}
         let codeContainer = $('code');
         let content = codeContainer.text();
 
         swh.webapp.highlightCode(true, 'code', !{{ iframe_mode|jsonify }});
 
         function updateLanguage(language) {
           codeContainer.text(content);
           codeContainer.removeClass();
           codeContainer.addClass(language);
 
           let urlParams = new URLSearchParams(window.location.search);
           urlParams.set('language', language);
 
           const newUrl = window.location.pathname + '?' + urlParams.toString() + window.location.hash;
           window.history.replaceState('', document.title, newUrl);
 
           swh.webapp.highlightCode(true, 'code', !{{ iframe_mode|jsonify }});
         }
 
       {% endif %}
     </script>
   {% endif %}
 {% endif %}