--- a/mail/base/content/gloda-autocomplete-input.js
+++ b/mail/base/content/gloda-autocomplete-input.js
@@ -140,21 +140,19 @@ customElements.whenDefined("autocomplete
             } else if (row.nounDef) {
               let theQuery = Gloda.newQuery(Gloda.NOUN_MESSAGE);
               if (row.nounDef.name == "tag") {
                 theQuery = theQuery.tags(row.item);
               } else if (row.nounDef.name == "identity") {
                 theQuery = theQuery.involves(row.item);
               }
               theQuery.orderBy("-date");
-              document
-                .getElementById("tabmail")
-                .openTab("glodaFacet", {
-                  query: theQuery,
-                });
+              document.getElementById("tabmail").openTab("glodaFacet", {
+                query: theQuery,
+              });
             }
           }
         },
       };
 
       let keyLabel =
         AppConstants.platform == "macosx" ? "keyLabelMac" : "keyLabelNonMac";
       let placeholder = this.getAttribute("emptytextbase").replace(

--- a/mail/base/content/tabmail.js
+++ b/mail/base/content/tabmail.js
@@ -9,16 +9,19 @@
 /* import-globals-from commandglue.js */
 /* import-globals-from mailWindow.js */
 
 // Wrap in a block to prevent leaking to window scope.
 {
   const { Services } = ChromeUtils.import(
     "resource://gre/modules/Services.jsm"
   );
+  const { GlodaMsgSearcher } = ChromeUtils.import(
+    "resource:///modules/gloda/msg_search.js"
+  );
 
   /**
    * The MozTabmailAlltabsMenuPopup widget is used as a menupopup to list all the
    * currently opened tabs.
    *
    * @extends {MozElements.MozMenuPopup}
    * @implements {EventListener}
    */