1 files changed, 11 insertions, 8 deletions
diff --git a/src/client/util/SearchUtil.ts b/src/client/util/SearchUtil.ts
index b09eff849..79759a71d 100644
--- a/src/client/util/SearchUtil.ts
+++ b/src/client/util/SearchUtil.ts
@@ -42,8 +42,9 @@ export namespace SearchUtil {
         let replacedQuery = query.replace(/type_t:([^ )])/g, (substring, arg) => `{!join from=id to=proto_i}*:* AND ${arg}`);
         if (options.onlyAliases) {
             const header = query.match(/_[atnb]?:/) ? replacedQuery : "DEFAULT:" + replacedQuery;
-            replacedQuery = `{!join from=id to=proto_i}${header}`;
+            replacedQuery = `{!join from=id to=proto_i}* AND ${header}`;
         }
+        //console.log("Q: " + replacedQuery + " fq: " + options.fq);
         const gotten = await rp.get(rpquery, { qs: { ...options, q: replacedQuery } });
         const result: IdSearchResult = gotten.startsWith("<") ? { ids: [], docs: [], numFound: 0, lines: [] } : JSON.parse(gotten);
         if (!returnDocs) {
@@ -59,12 +60,14 @@ export namespace SearchUtil {
         const fileids = txtresult ? txtresult.ids : [];
         const newIds: string[] = [];
         const newLines: string[][] = [];
-        await Promise.all(fileids.map(async (tr: string, i: number) => {
-            const docQuery = "fileUpload_t:" + tr.substr(0, 7); //If we just have a filter query, search for * as the query
-            const docResult = JSON.parse(await rp.get(Utils.prepend("/dashsearch"), { qs: { ...options, q: docQuery } }));
-            newIds.push(...docResult.ids);
-            newLines.push(...docResult.ids.map((dr: any) => txtresult.lines[i]));
-        }));
+        if (fileids) {
+            await Promise.all(fileids.map(async (tr: string, i: number) => {
+                const docQuery = "fileUpload_t:" + tr.substr(0, 7); //If we just have a filter query, search for * as the query
+                const docResult = JSON.parse(await rp.get(Utils.prepend("/dashsearch"), { qs: { ...options, q: docQuery } }));
+                newIds.push(...docResult.ids);
+                newLines.push(...docResult.ids.map((dr: any) => txtresult.lines[i]));
+            }));
+        }
 
 
         const theDocs: Doc[] = [];
@@ -91,7 +94,7 @@ export namespace SearchUtil {
             }
         }
 
-        return { docs: theDocs, numFound: result.numFound, highlighting, lines: theLines };
+        return { docs: theDocs, numFound: Math.max(0, result.numFound), highlighting, lines: theLines };
     }
 
     export async function GetAliasesOfDocument(doc: Doc): Promise<Doc[]>;