diff --git a/Services/client/src/components/FileItem.vue b/Services/client/src/components/FileItem.vue
index d7e529a..ce059f9 100644
--- a/Services/client/src/components/FileItem.vue
+++ b/Services/client/src/components/FileItem.vue
@@ -323,7 +323,7 @@ async function submitFileForm(
           class="text-overflow-handle block q-px-md text-center"
           style="max-width: 100%"
         >
-          {{ getFileNameFormat(value.fileName) }}
+          {{ value.title }}
         </div>
       </div>
     </div>
diff --git a/Services/client/src/modules/01_user/components/FileDownload.vue b/Services/client/src/modules/01_user/components/FileDownload.vue
index 3fb07a0..a78c1f3 100644
--- a/Services/client/src/modules/01_user/components/FileDownload.vue
+++ b/Services/client/src/modules/01_user/components/FileDownload.vue
@@ -54,7 +54,7 @@ async function downloadSubmit(path: any) {
               color="primary"
             />
           </q-btn>
-          {{ getFileNameFormat(fileInfo?.fileName) }}</span
+          {{ fileInfo?.title }}</span
         >
       </div>
 
@@ -85,7 +85,7 @@ async function downloadSubmit(path: any) {
                 class="text-overflow-handle block q-px-md text-center"
                 style="max-width: 100%"
               >
-                {{ getFileNameFormat(fileInfo?.fileName) }}
+                {{ fileInfo?.title }}
               </div>
             </div>
             <div class="column q-py-sm">
@@ -133,12 +133,7 @@ async function downloadSubmit(path: any) {
               <span>กลุ่ม/หมวดหมู่</span>
             </div>
             <div class="col-grow">
-              <span
-                class="text-grey"
-                v-for="category in fileInfo?.category"
-                :key="category"
-                >{{ category }}</span
-              >
+              <span class="text-grey">{{ fileInfo?.category.join(', ') }}</span>
             </div>
           </div>
           <q-separator />
@@ -147,12 +142,7 @@ async function downloadSubmit(path: any) {
               <span>คำสำคัญ</span>
             </div>
             <div class="col-grow">
-              <span
-                class="text-grey"
-                v-for="keyword in fileInfo?.keyword"
-                :key="keyword"
-                >{{ keyword }}&nbsp;</span
-              >
+              <span class="text-grey">{{ fileInfo?.keyword.join(', ') }}</span>
             </div>
           </div>
           <q-separator />