diff --git a/index.html b/index.html
index 7068b37..f333869 100644
--- a/index.html
+++ b/index.html
@@ -216,8 +216,8 @@
                                                     <input type="text" class="form-control" id="authorField" placeholder="Auteur">
                                                 </div>
                                                 <div class="istex-tooltip" data-my-position="right middle" data-at-position="left middle">
-                                                    <h5>Éditeur</h5>
-                                                    <p>Cette facette permet de préciser un auteur sur lequel va porter la requête.</p>
+                                                    <h5>Auteur</h5>
+                                                    <p>Ce champ permet de préciser un auteur sur lequel va porter la requête.</p>
                                                     <div class="references">
                                                         <h6>
                                 <span class="label label-istex-documentation">ISTEX API Documentation:</span>
diff --git a/js/controllers/searchPageController.js b/js/controllers/searchPageController.js
index 792eaa0..20b86c0 100644
--- a/js/controllers/searchPageController.js
+++ b/js/controllers/searchPageController.js
@@ -282,7 +282,7 @@
           // WosFacet
           for (wos of data.aggregations.wos.buckets) {
             obj = {};
-            obj.value = "\"" + wos.key.replace(/"/g, '%22').replace(/&/g, '%26').replace(/ /g, '%20') + "\"";
+            obj.value = wos.key.replace(/"/g, '%22').replace(/&/g, '%26').replace(/ /g, '%20');
             obj.desc = wos.docCount + ' documents'
             obj.label = wos.key;
             wosList.push(obj);
@@ -372,15 +372,11 @@
         fields.push('*');
       }
 
-      corpusQuery = '';
-      $.each(searchPage.editor, function(index, editor) {
-        if (editor !== "-1") {
-          corpusQuery += editor + ',';
-        }
-      });
-      if (corpusQuery) {
-        ctrlScope.helper.corpus.query = "AND corpusName:" + corpusQuery.slice(0, -1);
-        fields.push(" corpusName:" + corpusQuery.slice(0, -1));
+      if (searchPage.editor.length > 0) {
+        if (searchPage.editor[0] === '-1') searchPage.editor[0] = '*';
+        var corpusQuery = '(\"' + searchPage.editor.join("\" OR \"") + '\")';
+        ctrlScope.helper.WOS.query = "corpusName:" + corpusQuery;
+        fields.push("corpusName:" + corpusQuery);
       } else {
         ctrlScope.helper.corpus.query = null;
       }
@@ -388,16 +384,16 @@
       if ($("#advancedSearchPanel").is(':visible')) {
 
         if (searchPage.author !== "" && searchPage.author !== undefined) {
-          ctrlScope.helper.author.query = "AND author.name:" + searchPage.author;
-          fields.push("author.name:" + searchPage.author);
+          ctrlScope.helper.author.query = "AND author.name:\"" + searchPage.author + "\"";
+          fields.push("author.name:\"" + searchPage.author + "\"");
         }
         if (searchPage.title !== "" && searchPage.title !== undefined) {
-          ctrlScope.helper.title.query = "AND title:" + searchPage.title;
-          fields.push("title:" + searchPage.title);
+          ctrlScope.helper.title.query = "AND title:\"" + searchPage.title + "\"";
+          fields.push("title:\"" + searchPage.title + "\"");
         }
         if (searchPage.keywords !== "" && searchPage.keywords !== undefined) {
-          ctrlScope.helper.subject.query = "AND subject.value:" + searchPage.keywords;
-          fields.push("subject.value:" + searchPage.keywords);
+          ctrlScope.helper.subject.query = "AND subject.value:\"" + searchPage.keywords + "\"";
+          fields.push("subject.value:\"" + searchPage.keywords + "\"");
         }
       }
 
@@ -411,7 +407,7 @@
       }
 
       if (searchPage.WOS.length > 0) {
-        var wosQuery = '(' + searchPage.WOS.join(" OR ") + ')';
+        var wosQuery = '(\"' + searchPage.WOS.join("\" OR \"") + '\")';
         ctrlScope.helper.WOS.query = "categories.wos:" + wosQuery;
         fields.push("categories.wos:" + wosQuery);
       } else {
@@ -419,7 +415,7 @@
       }
 
       if (searchPage.language.length > 0) {
-        var langQuery = '(' + searchPage.language.join(" OR ") + ')';
+        var langQuery = '(\"' + searchPage.language.join("\" OR \"") + '\")';
         ctrlScope.helper.lang.query = "language:" + langQuery;
         fields.push("language:" + langQuery);
       } else {
@@ -447,7 +443,7 @@
       }
 
       if (searchPage.PDFVersion.length > 0) {
-        var pdfQuery = '(' + searchPage.PDFVersion.join(" OR ") + ')';
+        var pdfQuery = '(\"' + searchPage.PDFVersion.join("\" OR \"") + '\")';
         ctrlScope.helper.PDFVersion.query = " AND qualityIndicators.pdfVersion:" + pdfQuery;
         ctrlScope.helper.quality.query += ctrlScope.helper.PDFVersion.query;
         fields.push("qualityIndicators.pdfVersion:" + pdfQuery);