diff --git a/src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html b/src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html
index d2b85291..9a3183c4 100644
--- a/src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/call-disposition-type-master/call-disposition-type-master.component.html
@@ -66,6 +66,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -361,6 +362,7 @@ <h4 class="pull-left">Create Call Disposition Type/Sub Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="temporarySubtypeArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html b/src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html
index a5062ec4..8fbfcdf3 100644
--- a/src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/category-subcategory-provisioning/category-subcategory-provisioning.component.html
@@ -120,6 +120,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -216,6 +217,7 @@ <h4 class="pull-left">Category and Sub Category Master</h4>
         <table
           *ngIf="!showCategoryTable"
           mat-table
+          matSort
           [dataSource]="filteredsubCat"
           class="table table-striped table-hover"
         >
@@ -562,6 +564,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceList"
           class="table table-striped table-hover"
         >
@@ -621,6 +624,7 @@ <h4 class="pull-left">Create Category and Sub Category</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.serviceSubCatList"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html b/src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html
index 48620e75..c143372a 100644
--- a/src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/device-id-master/device-id-master.component.html
@@ -74,6 +74,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsearchResultArray"
           class="table table-striped table-hover"
         >
@@ -226,6 +227,7 @@ <h4 class="pull-left">Edit Device ID</h4>
       <div class="table-responsive" *ngIf="bufferArray.data.length > 0">
         <table
           mat-table
+          matSort
           [dataSource]="bufferArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html b/src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html
index f6a8b40f..9abd6ef8 100644
--- a/src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/drug-group/drug-group.component.html
@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Group Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugGroups"
         >
@@ -215,6 +216,7 @@ <h4 *ngIf="editable">Edit Drug Group</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugGroupList"
             class="table table-striped table-hover"
           >
diff --git a/src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html b/src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html
index 436f6c42..1eec649b 100644
--- a/src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/drug-list/drug-list.component.html
@@ -23,6 +23,7 @@ <h4 class="pull-left">Drug Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="fileteredavailableDrugs"
         >
@@ -230,6 +231,7 @@ <h4 *ngIf="editable">Edit Drug</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugList"
             class="table table-striped table-hover"
           >
diff --git a/src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html
index ed41a936..7f16ad37 100644
--- a/src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/drug-mapping/drug-mapping.component.html
@@ -64,6 +64,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableDrugMappings"
         >
@@ -232,6 +233,7 @@ <h4 *ngIf="!editable && !showMappings">Drug Group-Drug Mapping</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="drugMapping"
             class="table table-striped table-hover"
           >
diff --git a/src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html b/src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html
index 597a9d2a..a43ef695 100644
--- a/src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/drug-strength/drug-strength.component.html
@@ -21,6 +21,7 @@ <h4>Drug Strength Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredDrugStrength"
         >
@@ -214,6 +215,7 @@ <h4 *ngIf="editMode && !tableMode">Edit Drug Strength</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="drugStrengthList"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/feedback-complaint-nature-master/feedback-complaint-nature-master.component.html b/src/app/app-provider-admin/provider-admin/activities/feedback-complaint-nature-master/feedback-complaint-nature-master.component.html
index ccde6683..47d0c10f 100644
--- a/src/app/app-provider-admin/provider-admin/activities/feedback-complaint-nature-master/feedback-complaint-nature-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/feedback-complaint-nature-master/feedback-complaint-nature-master.component.html
@@ -85,6 +85,7 @@ <h4 class="m-b-30">Feedback/Complaint Nature Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filterednatureTypes"
           class="table table-striped table-hover"
         >
@@ -314,6 +315,7 @@ <h4 class="width100">Add Feedback/Complaint Nature</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="this.objs"
             class="table table-striped table-hover"
           >
diff --git a/src/app/app-provider-admin/provider-admin/activities/feedback-type-master/feedback-type-master.component.html b/src/app/app-provider-admin/provider-admin/activities/feedback-type-master/feedback-type-master.component.html
index b543d2a8..3b184d0d 100644
--- a/src/app/app-provider-admin/provider-admin/activities/feedback-type-master/feedback-type-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/feedback-type-master/feedback-type-master.component.html
@@ -67,6 +67,7 @@ <h4 class="pull-left">Feedback/Complaint Type Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredfeedbackTypes"
           class="table table-striped table-hover"
         >
@@ -298,6 +299,7 @@ <h4 class="width100">Add Feedback/Complaint Type</h4>
           <div class="table-responsive">
             <table
               mat-table
+              matSort
               [dataSource]="objs"
               class="table table-striped table-hover"
             >
diff --git a/src/app/app-provider-admin/provider-admin/activities/fetosense-test-master/fetosense-test-master.component.html b/src/app/app-provider-admin/provider-admin/activities/fetosense-test-master/fetosense-test-master.component.html
index e873670b..40a555d1 100644
--- a/src/app/app-provider-admin/provider-admin/activities/fetosense-test-master/fetosense-test-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/fetosense-test-master/fetosense-test-master.component.html
@@ -81,6 +81,7 @@ <h4 class="pull-left">Edit Test</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredFetosenseTests"
           class="table table-striped table-hover"
         >
@@ -249,6 +250,7 @@ <h4 class="pull-left">Edit Test</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="addedFetosenseTests"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/hospital-master/hospital-master.component.html b/src/app/app-provider-admin/provider-admin/activities/hospital-master/hospital-master.component.html
index 6973c3b5..01c03b78 100644
--- a/src/app/app-provider-admin/provider-admin/activities/hospital-master/hospital-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/hospital-master/hospital-master.component.html
@@ -99,6 +99,7 @@ <h4 class="pull-left">Create Institution</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsearchResultArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/institute-type-master/institute-type-master.component.html b/src/app/app-provider-admin/provider-admin/activities/institute-type-master/institute-type-master.component.html
index 991baad6..d92253e7 100644
--- a/src/app/app-provider-admin/provider-admin/activities/institute-type-master/institute-type-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/institute-type-master/institute-type-master.component.html
@@ -69,6 +69,7 @@ <h4 class="pull-left">Create Institute Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filteredsearchResultArray"
           class="table table-striped table-hover"
         >
@@ -225,6 +226,7 @@ <h4 class="pull-left">Create Institute Type</h4>
       <div class="table-responsive" *ngIf="bufferArray.data.length > 0">
         <table
           mat-table
+          matSort
           [dataSource]="this.bufferArray.data"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/language-mapping/language-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/language-mapping/language-mapping.component.html
index 1f3f9557..e7cf9efc 100644
--- a/src/app/app-provider-admin/provider-admin/activities/language-mapping/language-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/language-mapping/language-mapping.component.html
@@ -26,6 +26,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredLanguageMappedList"
         >
@@ -310,6 +311,7 @@ <h4 *ngIf="editMode">
                 <div class="table-responsive">
                   <table
                     mat-table
+                    matSort
                     [dataSource]="bufferArray"
                     class="table table-striped table-hover"
                   >
diff --git a/src/app/app-provider-admin/provider-admin/activities/nature-of-complaint-category-mapping/nature-of-complaint-category-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/nature-of-complaint-category-mapping/nature-of-complaint-category-mapping.component.html
index 37d2ae22..fb07a093 100644
--- a/src/app/app-provider-admin/provider-admin/activities/nature-of-complaint-category-mapping/nature-of-complaint-category-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/nature-of-complaint-category-mapping/nature-of-complaint-category-mapping.component.html
@@ -113,6 +113,7 @@ <h4 *ngIf="editable && !showListOfCategorymapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredMappings"
           class="table table-striped table-hover"
         >
@@ -238,6 +239,7 @@ <h4 *ngIf="editable && !showListOfCategorymapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="complaintCategoryMappingList"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/parking-place-sub-district-mapping/parking-place-sub-district-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/parking-place-sub-district-mapping/parking-place-sub-district-mapping.component.html
index 938ef6a6..88526a3b 100644
--- a/src/app/app-provider-admin/provider-admin/activities/parking-place-sub-district-mapping/parking-place-sub-district-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/parking-place-sub-district-mapping/parking-place-sub-district-mapping.component.html
@@ -117,6 +117,7 @@ <h4 *ngIf="editable && !showListOfMapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredMappedParkingPlaceDistricts"
         >
@@ -299,6 +300,7 @@ <h4 *ngIf="editable && !showListOfMapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="mappingList"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.html b/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.html
index 084d46fc..07c85131 100644
--- a/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.html
@@ -100,6 +100,7 @@ <h4 class="pull-left">Edit Role</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="dataSource"
           class="table table-striped table-hover"
         >
@@ -317,6 +318,7 @@ <h4 class="pull-left">Edit Role</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="addRole"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.ts b/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.ts
index df608416..df0518b0 100644
--- a/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.ts
+++ b/src/app/app-provider-admin/provider-admin/activities/role-master/provider-admin-role-master.component.ts
@@ -141,6 +141,15 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.dataSource.sort = this.sort;
   }
 
+  private setDataSourceAttributes() {
+    if (this.paginatorFirst) {
+      this.dataSource.paginator = this.paginatorFirst;
+    }
+    if (this.sort) {
+      this.dataSource.sort = this.sort;
+    }
+  }
+
   getServiceLines() {
     this.ProviderAdminRoleService.getServiceLinesNew(this.userID).subscribe(
       (response: any) => {
@@ -172,8 +181,7 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.states = response.data;
     this.searchresultarray = [];
     this.dataSource.data = [];
-    this.dataSource.paginator = this.paginatorFirst;
-    this.dataSource.sort = this.sort;
+    this.setDataSourceAttributes();
 
     if (value.isNational) {
       this.nationalFlag = value.isNational;
@@ -207,8 +215,7 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
         this.dataSource.data.forEach((item: any, index: number) => {
           item.sno = index + 1;
         });
-        this.dataSource.paginator = this.paginatorFirst;
-        this.dataSource.sort = this.sort;
+        this.setDataSourceAttributes();
         if (this.service.serviceID !== 7) {
           for (let i = 0; i < this.searchresultarray.length; i++) {
             this.filterScreens.push(this.searchresultarray[i].screenName);
@@ -638,10 +645,9 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
     this.services = [];
     this.searchresultarray = [];
     this.dataSource.data = [];
-    this.dataSource.paginator = this.paginatorFirst;
-    this.dataSource.sort = this.sort;
     this.filterScreens = [];
     this.showAddButtonFlag = false;
+    this.setDataSourceAttributes()
   }
 
   // UPDATE MORE FEATURES TO ROLE
@@ -697,12 +703,10 @@ export class RoleMasterComponent implements OnInit, AfterViewInit {
   filterComponentList(searchTerm?: string) {
     if (!searchTerm) {
       this.dataSource.data = this.searchresultarray;
-      this.dataSource.paginator = this.paginatorFirst;
-      this.dataSource.sort = this.sort;
+      this.setDataSourceAttributes();
     } else {
       this.dataSource.data = [];
-      this.dataSource.paginator = this.paginatorFirst;
-      this.dataSource.sort = this.sort;
+      this.setDataSourceAttributes();
       this.searchresultarray.forEach((item: any) => {
         for (const key in item) {
           if (key === 'roleName' || key === 'screenName') {
diff --git a/src/app/app-provider-admin/provider-admin/activities/severity-type/severity-type.component.html b/src/app/app-provider-admin/provider-admin/activities/severity-type/severity-type.component.html
index 4166a9d6..2af1ddd7 100644
--- a/src/app/app-provider-admin/provider-admin/activities/severity-type/severity-type.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/severity-type/severity-type.component.html
@@ -59,6 +59,7 @@ <h4 *ngIf="!firstPage" class="pull-left">Add Severity Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filtereddata"
           class="table table-striped table-hover"
         >
@@ -224,6 +225,7 @@ <h4 *ngIf="!firstPage" class="pull-left">Add Severity Type</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="severityArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/specialist-mapping/specialist-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/specialist-mapping/specialist-mapping.component.html
index 0a25ae92..4d3bcf15 100644
--- a/src/app/app-provider-admin/provider-admin/activities/specialist-mapping/specialist-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/specialist-mapping/specialist-mapping.component.html
@@ -84,6 +84,7 @@ <h4 *ngIf="creationMode && !tableMode">Create Mapping</h4>
             <div class="table-responsive">
               <table
                 mat-table
+                matSort
                 [dataSource]="filteredspecializationList"
                 class="table table-striped table-hover"
               >
diff --git a/src/app/app-provider-admin/provider-admin/activities/van-master/van-master.component.html b/src/app/app-provider-admin/provider-admin/activities/van-master/van-master.component.html
index 869bf225..285e4104 100644
--- a/src/app/app-provider-admin/provider-admin/activities/van-master/van-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/van-master/van-master.component.html
@@ -112,6 +112,7 @@ <h4>Van Master</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableVans"
         >
@@ -446,6 +447,7 @@ <h4 *ngIf="editable">Edit Van Details</h4>
       <div *ngIf="vanList.data.length > 0" class="m-t-10 table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="vanList"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/activities/zone-district-mapping/zone-district-mapping.component.html b/src/app/app-provider-admin/provider-admin/activities/zone-district-mapping/zone-district-mapping.component.html
index 8c99ae0a..05c3bada 100644
--- a/src/app/app-provider-admin/provider-admin/activities/zone-district-mapping/zone-district-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/zone-district-mapping/zone-district-mapping.component.html
@@ -74,6 +74,7 @@ <h4 *ngIf="editable && !showListOfZonemapping">
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableZoneDistrictMappings"
         >
@@ -266,6 +267,7 @@ <h4 *ngIf="editable && !showListOfZonemapping">
           <div class="table-responsive">
             <table
               mat-table
+              matSort
               [dataSource]="zoneDistrictMappingList"
               class="table table-striped table-hover"
             >
diff --git a/src/app/app-provider-admin/provider-admin/activities/zone-list/zone.component.html b/src/app/app-provider-admin/provider-admin/activities/zone-list/zone.component.html
index e65da3ec..ec3fe024 100644
--- a/src/app/app-provider-admin/provider-admin/activities/zone-list/zone.component.html
+++ b/src/app/app-provider-admin/provider-admin/activities/zone-list/zone.component.html
@@ -79,6 +79,7 @@ <h4 *ngIf="editable && !showListOfZones">Edit Zone</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredavailableZones"
         >
@@ -260,6 +261,7 @@ <h4 *ngIf="editable && !showListOfZones">Edit Zone</h4>
         <div class="table-responsive">
           <table
             mat-table
+            matSort
             [dataSource]="zoneList"
             class="table table-striped table-hover"
           >
diff --git a/src/app/app-provider-admin/provider-admin/configurations/email-configuration/email-configuration.component.html b/src/app/app-provider-admin/provider-admin/configurations/email-configuration/email-configuration.component.html
index 7553bfe4..f195c604 100644
--- a/src/app/app-provider-admin/provider-admin/configurations/email-configuration/email-configuration.component.html
+++ b/src/app/app-provider-admin/provider-admin/configurations/email-configuration/email-configuration.component.html
@@ -168,6 +168,7 @@ <h4 *ngIf="editable && !showListOfEmails">Edit Authority Email ID</h4>
         </table> -->
         <table
           mat-table
+          matSort
           class="table table-striped table-hover"
           [dataSource]="filteredMailConfig"
         >
@@ -400,6 +401,7 @@ <h4 *ngIf="editable && !showListOfEmails">Edit Authority Email ID</h4>
           </table> -->
           <table
             mat-table
+            matSort
             class="table table-striped table-hover"
             [dataSource]="emailConfigList"
           >
diff --git a/src/app/app-provider-admin/provider-admin/configurations/map-snommed-ctcode/map-snommed-ctcode.component.html b/src/app/app-provider-admin/provider-admin/configurations/map-snommed-ctcode/map-snommed-ctcode.component.html
index 6bf2cd53..a6168387 100644
--- a/src/app/app-provider-admin/provider-admin/configurations/map-snommed-ctcode/map-snommed-ctcode.component.html
+++ b/src/app/app-provider-admin/provider-admin/configurations/map-snommed-ctcode/map-snommed-ctcode.component.html
@@ -42,6 +42,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="dataSource"
           class="table table-striped table-hover"
         >
@@ -255,6 +256,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="addedItems"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/configurations/van-device-id-mapping/van-device-id-mapping.component.html b/src/app/app-provider-admin/provider-admin/configurations/van-device-id-mapping/van-device-id-mapping.component.html
index 0fc049f7..8369cd05 100644
--- a/src/app/app-provider-admin/provider-admin/configurations/van-device-id-mapping/van-device-id-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/configurations/van-device-id-mapping/van-device-id-mapping.component.html
@@ -144,6 +144,7 @@ <h4 class="pull-left">Edit Spoke Fetosense Device ID Mapping</h4>
       <div class="table responsive table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filteredsearchResultArray.data"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/configurations/van-spoke-mapping/van-spoke-mapping.component.html b/src/app/app-provider-admin/provider-admin/configurations/van-spoke-mapping/van-spoke-mapping.component.html
index 508420f5..5bfe2c13 100644
--- a/src/app/app-provider-admin/provider-admin/configurations/van-spoke-mapping/van-spoke-mapping.component.html
+++ b/src/app/app-provider-admin/provider-admin/configurations/van-spoke-mapping/van-spoke-mapping.component.html
@@ -166,6 +166,7 @@ <h4>From</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.filteredListVanSpokeMapping.data"
           class="table table-striped table-hover"
         >
@@ -476,6 +477,7 @@ <h4>Map Van and Spoke</h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="this.vanSpokeMappedData.data"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/inventory/manufacturer-master/manufacturer-master.component.html b/src/app/app-provider-admin/provider-admin/inventory/manufacturer-master/manufacturer-master.component.html
index bb32aee7..fa701e91 100644
--- a/src/app/app-provider-admin/provider-admin/inventory/manufacturer-master/manufacturer-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/inventory/manufacturer-master/manufacturer-master.component.html
@@ -75,6 +75,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredManufactureList"
           class="table table-striped table-hover"
         >
@@ -536,6 +537,7 @@ <h4>
         </table> -->
         <table
           mat-table
+          matSort
           [dataSource]="bufferArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/provider-admin/inventory/supplier-master/supplier-master.component.html b/src/app/app-provider-admin/provider-admin/inventory/supplier-master/supplier-master.component.html
index acf06e7e..533f6a8b 100644
--- a/src/app/app-provider-admin/provider-admin/inventory/supplier-master/supplier-master.component.html
+++ b/src/app/app-provider-admin/provider-admin/inventory/supplier-master/supplier-master.component.html
@@ -69,6 +69,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="filteredsupplierList"
           class="table table-striped table-hover"
         >
@@ -621,6 +622,7 @@ <h4>
       <div class="table-responsive">
         <table
           mat-table
+          matSort
           [dataSource]="bufferArray"
           class="table table-striped table-hover"
         >
diff --git a/src/app/app-provider-admin/super-admin/super-admin/Activities/village-master/village-master.component.html b/src/app/app-provider-admin/super-admin/super-admin/Activities/village-master/village-master.component.html
index 7e87a076..f4b3c30f 100644
--- a/src/app/app-provider-admin/super-admin/super-admin/Activities/village-master/village-master.component.html
+++ b/src/app/app-provider-admin/super-admin/super-admin/Activities/village-master/village-master.component.html
@@ -98,6 +98,7 @@ <h4 class="pull-left">Create Village</h4>
     <div class="table-responsive">
       <table
         mat-table
+        matSort
         class="table table-striped table-hover"
         [dataSource]="filteredavailableVillages"
       >
@@ -387,6 +388,7 @@ <h4 class="pull-left">Create Village</h4>
     <div class="table-responsive">
       <table
         mat-table
+        matSort
         [dataSource]="villageList"
         class="table table-striped table-hover"
       >