diff --git a/forms.json b/forms.json
index 3f9974e6..4fc8eebb 100644
--- a/forms.json
+++ b/forms.json
@@ -706,7 +706,7 @@
               "searchData": [],
               "maxCount": "MAX_MENTEE_ENROLLMENT_COUNT",
               "labelForListButton": "View Mentee List",
-              "labelForAddButton": "Add New Mentee",
+              "labelForAddButton": "Add Mentee",
               "filters": {
                 "entity_types": [
                   {
diff --git a/src/app/core/services/form/form.service.ts b/src/app/core/services/form/form.service.ts
index aaced72f..e15c4e82 100644
--- a/src/app/core/services/form/form.service.ts
+++ b/src/app/core/services/form/form.service.ts
@@ -83,7 +83,7 @@ export class FormService {
     await entityList.map((entityName)=>{
       if(Array.isArray(existingData[entityName])){
         existingData[entityName] = existingData[entityName].map((data)=>{
-          return { label : data.label, value : data.value == 'other' ? data.label : data.value }
+          return { label : data.label, value : data.value == 'other' ? data.label : data.value, type: data.value }
         })
       }
     })
diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts
index 2c4e5cdb..bf513f29 100644
--- a/src/app/core/services/profile/profile.service.ts
+++ b/src/app/core/services/profile/profile.service.ts
@@ -232,6 +232,7 @@ export class ProfileService {
     }
     catch (error) {
       showLoader ? await this.loaderService.stopLoader() : '';
+      return error
     }
   }
 
diff --git a/src/app/modules/admin/components/manage-session/manage-session.component.html b/src/app/modules/admin/components/manage-session/manage-session.component.html
index 1c8e6ccf..380b911b 100644
--- a/src/app/modules/admin/components/manage-session/manage-session.component.html
+++ b/src/app/modules/admin/components/manage-session/manage-session.component.html
@@ -42,7 +42,7 @@
             <ion-icon class="ion-funnel-icon" name="funnel"></ion-icon>
           </div>
         </div>
-        <div *ngIf="tableData">
+        <div>
           <app-generic-table [headingText]="headingText"
             [columnData]="columnData"
             [noDataMessage]="noDataMessage"
diff --git a/src/app/modules/auth/register/register.page.ts b/src/app/modules/auth/register/register.page.ts
index ba6f9e53..3a792e87 100644
--- a/src/app/modules/auth/register/register.page.ts
+++ b/src/app/modules/auth/register/register.page.ts
@@ -9,6 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { CommonRoutes } from 'src/global.routes';
 import { TranslateService } from '@ngx-translate/core';
 import { ProfileService } from 'src/app/core/services/profile/profile.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-register',
@@ -60,13 +61,13 @@ export class RegisterPage implements OnInit {
         position: 'floating',
         errorMessage:{
           required: "Enter password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password?.minLength +" characters." : "Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password?.minLength +" characters." : "Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         validators: {
           required: true,
-          minLength:window['env']?.password?.minLength ? window['env']?.password?.minLength: 8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password?.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength:environment?.password?.minLength ? environment?.password?.minLength: 8,
+          pattern: environment?.password?.rejectPattern ? environment?.password?.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         },
       },
       {
@@ -78,13 +79,13 @@ export class RegisterPage implements OnInit {
         position: 'floating',
         errorMessage:{
           required: "Re-enter password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password.minLength+" characters.":"Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password.minLength+" characters.":"Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         validators: {
           required: true,
-          minLength: window['env']?.password?.minLength ? window['env']?.password.minLength:8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength: environment?.password?.minLength ? environment?.password.minLength:8,
+          pattern: environment?.password?.rejectPattern ? environment?.password.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         }
       }
     ]
diff --git a/src/app/modules/auth/reset-password/reset-password.page.ts b/src/app/modules/auth/reset-password/reset-password.page.ts
index a4cc56b8..6eaf40e7 100644
--- a/src/app/modules/auth/reset-password/reset-password.page.ts
+++ b/src/app/modules/auth/reset-password/reset-password.page.ts
@@ -6,6 +6,7 @@ import { Router } from '@angular/router';
 import { ProfileService } from 'src/app/core/services/profile/profile.service';
 import { ToastService } from 'src/app/core/services';
 import { TranslateService } from '@ngx-translate/core';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-reset-password',
@@ -40,14 +41,14 @@ export class ResetPasswordPage implements OnInit {
         type: 'password',
         errorMessage:{
           required: "Enter new password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         position: 'floating',
         validators: {
           required: true,
-          minLength:window['env']?.password?.minLength? window['env']?.password?.minLength: 8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password?.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength:environment?.password?.minLength? environment?.password?.minLength: 8,
+          pattern: environment?.password?.rejectPattern ? environment?.password?.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         },
       },
       {
@@ -58,14 +59,14 @@ export class ResetPasswordPage implements OnInit {
         type: 'password',
         errorMessage:{
           required: "Re-enter new password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         position: 'floating',
         validators: {
           required: true,
-          minLength:window['env']?.password?.minLength? window['env']?.password?.minLength: 8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password?.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength:environment?.password?.minLength? environment?.password?.minLength: 8,
+          pattern: environment?.password?.rejectPattern ? environment?.password?.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         },
       },
     ],
diff --git a/src/app/pages/change-password/change-password.page.ts b/src/app/pages/change-password/change-password.page.ts
index afed5970..2a0e408a 100644
--- a/src/app/pages/change-password/change-password.page.ts
+++ b/src/app/pages/change-password/change-password.page.ts
@@ -3,6 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import * as _ from 'lodash';
 import { AuthService, ToastService } from 'src/app/core/services';
 import { DynamicFormComponent, JsonFormData } from 'src/app/shared/components';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-change-password',
@@ -43,14 +44,14 @@ public headerConfig: any = {
         type: 'password',
         errorMessage:{
           required: "Enter new password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         position: 'floating',
         validators: {
           required: true,
-          minLength:window['env']?.password?.minLength? window['env']?.password?.minLength: 8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password?.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength:environment?.password?.minLength? environment?.password?.minLength: 8,
+          pattern: environment?.password?.rejectPattern ? environment?.password?.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         },
       },
       {
@@ -61,14 +62,14 @@ public headerConfig: any = {
         type: 'password',
         errorMessage:{
           required: "Re-enter new password",
-          minlength:window['env']?.password?.minLength ? "Please enter minimum " + window['env']?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
-          pattern: window['env']?.password?.errorMessage ? window['env']?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
+          minlength:environment?.password?.minLength ? "Please enter minimum " + environment?.password?.minLength+" characters.":"Please enter minimum 8 characters.",
+          pattern: environment?.password?.errorMessage ? environment?.password?.errorMessage :"Only letters, numbers,!@#%$&()-`.+,/\" are allowed",
         },
         position: 'floating',
         validators: {
           required: true,
-          minLength:window['env']?.password?.minLength? window['env']?.password?.minLength: 8,
-          pattern: window['env']?.password?.regexPattern ? window['env']?.password?.regexPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
+          minLength:environment?.password?.minLength? environment?.password?.minLength: 8,
+          pattern: environment?.password?.rejectPattern ? environment?.password?.rejectPattern :"^[a-zA-Z0-9!@#%$&()\\-`.+,/\"]*$",
         },
       },
     ],
diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts
index 60b7e3ba..5f967e15 100644
--- a/src/app/pages/create-session/create-session.page.ts
+++ b/src/app/pages/create-session/create-session.page.ts
@@ -260,7 +260,7 @@ export class CreateSessionPage implements OnInit {
         this.formData.controls[i].id = this.id;
         if(this.formData.controls[i].meta.multiSelect){
           this.formData.controls[i].meta.searchData = existingData[this.formData.controls[i].name]
-          this.formData.controls[i].value = this.formData.controls[i].meta.searchData.map(obj => obj.id || obj.value);
+          this.formData.controls[i].value = this.formData.controls[i].meta.searchData ? this.formData.controls[i].meta.searchData.map(obj => obj.id || obj.value) : [];
         } else {
           this.formData.controls[i].meta.searchData = [{
             label: `${existingData.mentor_name}, ${existingData.organization.name}`,
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
index 4f6f9a39..f95b8488 100644
--- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
+++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
@@ -73,9 +73,9 @@
         <ion-buttons slot="start">
           <ion-back-button defaultHref="/tabs/home"></ion-back-button>
         </ion-buttons>
-        <ion-label *ngIf="searchText && totalCount">{{"MENTOR_SEARCH_RESULT" | translate}} "{{searchText}}"</ion-label>
+        <ion-label *ngIf="searchText && totalCount > 0">{{"MENTOR_SEARCH_RESULT" | translate}} "{{searchText}}"</ion-label>
       </div>
-      <div *ngIf="totalCount && searchText" class="search-result-count">
+      <div *ngIf="totalCount > 0 && searchText" class="search-result-count">
         <ion-label>{{totalCount}} {{"SEARCH_RESULT" | translate}}</ion-label>
       </div>
     </div>
@@ -91,7 +91,7 @@
       </ion-col>
     </ion-row>
   </ion-grid>
-  <div *ngIf="totalCount == 0">
+  <div *ngIf="totalCount == 0 || !data">
     <app-no-data-found [messageHeader]="'NO_MENTORS_AVAILABLE'"> </app-no-data-found>
   </div>
 </ion-content>
\ No newline at end of file
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
index 089d38c6..9067ce39 100644
--- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
+++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.ts
@@ -185,6 +185,9 @@ export class MentorSearchDirectoryPage implements OnInit {
       this.isOpen = false;
       this.data = data.result.data;
       this.totalCount = data.result.count;
+    }else{
+      this.data = [];
+      this.totalCount = [];
     }
   }
 
diff --git a/src/app/shared/components/search-and-select/search-and-select.component.ts b/src/app/shared/components/search-and-select/search-and-select.component.ts
index f587d752..da1e21ec 100644
--- a/src/app/shared/components/search-and-select/search-and-select.component.ts
+++ b/src/app/shared/components/search-and-select/search-and-select.component.ts
@@ -118,7 +118,8 @@ export class SearchAndSelectComponent implements OnInit, ControlValueAccessor {
           handler: (alertData) => {
             let obj = {
               label: alertData.name,
-              value: alertData.name
+              value: alertData.name,
+              type: "other"
             };
             this.selectedData.push(obj);
             this.selectedChips.push(obj.value)
diff --git a/src/app/shared/components/search-competency/search-competency.component.ts b/src/app/shared/components/search-competency/search-competency.component.ts
index 22956a95..51c885e4 100644
--- a/src/app/shared/components/search-competency/search-competency.component.ts
+++ b/src/app/shared/components/search-competency/search-competency.component.ts
@@ -52,7 +52,7 @@ export class SearchCompetencyComponent implements OnInit {
   }
 
   clearAll(){
-    this.selectedOptions = [];
+    this.selectedOptions = this.selectedOptions.filter(option => option.type === 'other');
   }
 
   closePopover() {