diff --git a/api/tasks/getDetails.cfm b/api/tasks/getDetails.cfm
index 0f7967a..d786170 100644
--- a/api/tasks/getDetails.cfm
+++ b/api/tasks/getDetails.cfm
@@ -127,22 +127,27 @@
     "CustomerPhone": qTask.ContactNumber ?: "",
     "CustomerPhotoUrl": customerPhotoUrl,
     "BeaconUUID": "",
+    "BeaconMajor": 0,
+    "BeaconMinor": 0,
     "LineItems": [],
     "TableMembers": []
   }>
 
-  <!--- Get beacon UUID for the service point (for auto-completion on Works app) --->
+  <!--- Get beacon sharding info for the business (for auto-completion on Works app) --->
+  <!--- Sharding: UUID from BeaconShards, Major from Businesses.BeaconMajor, Minor = ServicePointID --->
   <cfif val(qTask.ServicePointID) GT 0>
-    <cfset qBeacon = queryExecute("
-      SELECT b.UUID
-      FROM ServicePoints sp_link
-      INNER JOIN Beacons b ON b.ID = sp_link.BeaconID
-      WHERE sp_link.ID = ?
-        AND b.IsActive = 1
+    <cfset qShard = queryExecute("
+      SELECT bs.UUID AS ShardUUID, b.BeaconMajor
+      FROM Businesses b
+      INNER JOIN BeaconShards bs ON bs.ID = b.BeaconShardID
+      WHERE b.ID = ?
+        AND bs.IsActive = 1
       LIMIT 1
-    ", [ { value = qTask.ServicePointID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
-    <cfif qBeacon.recordCount GT 0>
-      <cfset result.BeaconUUID = qBeacon.UUID>
+    ", [ { value = qTask.BusinessID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+    <cfif qShard.recordCount GT 0>
+      <cfset result.BeaconUUID = qShard.ShardUUID>
+      <cfset result.BeaconMajor = val(qShard.BeaconMajor)>
+      <cfset result.BeaconMinor = val(qTask.ServicePointID)>
     </cfif>
   </cfif>