diff --git a/Common-UI b/Common-UI
index e9304ae..0742c81 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit e9304ae4c85709a82608e6f900429a857fc703ba
+Subproject commit 0742c81ab8efa969b4e868d964fe5fd87031b94b
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
index ca8cd55..6d8a4d9 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts
@@ -259,7 +259,7 @@ export class GeneralOpdDiagnosisComponent
   onDiagnosisInputKeyup(value: string, index: number) {
     if (value.length >= 3) {
       this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
+        .searchDiagnosisBasedOnPageNo(value, 0)
         .subscribe((results: any) => {
           this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
         });
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
index 2a564e7..4c04aae 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts
@@ -274,7 +274,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck {
   onDiagnosisInputKeyup(value: string, index: number) {
     if (value.length >= 3) {
       this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
+        .searchDiagnosisBasedOnPageNo(value, 0)
         .subscribe((results: any) => {
           this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
         });
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
index ac20b76..5d856c5 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts
@@ -330,7 +330,7 @@ export class NcdScreeningDiagnosisComponent
    onDiagnosisInputKeyup(value: string, index: number) {
     if (value.length >= 3) {
       this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
+        .searchDiagnosisBasedOnPageNo(value, 0)
         .subscribe((results: any) => {
           this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
         });
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
index 1880b06..1e341b2 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts
@@ -434,7 +434,7 @@ export class PncDiagnosisComponent
   onDiagnosisInputKeyup(value: string, index: number) {
     if (value.length >= 3) {
       this.masterdataService
-        .searchDiagnosisBasedOnPageNo(value, index)
+        .searchDiagnosisBasedOnPageNo(value, 0)
         .subscribe((results: any) => {
           this.suggestedDiagnosisList[index] = results?.data?.sctMaster;
         });
diff --git a/src/app/app-modules/registrar/registration/registration.component.ts b/src/app/app-modules/registrar/registration/registration.component.ts
index c37e320..2804334 100644
--- a/src/app/app-modules/registrar/registration/registration.component.ts
+++ b/src/app/app-modules/registrar/registration/registration.component.ts
@@ -756,17 +756,19 @@ export class RegistrationComponent
    */
   postButtonCall() {
     if (this.isSubmitting) return;
+    this.isSubmitting = true;
     const valid = this.checkValids(this.beneficiaryRegistrationForm);
 
     // Need to revert back the health id change - 2024
     // if (valid && this.checkValidHealthID(null)) {
     if (valid) {
-      this.isSubmitting = true;
       if (this.patientRevisit) {
         this.updateBeneficiarynPassToNurse();
       } else if (!this.patientRevisit) {
         this.submitBeneficiaryDetails();
       }
+    } else {
+      this.isSubmitting = false;
     }
   }
   checkValidHealthID(type: any) {