diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
index 0813ddd18c..4dcb453fa7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.js
@@ -72,6 +72,7 @@ function main()
    	"location": event.properties["ia:whereEvent"],
       "from": event.properties["ia:fromDate"],
       "to": event.properties["ia:toDate"],
+      "tags": event.tags
    };
  
    // Figure out if this an all day event
@@ -97,6 +98,8 @@ function isAllDayEvent(event)
    
    var startTime = startDate.getHours() + ":" + startDate.getMinutes();
    var endTime = endDate.getHours() + ":" + endDate.getMinutes();
+   
+   logger.log("STARTTIME: " + startTime + " " + endTime + " " + (startTime == "0:0" && (startTime == endTime)));
   
-   return (startTime === "0:0" && (startTime === endTime));
+   return (startTime == "0:0" && (startTime == endTime));
 }
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
index f09ba5c2f6..5d18777208 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
@@ -6,6 +6,11 @@
   what: "${result.what}",
   description: "${result.description}",
   location: "${result.location}",
+  tags: [
+  <#list result.tags as tag>
+   "${tag}"<#if tag_has_next>,</#if>
+  </#list>
+  ],
   from: "${result.from?string("M/d/yyyy")}",
   start: "${result.from?string("HH:mm")}",
   to: "${result.to?string("M/d/yyyy")}",
diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
index 0bfc7edb1b..868e6da815 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.post.js
@@ -80,17 +80,20 @@ function createEvent(siteId, params)
   var toDate = params["to"];
   
   var allday = params["allday"];
-  if (!allday)
+  if (allday === undefined)
   {
      fromDate += " " + params["start"];
      toDate += " " + params["end"];
   }
   
-  var tags = params["tags"]; // space delimited string
-  if (tags)
+  var tags = String(params["tags"]); // space delimited string
+  if (tags !== "")
   {
      var tagsArray = tags.split(" ");
-     event.tags = tagsArray;
+     if (tagsArray.length > 0)
+     {
+        event.tags = tagsArray;
+     }
   }
   
   var from = new Date(fromDate);