diff --git a/src/main.ts b/src/main.ts
index 021bf9f..714d184 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -469,7 +469,7 @@ class OmnivoreSettingTab extends PluginSettingTab {
               text: "https://omnivore.app/help/search",
               href: "https://omnivore.app/help/search",
             }),
-            " for more info on search query syntax"
+            " for more info on search query syntax. Make sure your Filter (in the section above) is set to advanced when using a custom query."
           );
         })
       )
diff --git a/src/settings/template.ts b/src/settings/template.ts
index 3df576c..23168b5 100644
--- a/src/settings/template.ts
+++ b/src/settings/template.ts
@@ -132,6 +132,7 @@ export const renderFilename = (
     : undefined;
   const renderedFilename = Mustache.render(filename, {
     title: article.title,
+    author: article.author ?? "unknown-author",
     date,
     dateSaved: date,
     datePublished,
@@ -320,6 +321,7 @@ export const renderFolderName = (
     date,
     dateSaved: date,
     datePublished,
+    author: article.author ?? "unknown-author",
   });
 };