diff --git a/xslt/xml2manualcsv.xslt b/xslt/xml2manualcsv.xslt
index 4059af226..8ebe1daa5 100644
--- a/xslt/xml2manualcsv.xslt
+++ b/xslt/xml2manualcsv.xslt
@@ -13,10 +13,104 @@
   <xsl:template match="/divelog/dives">
     <xsl:choose>
       <xsl:when test="$units = 1">
-        <xsl:value-of select="concat('&quot;dive number&quot;', $fs, '&quot;date&quot;', $fs, '&quot;time&quot;', $fs, '&quot;duration (min)&quot;', $fs, '&quot;maxdepth (ft)&quot;', $fs, '&quot;avgdepth (ft)&quot;', $fs, '&quot;mode&quot;', $fs, '&quot;airtemp (F)&quot;', $fs, '&quot;watertemp (F)&quot;', $fs, '&quot;cylinder size (cuft)&quot;', $fs, '&quot;startpressure (psi)&quot;', $fs, '&quot;endpressure (psi)&quot;', $fs, '&quot;o2 (%)&quot;', $fs, '&quot;he (%)&quot;', $fs, '&quot;location&quot;', $fs, '&quot;gps&quot;', $fs, '&quot;divemaster&quot;', $fs, '&quot;buddy&quot;', $fs, '&quot;suit&quot;', $fs, '&quot;rating&quot;', $fs, '&quot;visibility&quot;', $fs, '&quot;notes&quot;', $fs, '&quot;weight (lbs)&quot;', $fs, '&quot;tags&quot;')"/>
+        <xsl:value-of select="concat(
+          '&quot;dive number&quot;',
+          $fs,
+          '&quot;date&quot;',
+          $fs,
+          '&quot;time&quot;',
+          $fs,
+          '&quot;duration (min)&quot;',
+          $fs,
+          '&quot;maxdepth (ft)&quot;',
+          $fs,
+          '&quot;avgdepth (ft)&quot;',
+          $fs,
+          '&quot;mode&quot;',
+          $fs,
+          '&quot;airtemp (F)&quot;',
+          $fs,
+          '&quot;watertemp (F)&quot;',
+          $fs,
+          '&quot;cylinder size (cuft)&quot;',
+          $fs,
+          '&quot;startpressure (psi)&quot;',
+          $fs,
+          '&quot;endpressure (psi)&quot;',
+          $fs,
+          '&quot;o2 (%)&quot;',
+          $fs,
+          '&quot;he (%)&quot;',
+          $fs,
+          '&quot;location&quot;',
+          $fs,
+          '&quot;gps&quot;',
+          $fs,
+          '&quot;divemaster&quot;',
+          $fs,
+          '&quot;buddy&quot;',
+          $fs,
+          '&quot;suit&quot;',
+          $fs,
+          '&quot;rating&quot;',
+          $fs,
+          '&quot;visibility&quot;',
+          $fs,
+          '&quot;notes&quot;',
+          $fs,
+          '&quot;weight (lbs)&quot;',
+          $fs,
+          '&quot;tags&quot;')"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="concat('&quot;dive number&quot;', $fs, '&quot;date&quot;', $fs, '&quot;time&quot;', $fs, '&quot;duration (min)&quot;', $fs, '&quot;maxdepth (m)&quot;', $fs, '&quot;avgdepth (m)&quot;', $fs, '&quot;mode&quot;', $fs, '&quot;airtemp (C)&quot;', $fs, '&quot;watertemp (C)&quot;', $fs, '&quot;cylinder size (l)&quot;', $fs, '&quot;startpressure (bar)&quot;', $fs, '&quot;endpressure (bar)&quot;', $fs, '&quot;o2 (%)&quot;', $fs, '&quot;he (%)&quot;', $fs, '&quot;location&quot;', $fs, '&quot;gps&quot;', $fs, '&quot;divemaster&quot;', $fs, '&quot;buddy&quot;', $fs, '&quot;suit&quot;', $fs, '&quot;rating&quot;', $fs, '&quot;visibility&quot;', $fs, '&quot;notes&quot;', $fs, '&quot;weight (kg)&quot;', $fs, '&quot;tags&quot;')"/>
+        <xsl:value-of select="
+          concat('&quot;dive number&quot;',
+          $fs,
+          '&quot;date&quot;',
+          $fs,
+          '&quot;time&quot;',
+          $fs,
+          '&quot;duration (min)&quot;',
+          $fs,
+          '&quot;maxdepth (m)&quot;',
+          $fs,
+          '&quot;avgdepth (m)&quot;',
+          $fs,
+          '&quot;mode&quot;',
+          $fs,
+          '&quot;airtemp (C)&quot;',
+          $fs,
+          '&quot;watertemp (C)&quot;',
+          $fs,
+          '&quot;cylinder size (l)&quot;',
+          $fs,
+          '&quot;startpressure (bar)&quot;',
+          $fs,
+          '&quot;endpressure (bar)&quot;',
+          $fs,
+          '&quot;o2 (%)&quot;',
+          $fs,
+          '&quot;he (%)&quot;',
+          $fs,
+          '&quot;location&quot;',
+          $fs,
+          '&quot;gps&quot;',
+          $fs,
+          '&quot;divemaster&quot;',
+          $fs,
+          '&quot;buddy&quot;',
+          $fs,
+          '&quot;suit&quot;',
+          $fs,
+          '&quot;rating&quot;',
+          $fs,
+          '&quot;visibility&quot;',
+          $fs,
+          '&quot;notes&quot;',
+          $fs,
+          '&quot;weight (kg)&quot;',
+          $fs,
+          '&quot;tags&quot;')"/>
       </xsl:otherwise>
     </xsl:choose>
     <xsl:text>