diff --git a/api/orders/submit.cfm b/api/orders/submit.cfm
index c6dc3f7..68339b1 100644
--- a/api/orders/submit.cfm
+++ b/api/orders/submit.cfm
@@ -42,7 +42,7 @@
         ItemID,
         IsDeleted
       FROM OrderLineItems
-      WHERE ID = ?
+      WHERE OrderID = ?
       ORDER BY ID
     ",
     [ { value = arguments.OrderID, cfsqltype = "cf_sql_integer" } ],
@@ -90,7 +90,7 @@
     )>
 
     <cfloop query="qMeta">
-      <cfset out.itemMeta[qMeta.ItemID] = {
+      <cfset out.itemMeta[qMeta.ID] = {
         "requires": qMeta.RequiresChildSelection,
         "maxSel": qMeta.MaxNumSelectionReq
       }>
@@ -143,9 +143,9 @@
     "
       SELECT o.ID, o.StatusID, o.OrderTypeID, o.BusinessID, o.ServicePointID,
              o.GrantID, o.GrantOwnerBusinessID,
-             sp.ServicePointName AS Name
+             sp.Name AS Name
       FROM Orders o
-      LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.ServicePointID
+      LEFT JOIN ServicePoints sp ON sp.ID = o.ServicePointID
       WHERE o.ID = ?
       LIMIT 1
     ",
@@ -199,9 +199,9 @@
     "
       SELECT COUNT(*) AS Cnt
       FROM OrderLineItems
-      WHERE ID = ?
+      WHERE OrderID = ?
         AND ParentOrderLineItemID = 0
-        AND IsDeleted = b'0'
+        AND IsDeleted = 0
     ",
     [ { value = OrderID, cfsqltype = "cf_sql_integer" } ],
     { datasource = "payfrit" }