diff --git a/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js
index b5098cbf4..9c8e2971e 100644
--- a/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js
+++ b/forms-flow-web/src/components/FOI/customComponents/FileUpload/FileUploadForMCFPersonal.js
@@ -266,8 +266,8 @@ const FileUploadForMCFPersonal = ({
     },[person, fileType])
 
     React.useEffect(() => {
-      setAdditionalTagList(searchSections(otherTagList, searchValue, tagValue));
-    },[searchValue, otherTagList, tagValue])
+      setAdditionalTagList(searchSections(otherTagList, searchValue, personalTag));
+    },[searchValue, otherTagList, personalTag])
 
     const handleTrackingIDUpdate = (e) => {
       handleTrackingIDChange(e.target.value);
@@ -707,12 +707,12 @@ const FileUploadForMCFPersonal = ({
             value=""
             multiple={multipleFiles}
             accept={mimeTypes}
-            disabled={modalFor === "add" && !isPersonSelected}
+            disabled={modalFor === "add" && (!isPersonSelected || ((isMinistryCoordinator && tagValue == "")))}
             />
           </div>
           <div className="file-upload-column file-upload-column-3">
             {(Object.entries(files).length === 0 && !multipleFiles) || multipleFiles ?
-            <button className="btn-add-files" type="button" onClick={handleUploadBtnClick} disabled={modalFor === "add" && !isPersonSelected}>              
+            <button className="btn-add-files" type="button" onClick={handleUploadBtnClick} disabled={modalFor === "add" && (!isPersonSelected || ((isMinistryCoordinator && tagValue == "")))}>
                   Add Files
             </button>  : null}
           </div>
diff --git a/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js b/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js
index 74d46ede6..e4c51f370 100644
--- a/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js
+++ b/forms-flow-web/src/components/FOI/customComponents/Records/MCFPersonal.js
@@ -161,6 +161,16 @@ const MCFPersonal = ({
       }
     },[showAllPeople, showAllVolumes])
 
+    React.useEffect(() => {
+      if(allPeople.length > 0 && personalAttributes.person !== "") {
+        setShowAllPeople( allPeople.filter(p => p.name==personalAttributes.person)[0].sortorder >= 5 );
+      }
+
+      if(allVolumes.length > 0 && personalAttributes.volume !== "") {
+        setShowAllVolumes( allVolumes.filter(v => v.name==personalAttributes.volume)[0].sortorder >= 5 );
+      }
+    },[personalAttributes])
+
     React.useEffect(() => {
       setAdditionalFileTypes(searchFileTypes(otherFileTypes, fileTypeSearchValue, personalAttributes?.filetype));
     },[fileTypeSearchValue, otherFileTypes, personalAttributes])