diff --git a/app/components/app/encounter/filter-nav.vue b/app/components/app/encounter/filter-nav.vue
index 30b95b96..aa552a11 100644
--- a/app/components/app/encounter/filter-nav.vue
+++ b/app/components/app/encounter/filter-nav.vue
@@ -130,7 +130,7 @@ watch(
     Filter
   </Button>
 
-  <DropdownMenu v-show="props.enableExport && (isRoleRegistration || isRoleMedical)">
+  <DropdownMenu v-if="props.enableExport && (isRoleRegistration || isRoleMedical)">
     <DropdownMenuTrigger as-child>
       <Button
         variant="outline"
diff --git a/app/components/content/encounter/list.vue b/app/components/content/encounter/list.vue
index 0e80ddd8..4b219d7c 100644
--- a/app/components/content/encounter/list.vue
+++ b/app/components/content/encounter/list.vue
@@ -199,7 +199,13 @@ function handleUploadFile(id: number, menu: string) {
 }
 
 async function handleUploadFileSubmit() {
-  if (!uploadFile.value) return
+  const files = uploadFile.value
+  if (!uploadFile.value || files.length === 0) {
+    recSepId.value = 0
+    recSepMenu.value = ''
+    recSepSubMenu.value = ''
+    return
+  }
   const result = await uploadAttachmentCustom({
     file: uploadFile.value,
     refId: recSepId.value,
@@ -220,6 +226,9 @@ async function handleUploadFileSubmit() {
       variant: 'destructive',
     })
   }
+  recSepId.value = 0
+  recSepMenu.value = ''
+  recSepSubMenu.value = ''
 }
 
 function handleViewFile(id: number, menu: string, subMenu: string) {
diff --git a/app/handlers/encounter-entry.handler.ts b/app/handlers/encounter-entry.handler.ts
index 41cc2602..240d5305 100644
--- a/app/handlers/encounter-entry.handler.ts
+++ b/app/handlers/encounter-entry.handler.ts
@@ -601,6 +601,7 @@ export function useEncounterEntry(props: {
             await uploadAttachmentCustom({
               id: isEditMode.value && formValues.sepFileReview ? formValues.sepFileReview.id : null,
               file: sepFile.value,
+              name: 'image-vclaim-sep',
               refId: encounterId,
               entityTypeCode: 'encounter',
               type: 'vclaim-sep',
@@ -610,6 +611,7 @@ export function useEncounterEntry(props: {
             await uploadAttachmentCustom({
               id: isEditMode.value && formValues.sippFileReview ? formValues.sippFileReview.id : null,
               file: sippFile.value,
+              name: 'image-vclaim-sipp',
               refId: encounterId,
               entityTypeCode: 'encounter',
               type: 'vclaim-sipp',
diff --git a/app/handlers/supporting-document.handler.ts b/app/handlers/supporting-document.handler.ts
index d63e1ccf..31087edc 100644
--- a/app/handlers/supporting-document.handler.ts
+++ b/app/handlers/supporting-document.handler.ts
@@ -27,7 +27,7 @@ export async function uploadAttachmentCustom(payload: any) {
   const { user } = useUserStore()
   
   const formData = new FormData()
-  formData.append('code', payload.type)
+  formData.append('name', payload.name)
   formData.append('content', payload.file)
   formData.append('entityType_code', payload.entityTypeCode)
   formData.append('type_code', payload.type)
@@ -35,5 +35,5 @@ export async function uploadAttachmentCustom(payload: any) {
   formData.append('upload_employee_id', user.employee_id)
 
   const response = payload.id ? await update(payload.id, formData) : await create(formData)
-  return response?.body?.data
+  return response
 }