diff --git a/api/Application.cfm b/api/Application.cfm
index e0511cd..93b41e0 100644
--- a/api/Application.cfm
+++ b/api/Application.cfm
@@ -64,6 +64,10 @@ if (len(request._api_path)) {
   if (findNoCase("/api/businesses/list.cfm", request._api_path)) request._api_isPublic = true;
   if (findNoCase("/api/servicepoints/list.cfm", request._api_path)) request._api_isPublic = true;
   if (findNoCase("/api/menu/items.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/orders/getOrCreateCart.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/orders/getCart.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/orders/setLineItem.cfm", request._api_path)) request._api_isPublic = true;
+  if (findNoCase("/api/orders/submit.cfm", request._api_path)) request._api_isPublic = true;
 }
 
 // Carry session values into request (if present)
diff --git a/api/menu/items.cfm b/api/menu/items.cfm
index 3865f1d..87248ee 100644
--- a/api/menu/items.cfm
+++ b/api/menu/items.cfm
@@ -42,6 +42,7 @@
       SELECT
         i.ItemID,
         i.ItemCategoryID,
+        c.CategoryName,
         i.ItemName,
         i.ItemDescription,
         i.ItemParentItemID,
@@ -67,6 +68,7 @@
     <cfset arrayAppend(rows, {
       "ItemID": q.ItemID,
       "ItemCategoryID": q.ItemCategoryID,
+      "ItemCategoryName": q.CategoryName,
       "ItemName": q.ItemName,
       "ItemDescription": q.ItemDescription,
       "ItemParentItemID": q.ItemParentItemID,
diff --git a/api/orders/getCart.cfm b/api/orders/getCart.cfm
index 6333b91..43c92b3 100644
--- a/api/orders/getCart.cfm
+++ b/api/orders/getCart.cfm
@@ -104,7 +104,7 @@
   <cfset apiAbort({
     "OK": true,
     "ERROR": "",
-    "Order": {
+    "ORDER": {
       "OrderID": qOrder.OrderID,
       "OrderUUID": qOrder.OrderUUID,
       "OrderUserID": qOrder.OrderUserID,
@@ -121,7 +121,7 @@
       "OrderSubmittedOn": qOrder.OrderSubmittedOn,
       "OrderServicePointID": qOrder.OrderServicePointID
     },
-    "OrderLineItems": rows
+    "ORDERLINEITEMS": rows
   })>
 
   <cfcatch>
diff --git a/api/orders/setLineItem.cfm b/api/orders/setLineItem.cfm
index 0c6d332..6bbf7bd 100644
--- a/api/orders/setLineItem.cfm
+++ b/api/orders/setLineItem.cfm
@@ -164,7 +164,7 @@
     <cfreturn { "OK": false, "ERROR": "not_found", "MESSAGE": "Order not found", "DETAIL": "" }>
   </cfif>
 
-  <cfset out.Order = {
+  <cfset out.ORDER = {
     "OrderID": qOrder.OrderID,
     "OrderUUID": qOrder.OrderUUID,
     "OrderUserID": qOrder.OrderUserID,
@@ -219,7 +219,7 @@
     })>
   </cfloop>
 
-  <cfset out.OrderLineItems = rows>
+  <cfset out.ORDERLINEITEMS = rows>
   <cfset out.OK = true>
   <cfset out.ERROR = "">
   <cfreturn out>
@@ -308,7 +308,7 @@
         [
           { value = Quantity, cfsqltype = "cf_sql_integer" },
           { value = qItem.ItemPrice, cfsqltype = "cf_sql_decimal" },
-          { value = (len(trim(Remark)) EQ 0 ? javacast("null","") : Remark), cfsqltype = "cf_sql_varchar", null = (len(trim(Remark)) EQ 0) },
+          { value = Remark, cfsqltype = "cf_sql_varchar", null = (len(trim(Remark)) EQ 0) },
           { value = qExisting.OrderLineItemID, cfsqltype = "cf_sql_integer" }
         ],
         { datasource = "payfrit" }
@@ -365,7 +365,7 @@
           { value = ItemID, cfsqltype = "cf_sql_integer" },
           { value = qItem.ItemPrice, cfsqltype = "cf_sql_decimal" },
           { value = (ParentLineItemID EQ 0 ? Quantity : 1), cfsqltype = "cf_sql_integer" },
-          { value = (len(trim(Remark)) EQ 0 ? javacast("null","") : Remark), cfsqltype = "cf_sql_varchar", null = (len(trim(Remark)) EQ 0) },
+          { value = Remark, cfsqltype = "cf_sql_varchar", null = (len(trim(Remark)) EQ 0) },
           { value = now(), cfsqltype = "cf_sql_timestamp" }
         ],
         { datasource = "payfrit" }