diff --git a/cypress/e2e/facility_spec/FacilityHomepage.cy.ts b/cypress/e2e/facility_spec/FacilityHomepage.cy.ts
index 11b3ec6f37f..e2a12b01a05 100644
--- a/cypress/e2e/facility_spec/FacilityHomepage.cy.ts
+++ b/cypress/e2e/facility_spec/FacilityHomepage.cy.ts
@@ -15,7 +15,6 @@ describe("Facility Homepage Function", () => {
   const userPage = new UserPage();
   const assetPagination = new AssetPagination();
   const facilitiesAlias = "downloadFacilitiesCSV";
-  const capacitiesAlias = "downloadCapacitiesCSV";
   const doctorsAlias = "downloadDoctorsCSV";
   const triagesAlias = "downloadTriagesCSV";
   const facilityName = "Dummy Facility 40";
@@ -91,30 +90,26 @@ describe("Facility Homepage Function", () => {
   });
 
   it("Verify Facility Export Functionality", () => {
-    // Download the Facilities CSV
+    // Verify Facility Export
     facilityHome.csvDownloadIntercept(facilitiesAlias, "");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Facilities");
     facilityHome.verifyDownload(facilitiesAlias);
-    facilityHome.clickSearchButton(); // to avoid flaky test, as sometimes, the test is unable to focus on the object
-    // Download the Capacities CSV
-    facilityHome.csvDownloadIntercept(capacitiesAlias, "&capacity");
-    facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Capacities");
-    facilityHome.verifyDownload(capacitiesAlias);
-    facilityHome.clickSearchButton();
-    // Download the Doctors CSV
+    // Verify Doctor Export
     facilityHome.csvDownloadIntercept(doctorsAlias, "&doctors");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Doctors");
     facilityHome.verifyDownload(doctorsAlias);
-    facilityHome.clickSearchButton();
-    // Download the Triages CSV
+    // Verify Triage Export
     facilityHome.csvDownloadIntercept(triagesAlias, "&triage");
     facilityHome.clickExportButton();
     facilityHome.clickMenuItem("Triages");
     facilityHome.verifyDownload(triagesAlias);
-    facilityHome.clickSearchButton();
+  });
+
+  it("Verify Capacity Export Functionality", () => {
+    facilityHome.clickExportButton();
+    facilityHome.clickMenuItem("Capacities");
   });
 
   it("Verify Facility Detail page redirection to CNS and Live Minitoring  ", () => {
diff --git a/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts b/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts
index 923d9410657..99d4170fde5 100644
--- a/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts
+++ b/cypress/e2e/patient_spec/PatientLogUpdate.cy.ts
@@ -17,10 +17,10 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
   const additionalSymptoms = "Fever";
   const physicalExamination = "physical examination details";
   const otherExamination = "Other";
-  const patientSystolic = "119";
-  const patientDiastolic = "150";
-  const patientModifiedSystolic = "120";
-  const patientModifiedDiastolic = "145";
+  const patientSystolic = "149";
+  const patientDiastolic = "119";
+  const patientModifiedSystolic = "145";
+  const patientModifiedDiastolic = "120";
   const patientPulse = "152";
   const patientTemperature = "96.6";
   const patientRespiratory = "140";
diff --git a/cypress/pageobject/Facility/FacilityHome.ts b/cypress/pageobject/Facility/FacilityHome.ts
index b10368717a6..956c374ada4 100644
--- a/cypress/pageobject/Facility/FacilityHome.ts
+++ b/cypress/pageobject/Facility/FacilityHome.ts
@@ -6,6 +6,7 @@ class FacilityHome {
 
   // Operations
   clickExportButton() {
+    cy.get(this.exportButton).scrollIntoView();
     cy.get(this.exportButton).click();
   }
 
@@ -89,7 +90,9 @@ class FacilityHome {
   }
 
   verifyDownload(alias: string) {
-    cy.wait(`@${alias}`).its("response.statusCode").should("eq", 200);
+    cy.wait(`@${alias}`, { timeout: 60000 })
+      .its("response.statusCode")
+      .should("eq", 200);
   }
 
   getURL() {
diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
index 1cd07a93df1..18bffb0e11c 100644
--- a/src/Components/Form/AutoCompleteAsync.tsx
+++ b/src/Components/Form/AutoCompleteAsync.tsx
@@ -93,6 +93,7 @@ const AutoCompleteAsync = (props: Props) => {
         onChange={onChange}
         by={compareBy}
         multiple={multiple as any}
+        immediate
       >
         <div className="relative mt-1">
           <div className="flex">
diff --git a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
index a727db8b749..d8bde2dba03 100644
--- a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
+++ b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
@@ -110,6 +110,7 @@ export const AutocompleteMutliSelect = <T, V>(
   return (
     <div className={props.className} id={props.id}>
       <Combobox
+        immediate
         disabled={props.disabled}
         value={value}
         multiple