diff --git a/docs/exporting-xml.html b/docs/exporting-xml.html
index 12471f7dc..cbebef217 100644
--- a/docs/exporting-xml.html
+++ b/docs/exporting-xml.html
@@ -231,11 +231,14 @@ <h4>Step 3. Defining the column mapping</h4>The "XML Column Mapping" dialog
             table describes the XML (JSON/YAML) represenation of each exported row:<br />
 
             <ul>
-              <li><p>Expression starting with <span style="font-style: italic;"><font color="#0000bb">SQL:</font></span>
+              <li><p>Expressions starting with <span style="font-style: italic;"><font color="#0000bb">SQL:</font></span>
               will be replaced by the value of the SQL expression thereafter.
               <span style="font-style: italic;"><font color="#0000bb">T</font></span> is the alias for the row. Note
               that even scalar subqueries are allowed here.</p></li>
 
+              <li><p>Expressions that do not start with <span style="font-style: italic;"><font color="#0000bb">SQL:</font></span> are included directly as constants in the representation. 
+              </p></li>
+
               <li><p><span style="font-style: italic;"><font color="#0000bb">j:assoc</font></span> elements will be
               replaced by the representation of the associated rows.</p></li>
               
diff --git a/src/main/gui/net/sf/jailer/ui/FileView.java b/src/main/gui/net/sf/jailer/ui/FileView.java
index a956eb5f3..77abb4270 100644
--- a/src/main/gui/net/sf/jailer/ui/FileView.java
+++ b/src/main/gui/net/sf/jailer/ui/FileView.java
@@ -84,7 +84,7 @@ public FileView(Window owner, Window window, String file, boolean withSyntaxHigh
 		this.withSyntaxHighlighting = withSyntaxHighlighting;
 		this.isXml = file.toLowerCase().endsWith(".xml");
 		this.isJson = file.toLowerCase().endsWith(".json");
-		this.isYaml = file.toLowerCase().endsWith(".yaml");
+		this.isYaml = file.toLowerCase().endsWith(".yaml") || file.toLowerCase().endsWith(".yml");
 		
 		File f = new File(file);
 		if (f.exists() && f.length() > 65L*1024L*1024L / (file.toLowerCase().endsWith(".zip") || file.toLowerCase().endsWith(".gz")? 5 : 1)) {