diff --git a/src/CLI.cpp b/src/CLI.cpp
index 9b0b66fb..7ea0301e 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -404,12 +404,15 @@ void CLI::identifyFilter ()
       a.tag ("FILTER");
     }
 
-    else if (raw == "from"  ||
-             raw == "since" ||
-             raw == "to"    ||
-             raw == "until" ||
-             raw == "-"     ||
-             raw == "for")
+    else if (raw == "from"   ||
+             raw == "since"  ||
+             raw == "to"     ||
+             raw == "for"    ||
+             raw == "until"  ||
+             raw == "-"      ||
+             raw == "before" ||
+             raw == "after"  ||
+             raw == "ago")
     {
       a.tag ("FILTER");
       a.tag ("KEYWORD");
diff --git a/src/data.cpp b/src/data.cpp
index 11354136..1f76733b 100644
--- a/src/data.cpp
+++ b/src/data.cpp
@@ -90,6 +90,9 @@ Interval getFilter (const CLI& cli)
       }
       else if (arg.hasTag ("KEYWORD"))
       {
+        // Note: that KEYWORDS are not entities (why not?) and there is a list
+        //       in CLI.cpp of them that must be maintained and synced with this
+        //       function.
         args.push_back (raw);
       }
       else