diff --git a/src/Task.cpp b/src/Task.cpp
index 170138a40..5c4ad37d1 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -946,6 +946,21 @@ bool Task::hasTag (const std::string& tag) const
   if (tag == "DUE")       return is_due ();
   if (tag == "DUETODAY")  return is_duetoday ();
   if (tag == "OVERDUE")   return is_overdue ();
+/*
+  TODO TODAY     - due today
+  TODO YESTERDAY - due yesterday
+  TODO TOMORROW  - due tomorrow
+  TODO WEEK      - due this week
+  TODO MONTH     - due this month
+  TODO YEAR      - due this year
+  TODO ANNOTATED - has any annotations
+  TODO ACTIVE    - is active
+  TODO SCHEDULED - is scheduled
+  TODO WAITING   - is waiting
+  TODO CHILD     - is a child
+  TODO PARENT    - is a parent
+  TODO UNTIL     - will expire
+*/
 
   // Concrete tags.
   std::vector <std::string> tags;
diff --git a/src/util.cpp b/src/util.cpp
index 63ab05a74..d9b6fb627 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -406,7 +406,7 @@ int execute(const std::string& executable, std::vector<std::string> arguments)
 
   // create command line before forking because the parent process also needs this for 
   // calling context.debug()
-  char shell[] = "bash";
+  char shell[] = "sh";
   char opt[]   = "-c";
 
   std::string cmdline = executable;
@@ -425,7 +425,7 @@ int execute(const std::string& executable, std::vector<std::string> arguments)
   {
     // this is done by the child process
     char** argv = new char*[4];
-    argv[0] = shell;                  // bash
+    argv[0] = shell;                  // sh
     argv[1] = opt;                    // -c
     argv[2] = (char*)cmdline.c_str();	// e.g. scp undo.data user@host:.task/
     argv[3] = NULL;                   // required by execv