diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d10839f9..fad83cd27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+export: fix bug resulting in invalid CSV for '""' in 'CSV summary dive details'
 desktop: add support for multiple tanks to the profile ruler
 export: change format produced by 'CSV summary dive details' from TSV (tab separated) to CSV
 desktop: add function to merge dive site into site selected in list
diff --git a/xslt/xml2manualcsv.xslt b/xslt/xml2manualcsv.xslt
index 8dbe04703..00d5779e4 100644
--- a/xslt/xml2manualcsv.xslt
+++ b/xslt/xml2manualcsv.xslt
@@ -6,197 +6,146 @@
   <xsl:param name="units" select="units"/>
   <xsl:output method="text" encoding="UTF-8"/>
 
-  <xsl:variable name="fs"><xsl:text>,</xsl:text></xsl:variable>
-  <xsl:variable name="lf"><xsl:text>
-</xsl:text></xsl:variable>
+  <xsl:variable name="fs" select="','"/>
+  <xsl:variable name="quote" select="'&quot;'"/>
+  <xsl:variable name="lf" select="'&#xa;'"/>
 
-  <xsl:template match="/divelog/dives">
-    <xsl:variable name="cylinders">
-      <xsl:value-of select="count(dive[position()=last()]/cylinder|trip[position()=last()]/dive[position()=last()]/cylinder)"/>
-    </xsl:variable>
+  <xsl:template name="EscapeQuotes">
+    <xsl:param name="value"/>
     <xsl:choose>
-      <xsl:when test="$units = 1">
-
-        <!-- Print beginning of the header -->
-        <xsl:value-of select="concat(
-          '&quot;dive number&quot;',
-          $fs,
-          '&quot;date&quot;',
-          $fs,
-          '&quot;time&quot;',
-          $fs,
-          '&quot;duration (min)&quot;',
-          $fs,
-          '&quot;sac (cuft/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)"/>
-
-        <!-- Print cylinder info according to the amount of cylinders in dive -->
-        <xsl:for-each select="dive[position()=last()]/cylinder|trip[position()=last()]/dive[position()=last()]/cylinder">
-          <xsl:value-of select="concat(
-            '&quot;cylinder size (cuft)&quot;',
-            $fs,
-            '&quot;startpressure (psi)&quot;',
-            $fs,
-            '&quot;endpressure (psi)&quot;',
-            $fs,
-            '&quot;o2 (%)&quot;',
-            $fs,
-            '&quot;he (%)&quot;',
-            $fs)"/>
-        </xsl:for-each>
-
-        <!-- Print rest of the header -->
-        <xsl:value-of select="concat(
-          '&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 test="contains($value, $quote)">
+        <xsl:value-of select="concat(substring-before($value, $quote), $quote, $quote)"/>
+        <xsl:call-template name="EscapeQuotes">
+          <xsl:with-param name="value" select="substring-after($value, $quote)"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-
-        <!-- Print beginning of the header -->
-        <xsl:value-of select="concat(
-          '&quot;dive number&quot;',
-          $fs,
-          '&quot;date&quot;',
-          $fs,
-          '&quot;time&quot;',
-          $fs,
-          '&quot;duration (min)&quot;',
-          $fs,
-          '&quot;sac (l/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)"/>
-
-        <!-- Print cylinder info according to the amount of cylinders in dive -->
-        <xsl:for-each select="dive[position()=last()]/cylinder|trip[position()=last()]/dive[position()=last()]/cylinder">
-          <xsl:value-of select="concat(
-            '&quot;cylinder size (l)&quot;',
-            $fs,
-            '&quot;startpressure (bar)&quot;',
-            $fs,
-            '&quot;endpressure (bar)&quot;',
-            $fs,
-            '&quot;o2 (%)&quot;',
-            $fs,
-            '&quot;he (%)&quot;',
-            $fs)"/>
-        </xsl:for-each>
-
-        <!-- Print rest of the header -->
-        <xsl:value-of select="concat(
-          '&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="$value"/>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:text>
-</xsl:text>
+  </xsl:template>
+
+  <xsl:template name="CsvEscape">
+    <xsl:param name="value"/>
+    <xsl:choose>
+      <xsl:when test="contains($value, $fs)">
+        <xsl:value-of select="$quote"/>
+        <xsl:call-template name="EscapeQuotes">
+          <xsl:with-param name="value" select="$value"/>
+        </xsl:call-template>
+        <xsl:value-of select="$quote"/>
+      </xsl:when>
+      <xsl:when test="contains($value, $lf)">
+        <xsl:value-of select="$quote"/>
+        <xsl:call-template name="EscapeQuotes">
+          <xsl:with-param name="value" select="$value"/>
+        </xsl:call-template>
+        <xsl:value-of select="$quote"/>
+      </xsl:when>
+      <xsl:when test="contains($value, $quote)">
+        <xsl:value-of select="$quote"/>
+        <xsl:call-template name="EscapeQuotes">
+          <xsl:with-param name="value" select="$value"/>
+        </xsl:call-template>
+        <xsl:value-of select="$quote"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$value"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/divelog/dives">
+    <!-- Find the maximum number of cylinders used on a dive -->
+    <xsl:variable name="cylinders">
+      <xsl:for-each select="dive|trip/dive">
+        <xsl:sort select="count(cylinder)" data-type="number" order="descending"/>
+        <xsl:if test="position() = 1">
+          <xsl:value-of select="count(cylinder)"/>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$units = 1">
+        <xsl:call-template name="printHeaders">
+          <xsl:with-param name="cylinders" select="$cylinders"/>
+          <xsl:with-param name="volumeUnits" select="'cuft'"/>
+          <xsl:with-param name="distanceUnits" select="'ft'"/>
+          <xsl:with-param name="temperatureUnits" select="'F'"/>
+          <xsl:with-param name="pressureUnits" select="'psi'"/>
+          <xsl:with-param name="massUnits" select="'lbs'"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="printHeaders">
+          <xsl:with-param name="cylinders" select="$cylinders"/>
+          <xsl:with-param name="volumeUnits" select="'l'"/>
+          <xsl:with-param name="distanceUnits" select="'m'"/>
+          <xsl:with-param name="temperatureUnits" select="'C'"/>
+          <xsl:with-param name="pressureUnits" select="'bar'"/>
+          <xsl:with-param name="massUnits" select="'kg'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+
     <xsl:apply-templates select="dive|trip/dive">
       <xsl:with-param name="cylinders" select="$cylinders"/>
     </xsl:apply-templates>
   </xsl:template>
 
+  <!-- Suppress printing of divesite notes -->
   <xsl:template match="divesites/site/notes"/>
 
   <xsl:template match="dive">
     <xsl:param name="cylinders"/>
 
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@number"/>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@number"/>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@date"/>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@date"/>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@time"/>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@time"/>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="substring-before(@duration, ' ')"/>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="substring-before(@duration, ' ')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value">
+        <xsl:choose>
+          <xsl:when test="$units = 1">
+            <xsl:value-of select="format-number(substring-before(@sac, ' ') * 0.035315, '#.##')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="substring-before(@sac, ' ')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="format-number(substring-before(@sac, ' ') * 0.035315, '#.##')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before(@sac, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
     <xsl:choose>
       <xsl:when test="divecomputer[1]/depth/@mean|divecomputer[1]/depth/@max != ''">
         <xsl:apply-templates select="divecomputer[1]/depth"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;&quot;</xsl:text>
-        <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;&quot;</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:value-of select="$fs"/>
 
     <!-- Dive mode -->
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
     <xsl:if test="divecomputer[1]/@dctype != ''">
-      <xsl:value-of select="divecomputer[1]/@dctype"/>
+      <xsl:call-template name="CsvEscape">
+        <xsl:with-param name="value" select="divecomputer[1]/@dctype"/>
+      </xsl:call-template>
     </xsl:if>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:value-of select="$fs"/>
 
     <!-- Air temperature -->
     <xsl:choose>
@@ -210,12 +159,8 @@
           <xsl:with-param name="temp" select="divecomputer[1]/temperature/@air"/>
         </xsl:call-template>
       </xsl:when>
-      <xsl:otherwise>
-        <!-- empty air temperature -->
-        <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;&quot;</xsl:text>
-      </xsl:otherwise>
     </xsl:choose>
+    <xsl:value-of select="$fs"/>
 
     <!-- Water temperature -->
     <xsl:choose>
@@ -229,24 +174,14 @@
           <xsl:with-param name="temp" select="divecomputer[1]/temperature/@water"/>
         </xsl:call-template>
       </xsl:when>
-      <xsl:otherwise>
-        <!-- water temperature -->
-        <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;&quot;</xsl:text>
-      </xsl:otherwise>
     </xsl:choose>
+    <xsl:value-of select="$fs"/>
 
     <xsl:for-each select="cylinder">
       <xsl:choose>
-        <xsl:when test="$cylinders &lt; position()"/>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="@start|@end != ''">
-              <xsl:apply-templates select="."/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$fs"/>
-              <xsl:text>&quot;</xsl:text>
+        <xsl:when test="position() &lt;= $cylinders">
+          <xsl:call-template name="CsvEscape">
+            <xsl:with-param name="value">
               <xsl:choose>
                 <xsl:when test="$units = 1">
                   <xsl:value-of select="concat(format-number((substring-before(@size, ' ') div 14.7 * 3000) * 0.035315, '#.#'), '')"/>
@@ -255,59 +190,91 @@
                   <xsl:value-of select="substring-before(@size, ' ')"/>
                 </xsl:otherwise>
               </xsl:choose>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="$fs"/>
-              <xsl:text>&quot;</xsl:text>
+            </xsl:with-param>
+	  </xsl:call-template>
+          <xsl:value-of select="$fs"/>
+          <xsl:call-template name="CsvEscape">
+            <xsl:with-param name="value">
               <xsl:choose>
-                <xsl:when test="$units = 1">
+                <xsl:when test="@start|@end != ''">
                   <xsl:choose>
-                    <xsl:when test="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') &gt; 0">
-                      <xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
+                    <xsl:when test="$units = 1">
+                      <xsl:value-of select="concat(format-number((substring-before(@start, ' ') * 14.5037738007), '#'), '')"/>
                     </xsl:when>
                     <xsl:otherwise>
-                      <xsl:value-of select="''"/>
+                      <xsl:value-of select="substring-before(@start, ' ')"/>
                     </xsl:otherwise>
                   </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ')"/>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="$fs"/>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:choose>
-                <xsl:when test="$units = 1">
                   <xsl:choose>
-                    <xsl:when test="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') &gt; 0">
-                      <xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
+                    <xsl:when test="$units = 1">
+                      <xsl:choose>
+                        <xsl:when test="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') &gt; 0">
+                          <xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="''"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
                     </xsl:when>
                     <xsl:otherwise>
-                      <xsl:value-of select="''"/>
+                      <xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure]/@pressure, ' ')"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:with-param>
+	  </xsl:call-template>
+          <xsl:value-of select="$fs"/>
+          <xsl:call-template name="CsvEscape">
+            <xsl:with-param name="value">
+              <xsl:choose>
+                <xsl:when test="@start|@end != ''">
+                  <xsl:choose>
+                    <xsl:when test="$units = 1">
+                      <xsl:value-of select="concat(format-number((substring-before(@end, ' ') * 14.5037738007), '#'), '')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="substring-before(@end, ' ')"/>
                     </xsl:otherwise>
                   </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ')"/>
+                  <xsl:choose>
+                    <xsl:when test="$units = 1">
+                      <xsl:choose>
+                        <xsl:when test="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') &gt; 0">
+                          <xsl:value-of select="concat(format-number((substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ') * 14.5037738007), '#'), '')"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="''"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="substring-before(../divecomputer[1]/sample[@pressure][last()]/@pressure, ' ')"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
                 </xsl:otherwise>
               </xsl:choose>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="$fs"/>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="substring-before(@o2, '%')"/>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="$fs"/>
-              <xsl:text>&quot;</xsl:text>
-              <xsl:value-of select="substring-before(@he, '%')"/>
-              <xsl:text>&quot;</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
+            </xsl:with-param>
+	  </xsl:call-template>
+          <xsl:value-of select="$fs"/>
+          <xsl:call-template name="CsvEscape">
+            <xsl:with-param name="value" select="substring-before(@o2, '%')"/>
+          </xsl:call-template>
+          <xsl:value-of select="$fs"/>
+          <xsl:call-template name="CsvEscape">
+            <xsl:with-param name="value" select="substring-before(@he, '%')"/>
+          </xsl:call-template>
+          <xsl:value-of select="$fs"/>
+        </xsl:when>
       </xsl:choose>
     </xsl:for-each>
 
     <xsl:if test="count(cylinder) &lt; $cylinders">
-      <xsl:call-template name="emptyCylinder">
+      <xsl:call-template name="printEmptyCylinders">
         <xsl:with-param name="count" select="$cylinders - count(cylinder)"/>
       </xsl:call-template>
     </xsl:if>
@@ -318,61 +285,58 @@
         <xsl:apply-templates select="location"/>
         <xsl:if test="string-length(location) = 0">
           <xsl:value-of select="$fs"/>
-          <xsl:text>&quot;&quot;</xsl:text>
-          <xsl:value-of select="$fs"/>
-          <xsl:text>&quot;&quot;</xsl:text>
         </xsl:if>
       </xsl:when>
       <!-- Format with dive site managemenet -->
       <xsl:otherwise>
+        <xsl:call-template name="CsvEscape">
+          <xsl:with-param name="value">
+            <xsl:if test="string-length(@divesiteid) &gt; 0">
+              <xsl:variable name="uuid">
+                <xsl:value-of select="@divesiteid" />
+              </xsl:variable>
+              <xsl:value-of select="//divesites/site[@uuid = $uuid]/@name"/>
+            </xsl:if>
+          </xsl:with-param>
+	</xsl:call-template>
         <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;</xsl:text>
-        <xsl:if test="string-length(@divesiteid) &gt; 0">
-          <xsl:variable name="uuid">
-            <xsl:value-of select="@divesiteid" />
-          </xsl:variable>
-          <xsl:value-of select="//divesites/site[@uuid = $uuid]/@name"/>
-        </xsl:if>
-        <xsl:text>&quot;</xsl:text>
-        <xsl:value-of select="$fs"/>
-        <xsl:text>&quot;</xsl:text>
-        <xsl:if test="string-length(@divesiteid) &gt; 0">
-          <xsl:variable name="uuid">
-            <xsl:value-of select="@divesiteid" />
-          </xsl:variable>
-          <xsl:value-of select="//divesites/site[@uuid = $uuid]/@gps"/>
-        </xsl:if>
-        <xsl:text>&quot;</xsl:text>
+        <xsl:call-template name="CsvEscape">
+          <xsl:with-param name="value">
+            <xsl:if test="string-length(@divesiteid) &gt; 0">
+              <xsl:variable name="uuid">
+                <xsl:value-of select="@divesiteid" />
+              </xsl:variable>
+              <xsl:value-of select="//divesites/site[@uuid = $uuid]/@gps"/>
+            </xsl:if>
+          </xsl:with-param>
+	</xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
-    <xsl:apply-templates select="divemaster"/>
-    <xsl:if test="string-length(divemaster) = 0">
-      <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;&quot;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="buddy"/>
-    <xsl:if test="string-length(buddy) = 0">
-      <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;&quot;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="suit"/>
-    <xsl:if test="string-length(suit) = 0">
-      <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;&quot;</xsl:text>
-    </xsl:if>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@rating"/>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="divemaster"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="buddy"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="suit"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@rating"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@visibility"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="notes"/>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@visibility"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:apply-templates select="notes"/>
-    <xsl:if test="string-length(notes) = 0">
-      <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;&quot;</xsl:text>
-    </xsl:if>
 
     <xsl:variable name="trimmedweightlist">
       <xsl:for-each select="weightsystem">
@@ -381,224 +345,240 @@
         </weight>
       </xsl:for-each>
     </xsl:variable>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
     <xsl:if test="weightsystem">
-      <xsl:choose>
-        <xsl:when test="$units = 1">
-          <xsl:value-of select="concat(format-number((sum(xt:node-set($trimmedweightlist)/node()) div 0.453592), '#.##'), '')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat(sum(xt:node-set($trimmedweightlist)/node()), '')"/>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:call-template name="CsvEscape">
+        <xsl:with-param name="value">
+          <xsl:choose>
+            <xsl:when test="$units = 1">
+              <xsl:value-of select="concat(format-number((sum(xt:node-set($trimmedweightlist)/node()) div 0.453592), '#.##'), '')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="concat(sum(xt:node-set($trimmedweightlist)/node()), '')"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
+      </xsl:call-template>
     </xsl:if>
-    <xsl:text>&quot;</xsl:text>
-
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:call-template name="quote">
-      <xsl:with-param name="line" select="substring-before(translate(@tags, $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="remaining" select="substring-after(translate(@tags, $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="all" select="@tags"/>
+
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@tags"/>
     </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
-
-    <xsl:text>
-</xsl:text>
+    <xsl:value-of select="$lf"/>
   </xsl:template>
+
+  <!-- Print the header -->
+  <xsl:template name="printHeaders">
+    <xsl:param name="cylinders"/>
+    <xsl:param name="volumeUnits"/>
+    <xsl:param name="distanceUnits"/>
+    <xsl:param name="temperatureUnits"/>
+    <xsl:param name="pressureUnits"/>
+    <xsl:param name="massUnits"/>
+
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'dive number'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'date'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'time'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'duration [min]'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+	    <xsl:with-param name="value" select="concat('sac [', $volumeUnits, '/min]')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+	    <xsl:with-param name="value" select="concat('maxdepth [', $distanceUnits, ']')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="concat('avgdepth [', $distanceUnits, ']')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'mode'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="concat('airtemp [', $temperatureUnits, ']')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="concat('watertemp [', $temperatureUnits, ']')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+
+    <!-- Print cylinder info according to the amount of cylinders in dive -->
+    <xsl:call-template name="printCylinderHeaders">
+      <xsl:with-param name="index" select="1"/>
+      <xsl:with-param name="count" select="$cylinders"/>
+      <xsl:with-param name="volumeUnits" select="$volumeUnits"/>
+      <xsl:with-param name="pressureUnits" select="$pressureUnits"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'location'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'gps'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'divemaster'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'buddy'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'suit'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'rating'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'visibility'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'notes'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="concat('weight [', $massUnits, ']')"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="'tags'"/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:value-of select="$lf"/>
+  </xsl:template>
+
+  <!-- Print the header for cylinders -->
+  <xsl:template name="printCylinderHeaders">
+    <xsl:param name="index"/>
+    <xsl:param name="count"/>
+    <xsl:param name="volumeUnits"/>
+    <xsl:param name="pressureUnits"/>
+
+    <xsl:if test="$index &lt;= $count">
+      <xsl:call-template name="CsvEscape">
+	      <xsl:with-param name="value" select="concat('cylinder size (', $index, ') [', $volumeUnits, ']')"/>
+      </xsl:call-template>
+      <xsl:value-of select="$fs"/>
+      <xsl:call-template name="CsvEscape">
+	      <xsl:with-param name="value" select="concat('startpressure (', $index, ') [', $pressureUnits, ']')"/>
+      </xsl:call-template>
+      <xsl:value-of select="$fs"/>
+      <xsl:call-template name="CsvEscape">
+	      <xsl:with-param name="value" select="concat('endpressure (', $index, ') [', $pressureUnits, ']')"/>
+      </xsl:call-template>
+      <xsl:value-of select="$fs"/>
+      <xsl:call-template name="CsvEscape">
+	      <xsl:with-param name="value" select="concat('o2 (', $index, ') [%]')"/>
+      </xsl:call-template>
+      <xsl:value-of select="$fs"/>
+      <xsl:call-template name="CsvEscape">
+	      <xsl:with-param name="value" select="concat('he (', $index, ') [%]')"/>
+      </xsl:call-template>
+      <xsl:value-of select="$fs"/>
+
+      <xsl:call-template name="printCylinderHeaders">
+        <xsl:with-param name="index" select="$index + 1"/>
+        <xsl:with-param name="count" select="$count"/>
+        <xsl:with-param name="volumeUnits" select="$volumeUnits"/>
+        <xsl:with-param name="pressureUnits" select="$pressureUnits"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Depth template -->
   <xsl:template match="divecomputer/depth">
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value">
+        <xsl:choose>
+          <xsl:when test="$units = 1">
+            <xsl:value-of select="concat(format-number((substring-before(@max, ' ') div 0.3048), '#.##'), '')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="substring-before(@max, ' ')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
+    </xsl:call-template>
     <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="concat(format-number((substring-before(@max, ' ') div 0.3048), '#.##'), '')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before(@max, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="concat(format-number((substring-before(@mean, ' ') div 0.3048), '#.##'), '')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="format-number(substring-before(@mean, ' '), '#.##')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value">
+        <xsl:choose>
+          <xsl:when test="$units = 1">
+            <xsl:value-of select="concat(format-number((substring-before(@mean, ' ') div 0.3048), '#.##'), '')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="format-number(substring-before(@mean, ' '), '#.##')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
+    </xsl:call-template>
   </xsl:template>
 
   <!-- Temperature template -->
   <xsl:template name="temperature">
     <xsl:param name="temp"/>
 
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:if test="substring-before($temp, ' ') &gt; 0">
-          <xsl:value-of select="concat(format-number((substring-before($temp, ' ') * 1.8) + 32, '0.0'), '')"/>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before($temp, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="cylinder">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="concat(format-number((substring-before(@size, ' ') div 14.7 * 3000) * 0.035315, '#.#'), '')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before(@size, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="concat(format-number((substring-before(@start, ' ') * 14.5037738007), '#'), '')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before(@start, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:choose>
-      <xsl:when test="$units = 1">
-        <xsl:value-of select="concat(format-number((substring-before(@end, ' ') * 14.5037738007), '#'), '')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before(@end, ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="substring-before(@o2, '%')"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="substring-before(@he, '%')"/>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="location">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:value-of select="@gps"/>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-  <xsl:template match="divemaster">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:call-template name="quote">
-      <xsl:with-param name="line" select="substring-before(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="remaining" select="substring-after(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="all" select="."/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value">
+        <xsl:choose>
+          <xsl:when test="$units = 1">
+            <xsl:if test="substring-before($temp, ' ') &gt; 0">
+              <xsl:value-of select="concat(format-number((substring-before($temp, ' ') * 1.8) + 32, '0.0'), '')"/>
+            </xsl:if>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="substring-before($temp, ' ')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-  <xsl:template match="buddy">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:call-template name="quote">
-      <xsl:with-param name="line" select="substring-before(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="remaining" select="substring-after(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="all" select="."/>
-    </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-  <xsl:template match="suit">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:call-template name="quote">
-      <xsl:with-param name="line" select="substring-before(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="remaining" select="substring-after(translate(., $lf, ' '), '&quot;')"/>
-      <xsl:with-param name="all" select="."/>
-    </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-  <xsl:template match="notes">
-    <xsl:value-of select="$fs"/>
-    <xsl:text>&quot;</xsl:text>
-    <xsl:call-template name="quote">
-      <xsl:with-param name="line" select="substring-before(translate(., $lf, '\n'), '&quot;')"/>
-      <xsl:with-param name="remaining" select="substring-after(translate(., $lf, '\n'), '&quot;')"/>
-      <xsl:with-param name="all" select="translate(., $lf, '\n')"/>
-    </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
   </xsl:template>
 
-  <xsl:template name="quote">
-    <xsl:param name="line"/>
-    <xsl:param name="remaining"/>
-    <xsl:param name="all"/>
-
-    <xsl:choose>
-      <xsl:when test="$line = ''">
-        <xsl:value-of select="$all"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="concat($line, '&quot;', '&quot;')"/>
-        <xsl:if test="$remaining != ''">
-          <xsl:choose>
-            <xsl:when test="substring-before($remaining, '&quot;') != ''">
-              <xsl:call-template name="quote">
-                <xsl:with-param name="line" select="substring-before($remaining, '&quot;')"/>
-                <xsl:with-param name="remaining" select="substring-after($remaining, '&quot;')"/>
-                <xsl:with-param name="all" select="$remaining"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$remaining" />
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Template to fill in non-existent cylinder info to CSV -->
-  <xsl:template name="emptyCylinder">
+  <!-- Fill in non-existent cylinder info -->
+  <xsl:template name="printEmptyCylinders">
     <xsl:param name="count"/>
-
     <xsl:if test="$count &gt; 0">
       <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:text>&quot;</xsl:text>
       <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:text>&quot;</xsl:text>
       <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:text>&quot;</xsl:text>
       <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:text>&quot;</xsl:text>
       <xsl:value-of select="$fs"/>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:text>&quot;</xsl:text>
-      <xsl:call-template name="emptyCylinder">
+      <xsl:call-template name="printEmptyCylinders">
         <xsl:with-param name="count" select="$count - 1"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:template>
 
+  <!-- Location template -->
+  <xsl:template match="location">
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="."/>
+    </xsl:call-template>
+    <xsl:value-of select="$fs"/>
+    <xsl:call-template name="CsvEscape">
+      <xsl:with-param name="value" select="@gps"/>
+    </xsl:call-template>
+  </xsl:template>
 </xsl:stylesheet>