diff --git a/datastore/tasks.js b/datastore/tasks.js
index 0406e48541..c8334abbe4 100755
--- a/datastore/tasks.js
+++ b/datastore/tasks.js
@@ -72,11 +72,21 @@ function addTask (description, callback) {
 
   datastore.save({
     key: taskKey,
-    data: {
-      created: new Date().toJSON(),
-      description: description,
-      done: false
-    }
+    data:  [
+      {
+        name: 'created',
+        value: new Date().toJSON()
+      },
+      {
+        name: 'description',
+        value: description,
+        excludeFromIndexes: true
+      },
+      {
+        name: 'done',
+        value: false
+      }
+    ]
   }, function (err) {
     if (err) {
       callback(err);