diff --git a/components/shared/activate-product-button.tsx b/components/shared/activate-product-button.tsx
index 90c19c4..c64da62 100644
--- a/components/shared/activate-product-button.tsx
+++ b/components/shared/activate-product-button.tsx
@@ -28,6 +28,7 @@ export function ActivateProductButton({ productId, isDemo, redirectTo, label = '
   }
 
   return (
+    <span data-debug-id="activate-product-button" data-debug-label="ActivateProductButton — shared/activate-product-button.tsx">
     <DemoTooltip show={isDemo}>
       <button
         onClick={() => !isDemo && handleActivate()}
@@ -37,5 +38,6 @@ export function ActivateProductButton({ productId, isDemo, redirectTo, label = '
         {label}
       </button>
     </DemoTooltip>
+    </span>
   )
 }
diff --git a/components/shared/code-badge.tsx b/components/shared/code-badge.tsx
index 126dbeb..618b3af 100644
--- a/components/shared/code-badge.tsx
+++ b/components/shared/code-badge.tsx
@@ -9,6 +9,8 @@ export function CodeBadge({ code, className }: CodeBadgeProps) {
   if (!code) return null
   return (
     <span
+      data-debug-id="code-badge"
+      data-debug-label="CodeBadge — shared/code-badge.tsx"
       className={cn(
         'inline-flex items-center rounded-md border border-border bg-surface-container px-1.5 py-0.5 font-mono text-[11px] leading-none text-muted-foreground',
         className,
diff --git a/components/shared/pbi-status-select.tsx b/components/shared/pbi-status-select.tsx
index 9730ef2..60912a9 100644
--- a/components/shared/pbi-status-select.tsx
+++ b/components/shared/pbi-status-select.tsx
@@ -26,6 +26,7 @@ interface PbiStatusSelectProps {
 
 export function PbiStatusSelect({ value, onChange, className }: PbiStatusSelectProps) {
   return (
+    <span data-debug-id="pbi-status-select" data-debug-label="PbiStatusSelect — shared/pbi-status-select.tsx">
     <Select
       value={value}
       onValueChange={(v) => { if (v) onChange(v as PbiStatusApi) }}
@@ -39,5 +40,6 @@ export function PbiStatusSelect({ value, onChange, className }: PbiStatusSelectP
         <SelectItem value="done">Afgerond</SelectItem>
       </SelectContent>
     </Select>
+    </span>
   )
 }
diff --git a/components/shared/priority-select.tsx b/components/shared/priority-select.tsx
index a66e66c..e0f5561 100644
--- a/components/shared/priority-select.tsx
+++ b/components/shared/priority-select.tsx
@@ -25,6 +25,7 @@ interface PrioritySelectProps {
 
 export function PrioritySelect({ value, onChange, className }: PrioritySelectProps) {
   return (
+    <span data-debug-id="priority-select" data-debug-label="PrioritySelect — shared/priority-select.tsx">
     <Select
       value={String(value)}
       onValueChange={(v) => { if (v) onChange(parseInt(v)) }}
@@ -39,5 +40,6 @@ export function PrioritySelect({ value, onChange, className }: PrioritySelectPro
         <SelectItem value="4">Laag</SelectItem>
       </SelectContent>
     </Select>
+    </span>
   )
 }
diff --git a/components/shared/set-current-product.tsx b/components/shared/set-current-product.tsx
index c535eb6..6d173d2 100644
--- a/components/shared/set-current-product.tsx
+++ b/components/shared/set-current-product.tsx
@@ -11,5 +11,5 @@ export function SetCurrentProduct({ id, name }: { id: string; name: string }) {
     return () => clearCurrentProduct()
   }, [id, name, setCurrentProduct, clearCurrentProduct])
 
-  return null
+  return <span data-debug-id="set-current-product" data-debug-label="SetCurrentProduct — shared/set-current-product.tsx" hidden />
 }