diff --git a/src/components/upload-file/UploadFileGroup.vue b/src/components/upload-file/UploadFileGroup.vue
index fecbc368..16ecb62d 100644
--- a/src/components/upload-file/UploadFileGroup.vue
+++ b/src/components/upload-file/UploadFileGroup.vue
@@ -115,13 +115,13 @@ async function change(e: Event) {
         {
           _meta: structuredClone(toRaw(selectedMenu.value)._meta || {}),
           group: selectedMenu.value?.value,
-          file: _file,
+          file: renamedFile,
         },
       ];
     }
 
     const reader = new FileReader();
-    reader.readAsDataURL(_file);
+    reader.readAsDataURL(renamedFile);
     reader.onload = () => {
       if (obj.value[currentIndex.value]) {
         obj.value[currentIndex.value].url = reader.result as string;
@@ -190,7 +190,14 @@ async function fileList() {
     const res = await props.getFileList(selectedMenu.value?.value);
 
     if (res && Array.isArray(res)) {
-      obj.value = [...res];
+      obj.value = res
+        .filter((v) => v.name?.includes(selectedMenu.value?.group || ''))
+        .map((item) => {
+          return {
+            ...item,
+            name: item.name?.split('-')[1],
+          };
+        });
     }
   }
 }
@@ -257,7 +264,7 @@ defineEmits<{
             type="button"
             class="no-padding items-center rounded full-width"
             active-class="menu-active"
-            :active="selectedMenu?.value === v.value"
+            :active="selectedMenu?.group === v.group"
             @click="
               async () => {
                 selectedMenu = v;
@@ -327,7 +334,15 @@ defineEmits<{
                     };
                   })
               "
-              :columns="columns"
+              :columns="
+                columns.filter((v) => {
+                  if (selectedMenu?.value === 'attachment') {
+                    return v.name !== 'ัexpireDate';
+                  } else {
+                    return v.name !== 'createdAt';
+                  }
+                })
+              "
             ></TableComponents>
           </div>
         </template>