diff --git a/components/public/structured-directory.tsx b/components/public/structured-directory.tsx
index d853d65..2440e09 100644
--- a/components/public/structured-directory.tsx
+++ b/components/public/structured-directory.tsx
@@ -53,6 +53,24 @@ type GuideCard = {
   publishedCatalogVersion: string | null;
 };
 
+const elementLabels: Record<string, string> = {
+  Pyro: "ไฟ",
+  Hydro: "น้ำ",
+  Anemo: "ลม",
+  Electro: "ไฟฟ้า",
+  Dendro: "ไม้",
+  Cryo: "น้ำแข็ง",
+  Geo: "หิน",
+};
+
+const weaponTypeLabels: Record<string, string> = {
+  WEAPON_SWORD_ONE_HAND: "ดาบ",
+  WEAPON_CLAYMORE: "ดาบใหญ่",
+  WEAPON_POLE: "หอก",
+  WEAPON_BOW: "ธนู",
+  WEAPON_CATALYST: "สื่อเวท",
+};
+
 export function StructuredDirectory({ guides }: { guides: GuideCard[] }) {
   const searchParams = useSearchParams();
   const query = searchParams.get("q") ?? "";
@@ -101,8 +119,8 @@ export function StructuredDirectory({ guides }: { guides: GuideCard[] }) {
         />
       </InputGroup>
       <div className="flex flex-wrap gap-2" aria-label="ตัวกรองไกด์">
-        <GuideFilter label="ธาตุ" value={element} options={elements} onChange={(value) => setParam("element", value)} />
-        <GuideFilter label="อาวุธ" value={weapon} options={weapons} onChange={(value) => setParam("weapon", value)} />
+        <GuideFilter label="ธาตุ" value={element} options={elements} optionLabels={elementLabels} onChange={(value) => setParam("element", value)} />
+        <GuideFilter label="อาวุธ" value={weapon} options={weapons} optionLabels={weaponTypeLabels} onChange={(value) => setParam("weapon", value)} />
         <GuideFilter label="ดาว" value={rarity} options={rarities.map(String)} onChange={(value) => setParam("rarity", value)} />
         <GuideFilter label="เรียงตาม" value={sort} options={["manual", "recent"]} optionLabels={{ manual: "แนะนำ", recent: "อัปเดตล่าสุด" }} includeAll={false} onChange={(value) => setParam("sort", value)} />
       </div>