diff --git a/documentation/current/eiffelstudio/_images/query-return-type-icon.png b/documentation/current/eiffelstudio/_images/query-return-type-icon.png
new file mode 100644
index 00000000..6e9011ec
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/query-return-type-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/query-return-type-icon.png.data b/documentation/current/eiffelstudio/_images/query-return-type-icon.png.data
new file mode 100644
index 00000000..df2fd019
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/query-return-type-icon.png.data
@@ -0,0 +1,3 @@
+title=query return type icon
+author=halw
+path=content/query-return-type-icon
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
index 4b15ee7e..5a2eb88c 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
@@ -23,14 +23,19 @@ The class auto-completion window will pop up and display the list of class names
 
 [[Image:editor-class-auto-completion-window]]  
 
-Figure 1. The class auto-completion window
+Figure 1. The class name auto-completion window
 
 
 ===Options===
 
-At the bottom of the auto-completion window you will find a row of icons labeled "Options:". These icons help you control which choices are presented to you and the format of their presentation.  
-
-
+At the bottom of the auto-completion window you will find a row of icons labeled "Options:". These icons help you control which choices are presented to you and the format of their presentation. 
+
+Each icon can be toggled between an "up" position and a "down" position by clicking on it. You can also toggle the option icons up and down by using the function keys <code>F1</code> through <code>F7</code>.
+
+Not all of the options are applicable to class name auto-completion. Some apply only to feature name completion.
+
+* [[Image:filter]]  (F1) Filter: When down, you will see only those class names whose first characters match the string you have typed. When up, you see all classes in your system's universe.
+* 
 
 
 
diff --git a/documentation/current/papers/index.wiki b/documentation/current/papers/index.wiki
index 5e741757..cc61c24a 100644
--- a/documentation/current/papers/index.wiki
+++ b/documentation/current/papers/index.wiki
@@ -2,5 +2,9 @@
 [[Property:link_title|]]
 [[Property:weight|1]]
 [[Property:uuid|d2b880d6-d1dc-9811-32b8-ed718ad4d4be]]
+Occasionally we produce papers which provide background, foundation, or supplemental information about the topics covered by the Eiffel documentation. Although the material in these papers might be of interest to many Eiffel users, they might not be suitable in their current form for inclusion in the mainstream documentation books. 
+
+You will find a collection of these papers in this book.
+