1 files changed, 13 insertions, 2 deletions
diff --git a/installer/5/el/content/nwSearchFnt.js b/installer/5/el/content/nwSearchFnt.js
index fc12d113..13327867 100644
--- a/installer/5/el/content/nwSearchFnt.js
+++ b/installer/5/el/content/nwSearchFnt.js
@@ -104,11 +104,17 @@ function Effectuer_recherche(expressionInput) {
         }
     }
     finalWordsList = tempTab;
+    
+    if (!finalWordsList.length) {
+        finalWordsList = wordsList;
+    }
+    
+    fileAndWordList = SortResults(finalWordsList);
 
-    if (finalWordsList.length) {
+    if (fileAndWordList && fileAndWordList.length) {
 
         //search 'and' and 'or' one time
-        fileAndWordList = SortResults(finalWordsList);
+        //fileAndWordList = SortResults(finalWordsList);
 
         var cpt = fileAndWordList.length;
         for (var i = cpt - 1; i >= 0; i--) {
@@ -432,6 +438,11 @@ function SortResults(mots) {
         // get the list of the indices of the files.
         var listNumerosDesFicStr = w[mots[t].toString()];
         //alert ("listNumerosDesFicStr "+listNumerosDesFicStr);
+        
+        if (!listNumerosDesFicStr) {
+            return;
+        }
+        
         var tab = listNumerosDesFicStr.split(",");
 
         //for each file (file's index):