diff --git a/src/command.cpp b/src/command.cpp
index 9c2453f5c..781e05830 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -599,7 +599,6 @@ int handleQuery (std::string& outs)
     // Note: "limit:" feature not supported.
 
     // Compose output.
-    outs = "[";
     std::vector <Task>::iterator t;
     for (t = tasks.begin (); t != tasks.end (); ++t)
     {
@@ -609,8 +608,7 @@ int handleQuery (std::string& outs)
       outs += t->composeJSON ();
     }
 
-    outs += "]\n";
-
+    outs += "\n";
     context.hooks.trigger ("post-query-command");
   }
 
diff --git a/src/edit.cpp b/src/edit.cpp
index 19a4df070..acd460726 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -145,13 +145,15 @@ static std::string formatTask (Task task)
   join (allTags, " ", tags);
 
   if (verbose)
-    before << "# Separate the tags with spaces, like this: tag1 tag2\n"
-           << "  Tags:              " << allTags                                          << "\n"
-           << "# The description field is allowed to wrap and use multiple lines.  Task\n"
+    before << "# Separate the tags with spaces, like this: tag1 tag2\n";
+
+  before   << "  Tags:              " << allTags                                        << "\n";
+
+  if (verbose)
+    before << "# The description field is allowed to wrap and use multiple lines.  Task\n"
            << "# will combine them.\n";
 
-  before << "  Tags:              " << allTags                                          << "\n"
-         << "  Description:       " << task.get ("description")                         << "\n"
+  before << "  Description:       " << task.get ("description")                         << "\n"
          << "  Created:           " << formatDate (task, "entry")                       << "\n"
          << "  Started:           " << formatDate (task, "start")                       << "\n"
          << "  Ended:             " << formatDate (task, "end")                         << "\n"