diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
index 95e0bdc7..a1d8f200 100644
--- a/src/qtgui/rclmain_w.cpp
+++ b/src/qtgui/rclmain_w.cpp
@@ -424,6 +424,14 @@ void RclMain::viewUrl()
     if (!rcldb->getDoc(udi, doc) || doc.pc == -1)
 	return;
 
+    // StartNativeViewer needs a db source to call getEnclosing() on.
+    Rcl::Query *query = new Rcl::Query(rcldb);
+    DocSequenceDb *src = 
+	new DocSequenceDb(RefCntr<Rcl::Query>(query), "", 
+			  RefCntr<Rcl::SearchData>(new Rcl::SearchData));
+    m_source = RefCntr<DocSequence>(src);
+
+
     // Start a native viewer if the mimetype has one defined, else a
     // preview.
     string apptag;
diff --git a/src/query/docseqdb.cpp b/src/query/docseqdb.cpp
index 4fd3d030..c403c378 100644
--- a/src/query/docseqdb.cpp
+++ b/src/query/docseqdb.cpp
@@ -122,8 +122,9 @@ int DocSequenceDb::getFirstMatchPage(Rcl::Doc &doc, string& term)
 
 bool DocSequenceDb::getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) 
 {
-    if (!setQuery())
-	return false;
+    // Note: no need for setQuery here, we're just passing through a
+    // query-independant request
+
     string udi;
     if (!FileInterner::getEnclosing(doc.url, doc.ipath, pdoc.url, pdoc.ipath,
                                     udi))
diff --git a/website/BUGS.html b/website/BUGS.html
index 31654388..19875434 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -38,9 +38,18 @@
       
       <h2><a name="b_latest">recoll 1.18.0</a></h2> 
 
-      <li>On systems such as Debian Stable which use Evince version 2.x as
-        a PDF viewer, the default "Open" command for PDF files will
-        not work. You need to edit the command:
+      <li>Opening embedded documents from the Unity Lens does not
+        work.</li>
+
+      <li>It seems that a click in the snippets window can crash
+        recoll the very first time it is used. I could never reproduce
+        this on later runs and it is not known what causes the
+        problem. Just restart the application, and things should stay
+        up the next times.</li>
+
+      <li>On systems such as Debian Stable which use Evince version
+        2.x (not 3.x) as PDF viewer, the default "Open" command for
+        PDF files will not work. You need to edit the command:
         in <em>Preferences->GUI&nbsp;configuration</em>,
         uncheck <em>Use&nbsp;desktop&nbsp;preferences...</em>, then
         click <em>Choose&nbsp;editor&nbsp;applications</em>, and for