diff --git a/src/INSTALL b/src/INSTALL
index 1b416248..e8ae6a49 100644
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -1018,6 +1018,14 @@ Chapter 5. Installation and configuration
            Maximum handler execution time, after which it is aborted. Some
            postscript programs just loop...
 
+   filtermaxmbytes
+
+           Recoll 1.20.7 and later. Maximum handler memory utilisation. This
+           uses setrlimit(RLIMIT_AS) on most systems (total virtual memory
+           space size limit). Some programs may start with 500 MBytes of
+           mapped shared libraries, so take this into account when choosing a
+           value. The default is a liberal 2000MB.
+
    filtersdir
 
            A directory to search for the external input handler scripts used
diff --git a/src/README b/src/README
index ba729d19..b99332a5 100644
--- a/src/README
+++ b/src/README
@@ -1858,25 +1858,23 @@ Chapter 3. Searching
        third option has been available in recent releases and is probably now
        the best one: use PRE tags with line wrapping.
 
-     o Use desktop preferences to choose document editor: if this is checked,
-       the xdg-open utility will be used to open files when you click the
-       Open link in the result list, instead of the application defined in
-       mimeview. xdg-open will in term use your desktop preferences to choose
-       an appropriate application.
+     o Choose editor applicationsr: this opens a dialog which allows you to
+       select the application to be used to open each MIME type. The default
+       is nornally to use the xdg-open utility, but you can override it.
 
-     o Exceptions: when using the desktop preferences for opening documents,
-       these are MIME types that will still be opened according to Recoll
-       preferences. This is useful for passing parameters like page numbers
-       or search strings to applications that support them (e.g. evince).
-       This cannot be done with xdg-open which only supports passing one
-       parameter.
+     o Exceptions: even wen xdg-open is used by default for opening
+       documents, you can set exceptions for MIME types that will still be
+       opened according to Recoll preferences. This is useful for passing
+       parameters like page numbers or search strings to applications that
+       support them (e.g. evince). This cannot be done with xdg-open which
+       only supports passing one parameter.
 
-     o Choose editor applications this will let you choose the command
-       started by the Open links inside the result list, for specific
-       document types.
+     o Document filter choice style: this will let you choose if the document
+       categories are displayed as a list or a set of buttons, or a menu.
 
-     o Display category filter as toolbar... this will let you choose if the
-       document categories are displayed as a list or a set of buttons.
+     o Start with simple search mode: this lets you choose the value of the
+       simple search type on program startup. Either a fixed value (e.g.
+       Query Language, or the value in use when the program last exited.
 
      o Auto-start simple search on white space entry: if this is checked, a
        search will be executed each time you enter a space in the simple
@@ -2159,7 +2157,10 @@ Chapter 3. Searching
    recollq is not built by default. You can use the Makefile in the query
    directory to build it. This is a very simple program, and if you can
    program a little c++, you may find it useful to taylor its output format
-   to your needs.
+   to your needs. Not that recollq is only really useful on systems where the
+   Qt libraries (or even the X11 ones) are not available. Otherwise, just use
+   recoll -t, which takes the exact same parameters and options which are
+   described for recollq
 
    recollq has a man page (not installed by default, look in the doc/man
    directory). The Usage string is as follows:
@@ -4286,6 +4287,14 @@ Chapter 5. Installation and configuration
            Maximum handler execution time, after which it is aborted. Some
            postscript programs just loop...
 
+   filtermaxmbytes
+
+           Recoll 1.20.7 and later. Maximum handler memory utilisation. This
+           uses setrlimit(RLIMIT_AS) on most systems (total virtual memory
+           space size limit). Some programs may start with 500 MBytes of
+           mapped shared libraries, so take this into account when choosing a
+           value. The default is a liberal 2000MB.
+
    filtersdir
 
            A directory to search for the external input handler scripts used