diff --git a/app/Services/Admin/Master/Product/ProductService.php b/app/Services/Admin/Master/Product/ProductService.php
index c00ecdb..9a9c665 100644
--- a/app/Services/Admin/Master/Product/ProductService.php
+++ b/app/Services/Admin/Master/Product/ProductService.php
@@ -27,8 +27,9 @@ public function __construct(
 
     public function getNames(): Collection
     {
-        return Product::select(['id', 'name'])
-            ->get();
+        return Product::select('name')
+            ->distinct()
+            ->pluck('name');
     }
 
     public function paginated(int $perPage = 25, string $search = '', string $sort = 'created_at', string $direction = 'desc', array $filters = []): LengthAwarePaginator
diff --git a/resources/js/pages/admin/master/product/index.tsx b/resources/js/pages/admin/master/product/index.tsx
index 9e001c9..b122c97 100644
--- a/resources/js/pages/admin/master/product/index.tsx
+++ b/resources/js/pages/admin/master/product/index.tsx
@@ -168,7 +168,7 @@ export default function ProductIndex({ products, categories, productNames, filte
                         </ComboboxEmpty>
                         <ComboboxList>
                             {(name) => (
-                                <ComboboxItem value={name}>{name}</ComboboxItem>
+                                <ComboboxItem key={name} value={name}>{name}</ComboboxItem>
                             )}
                         </ComboboxList>
                     </ComboboxContent>
@@ -224,6 +224,7 @@ export default function ProductIndex({ products, categories, productNames, filte
                 <Combobox
                     items={categories}
                     itemToStringLabel={(cat) => cat.name}
+                    getOptionAsValue={(cat) => String(cat.id)}
                     value={selectedCategory}
                     onValueChange={(value) =>
                         applyFilter('category', value ? String(value.id) : '')
@@ -239,7 +240,7 @@ export default function ProductIndex({ products, categories, productNames, filte
                         </ComboboxEmpty>
                         <ComboboxList>
                             {(cat) => (
-                                <ComboboxItem value={cat}>
+                                <ComboboxItem key={cat.id} value={cat}>
                                     {cat.name}
                                 </ComboboxItem>
                             )}