diff --git a/src/dccQuantity.js b/src/dccQuantity.js
index e4d2698a55749c553ae0b767715ae6ef701ed373..d67a8370d4f58b042bf8b579c5ee7ac528ff31fb 100644
--- a/src/dccQuantity.js
+++ b/src/dccQuantity.js
@@ -50,12 +50,12 @@ export class DCCRealListQuantity extends DCCQuantity {
         return [];
     }
 
-    getUnit() {
+    getUnit(options = { oneLine: true }) {
         const realList = this.jsonData['si:realListXMLList'];
         if (realList && realList['si:unitXMLList']) {
             const rawUnit = realList['si:unitXMLList'].trim();
             const unit = new DSIUnit(rawUnit);
-            return unit.toHTML({ oneLine: true });
+            return unit.toHTML(options);
         }
         return '';
     }
@@ -88,12 +88,12 @@ export class DCCRealQuantity extends DCCQuantity {
         return [];
     }
 
-    getUnit() {
+    getUnit(options = { oneLine: true }) {
         const realData = this.jsonData['si:real'];
         if (realData && realData['si:unit']) {
             const rawUnit = realData['si:unit'].trim();
             const unit = new DSIUnit(rawUnit);
-            return unit.toHTML({ oneLine: true });
+            return unit.toHTML(options);
         }
         return '';
     }
diff --git a/src/renderers/MeasurementRenderer.js b/src/renderers/MeasurementRenderer.js
index 4d518d9873f4509571c2cf2af4a75e2c282fdb88..5d8cee5a71169ec7b832159c5d31a3f09af487f6 100644
--- a/src/renderers/MeasurementRenderer.js
+++ b/src/renderers/MeasurementRenderer.js
@@ -228,7 +228,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
 
   const dataHeaders = dataQuantities.map((q, idx) => {
     let headerText = q.getName(language);
-    let unit = q.getUnit();
+    let unit = q.getUnit({ oneLine: true, wrapper: 'span' });
     if (!headerText.toLowerCase().includes(" in ")) {
       headerText = headerText + " in " + unit;
     }
@@ -298,7 +298,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
     const selectedIndex = selectedRadio.value;
     const xQuantity = indexQuantities[selectedIndex];
     const xValues = xQuantity.getValues();
-    const xUnit = xQuantity.getUnit();
+    const xUnit = xQuantity.getUnit({ oneLine: true, wrapper: 'span' });
     console.debug('Selected X-Axis values:', xValues);
     console.debug('X-Axis unit:', xUnit);
 
@@ -338,7 +338,7 @@ export function renderSingleMeasurementResult(resultObj, language, tabPanel) {
 
     const unitGroups = {};
     dataQuantities.forEach((q, idx) => {
-      const unit = q.getUnit();
+      const unit = q.getUnit({ oneLine: false});
       if (!unitGroups[unit]) { unitGroups[unit] = []; }
       const header = dataHeaders[idx];
       let values = q.getValues();