diff --git a/Services/client/src/modules/01_user/components/FileDownload.vue b/Services/client/src/modules/01_user/components/FileDownload.vue
index dfa2bca..cee6f16 100644
--- a/Services/client/src/modules/01_user/components/FileDownload.vue
+++ b/Services/client/src/modules/01_user/components/FileDownload.vue
@@ -132,7 +132,7 @@ async function downloadSubmit(path: string | undefined) {
               <span>ชื่อเรื่อง</span>
             </div>
             <div class="col-grow">
-              <span class="text-grey">{{ fileInfo?.title }}</span>
+              <span class="text-grey">{{ fileInfo?.metadata.subject ?? fileInfo?.title }}</span>
             </div>
           </div>
           <q-separator />
@@ -147,10 +147,10 @@ async function downloadSubmit(path: string | undefined) {
           <q-separator />
           <div class="row">
             <div class="col-12 col-md-3">
-              <span>ผู้เขียน</span>
+              <span>เจ้าของผลงาน</span>
             </div>
             <div class="col-grow">
-              <span class="text-grey">{{ fileInfo?.author }}</span>
+              <span class="text-grey">{{ fileInfo?.metadata.author ?? fileInfo?.author }}</span>
             </div>
           </div>
           <q-separator />
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index e1c9df2..aa38ed7 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -30,6 +30,7 @@ const optionsField = [
   { label: 'คำสำคัญ (keyword)', value: 'keyword' },
   { label: 'หมวดหมู่ (category)', value: 'category' },
   { label: 'เนื้อหาในไฟล์ (content)', value: 'attachment.content' },
+  { label: 'เจ้าของผลงาน (author)', value: 'author' },
 ]
 const submitSearchData = ref<{
   AND: {
@@ -67,6 +68,16 @@ async function submitSearch() {
         value: searchData.value.value,
         exact: true,
       })
+      submitSearchData.value.OR.push({
+        field: 'metadata.author',
+        value: searchData.value.value,
+        exact: true,
+      })
+      submitSearchData.value.OR.push({
+        field: 'metadata.subject',
+        value: searchData.value.value,
+        exact: true,
+      })
       submitSearchData.value.OR.push({
         field: 'fileType',
         value: mime.getType(searchData.value.value) || '',
@@ -79,6 +90,20 @@ async function submitSearch() {
         })
       }
     } else {
+      if (searchData.value.field == 'title') {
+        submitSearchData.value.OR.push({
+          field: 'metadata.subject',
+          value: searchData.value.value,
+          exact: isExact.value,
+        })
+      }
+      if (searchData.value.field == 'author') {
+        submitSearchData.value.OR.push({
+          field: 'metadata.author',
+          value: searchData.value.value,
+          exact: isExact.value,
+        })
+      }
       submitSearchData.value.OR.push({
         field: searchData.value.field,
         value: searchData.value.value,
@@ -125,7 +150,6 @@ async function submitSearch() {
         `${import.meta.env.VITE_API_ENDPOINT}/search`,
         submitSearchData.value,
       )
-
       getFoundFile(res.data)
       isSearch.value = true
     } catch (error) {
@@ -218,9 +242,7 @@ watch(
       <div class="col">
         <div class="row items-center justify-between q-gutter-y-md q-pt-sm">
           <div class="col-grow">
-            <advanced-search
-              :submitSearch="submitSearch"
-            />
+            <advanced-search :submitSearch="submitSearch" />
           </div>
           <div v-if="isAdvSearchCall === false">
             <q-btn