diff --git a/src/Filter.cpp b/src/Filter.cpp
index bdcfcf77e..86718c252 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -146,7 +146,7 @@ void Filter::subset (std::vector <Task>& output)
 
     // Debug output from Eval during compilation is useful.  During evaluation
     // it is mostly noise.
-    eval.debug (context.config.getInteger ("debug.parser") >= 1 ? true : false);
+    eval.debug (context.config.getInteger ("debug.parser") >= 2 ? true : false);
     eval.compileExpression (filterExpr);
     eval.debug (false);
 
@@ -225,6 +225,9 @@ bool Filter::pendingOnly ()
   int countOr      = 0;
   int countXor     = 0;
 
+  // TODO Use an int index, and ensure that 'status', '==' and 'pending/waiting'
+  //      are consecutive.
+
   std::vector <A>::iterator a;
   for (a = context.cli._args.begin (); a != context.cli._args.end (); ++a)
   {