diff --git a/api/tasks/getDetails.cfm b/api/tasks/getDetails.cfm
index d786170..86f6963 100644
--- a/api/tasks/getDetails.cfm
+++ b/api/tasks/getDetails.cfm
@@ -133,21 +133,20 @@
     "TableMembers": []
   }>
 
-  <!--- Get beacon sharding info for the business (for auto-completion on Works app) --->
-  <!--- Sharding: UUID from BeaconShards, Major from Businesses.BeaconMajor, Minor = ServicePointID --->
+  <!--- Get beacon sharding info from BeaconHardware (for auto-completion on Works app) --->
+  <!--- BeaconHardware stores: ShardUUID, Major, Minor for each registered beacon --->
   <cfif val(qTask.ServicePointID) GT 0>
-    <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
+    <cfset qBeacon = queryExecute("
+      SELECT bh.ShardUUID, bh.Major, bh.Minor
+      FROM BeaconHardware bh
+      WHERE bh.ServicePointID = ?
+        AND bh.Status IN ('assigned', 'verified')
       LIMIT 1
-    ", [ { 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)>
+    ", [ { value = qTask.ServicePointID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
+    <cfif qBeacon.recordCount GT 0>
+      <cfset result.BeaconUUID = qBeacon.ShardUUID>
+      <cfset result.BeaconMajor = val(qBeacon.Major)>
+      <cfset result.BeaconMinor = val(qBeacon.Minor)>
     </cfif>
   </cfif>