diff --git a/.claude/skills/pr-workflow.md b/.claude/skills/pr-workflow/SKILL.md
similarity index 100%
rename from .claude/skills/pr-workflow.md
rename to .claude/skills/pr-workflow/SKILL.md
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index e23e55f1fb..3a2f96715c 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -201,8 +201,8 @@ class Messaging extends Action
                     $countryCodes[$countryCode] = ($countryCodes[$countryCode] ?? 0) + 1;
                 }
             }
-            if (!empty($countryCodes)) {
-                Span::add('countryCodes', \json_encode($countryCodes));
+            foreach ($countryCodes as $code => $count) {
+                Span::add('countryCode_' . $code, $count);
             }
         }
 
@@ -441,8 +441,8 @@ class Messaging extends Action
                 $countryCodes[$countryCode] = ($countryCodes[$countryCode] ?? 0) + 1;
             }
         }
-        if (!empty($countryCodes)) {
-            Span::add('countryCodes', \json_encode($countryCodes));
+        foreach ($countryCodes as $code => $count) {
+            Span::add('countryCode_' . $code, $count);
         }
 
         if ($this->adapter === null) {