diff --git a/src/composables/useTalents.ts b/src/composables/useTalents.ts
index 67f2d5e..ad5406f 100644
--- a/src/composables/useTalents.ts
+++ b/src/composables/useTalents.ts
@@ -23,14 +23,9 @@ export async function useTalents() {
     data: getCategories,
   } = await $trpc.talents.getCategories.useQuery()
 
-  function getCategoryById(id: number) {
-    return getCategories.value?.find(category => category.id === id)?.name || 'Not Found'
-  }
-
   return {
     talents,
     getCategories,
-    getCategoryById,
     isFavorite,
     switchCategory,
     toggleFavorite,
diff --git a/src/pages/talents.vue b/src/pages/talents.vue
index 95e770e..dca3725 100644
--- a/src/pages/talents.vue
+++ b/src/pages/talents.vue
@@ -4,7 +4,7 @@ useHead({
 })
 
 const categories = ref<Array<{ label: string, slug: string }>>([{ label: 'All', slug: 'all' }])
-const { getCategories, talents, getCategoryById, isFavorite, toggleFavorite, switchCategory  } = await useTalents()
+const { getCategories, talents, isFavorite, toggleFavorite, switchCategory } = await useTalents()
 
 getCategories.value?.forEach(category => categories.value.push({ label: category.name, slug: category.slug }))
 
@@ -103,9 +103,9 @@ function getColor() {
           <div class="flex gap-2 z-10">
             <span
               v-for="category in talent.categories"
-              :key="category.id"
+              :key="`${category.talentId}-${category.categoryId}`"
               class="text-[.6rem] px-1 text-subtitle rounded-md ring-1 ring-zinc-900/5 dark:border dark:border-zinc-700/50 dark:bg-zinc-800 dark:ring-0"
-            >{{ getCategoryById(category.categoryId) }}</span>
+            >{{ category.category.name }}</span>
           </div>
           <p class="relative z-10 mt-4 flex text-sm font-medium items-center" :class="getColor()">
             <UIcon name="i-ph-link-bold" />
@@ -114,7 +114,7 @@ function getColor() {
         </div>
       </div>
       <p v-else-if="talents?.length === 0" class="my-8 text-subtitle">
-        There are no talents here. Maybe soon...
+        There are no talents for this category. Maybe soon...
       </p>
       <p v-else class="my-8 text-subtitle">
         The talents are loading...
diff --git a/src/server/trpc/routers/talents.ts b/src/server/trpc/routers/talents.ts
index 1711f8e..ea4664c 100644
--- a/src/server/trpc/routers/talents.ts
+++ b/src/server/trpc/routers/talents.ts
@@ -15,7 +15,12 @@ export default router({
               createdAt: 'desc',
             },
             include: {
-              categories: true,
+              categories: {
+                include: {
+                  talent: true,
+                  category: true,
+                }
+              },
             },
             where: {
               favorite: true,
@@ -27,7 +32,12 @@ export default router({
               createdAt: 'desc',
             },
             include: {
-              categories: true,
+              categories: {
+                include: {
+                  talent: true,
+                  category: true,
+                }
+              },
             },
             where: {
               favorite: true,
@@ -42,7 +52,12 @@ export default router({
               createdAt: 'desc',
             },
             include: {
-              categories: true,
+              categories: {
+                include: {
+                  talent: true,
+                  category: true,
+                }
+              },
             },
             where: {
               categories: { every: { category: {} } },
@@ -53,7 +68,12 @@ export default router({
               createdAt: 'desc',
             },
             include: {
-              categories: true,
+              categories: {
+                include: {
+                  talent: true,
+                  category: true,
+                }
+              },
             },
             where: {
               categories: { some: { category: { slug: input.category } } },