diff --git a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
index 25c90ee65..a43d7879d 100644
--- a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -55,17 +55,15 @@
                 placeholder="{{ field.label[primaryLang] }}"
                 required
               >
-              <input placeholder="Search..." matInput type="text" (keyup)="onKey($event.target.value)" class="search-input"  >
                 <mat-option
-                  *ngFor="let data of searchResult"
+                  *ngFor="let data of dropDownValues[field.name]"
                   (onSelectionChange)="
                     captureDropDownValue($event, field.name, 'primary')
                   "
-                  panelMaxHeight="500px"
-                  [id]="data.fieldValue"
-                  [value]="data.fieldValue"
+                  [id]="data.fieldCode"
+                  [value]="data.fieldCode"
                 >
-                  {{ data.fieldCode }}
+                  {{ data.fieldValue }}
                 </mat-option>
               </mat-select>
             </mat-form-field>
@@ -77,9 +75,8 @@
                 required
                 disabled="{{setreadonly}}"
               >
-              <input placeholder="Search..." matInput type="text" (keyup)="onKey($event.target.value)" class="search-input">
                 <mat-option
-                  *ngFor="let data of  searchResult"
+                  *ngFor="let data of  dropDownValues[field.name]"
                   (onSelectionChange)="
                     captureDropDownValue($event, field.name, 'primary')
                   "
diff --git a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
index f6a57f3f5..0fa69e801 100644
--- a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
+++ b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
@@ -11,7 +11,3 @@ mat-form-field{
   margin-top: 14px;
 }
 
-.search-input {
-  height: 35px;
-  width: 50px;
-}
\ No newline at end of file
diff --git a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts
index dfc04bd34..ec0751e57 100644
--- a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts
+++ b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.ts
@@ -44,7 +44,6 @@ export class MaterDataCommonBodyComponent implements OnInit {
   disableForms: boolean;
   copyPrimaryWord: any;
   copySecondaryWord: any;
-  searchResult: any[] = [];
 
   @Input() primaryData: any = {};
   @Input() secondaryData: any;
@@ -132,12 +131,12 @@ export class MaterDataCommonBodyComponent implements OnInit {
       else if(url === "datasharepolicy"){
         this.pageName = "Data Share Policy";        
         this.primaryData = {"name": "", "desc": "", "policies": "", "policyGroupName": "", "policyType": "DataShare", "version": "1.1"};
-        this.getPolicyGroup();
+        this.getPolicyGroup("policyGroupName");
       }
       else if(url === "authpolicy"){
         this.pageName = "Auth Policy";        
         this.primaryData = {"name": "", "desc": "", "policies": "", "policyGroupName": "", "policyType": "Auth", "version": "1.1"};
-        this.getPolicyGroup();
+        this.getPolicyGroup("policyGroupName");
       }
       else if(url === "policymapping"){
         this.pageName = "Map Policy";
@@ -414,9 +413,7 @@ export class MaterDataCommonBodyComponent implements OnInit {
     this.dataStorageService
       .getFiltersForAllDropDown('partnermanager/partners', request)
       .subscribe(response => {
-        if(response.response.filters)   
-        this.searchResult = response.response.filters.sort((a, b) => (a.name && b.name) ? a.id.localeCompare(b.name) : 0);
-        this.dropDownValues.partnerTypeCode.primary = response.response.filters.sort((a, b) => (a.name && b.name) ? a.name.localeCompare(b.name) : 0);
+        this.dropDownValues[key] = response.response.filters;
       });
   }
 
@@ -459,17 +456,9 @@ export class MaterDataCommonBodyComponent implements OnInit {
       });
   }
 
-  onKey(value) {
-    this.searchResult = this.search(value);
-  }
-
-  search(value: string) {
-    let filter = value.toLowerCase();
-    return this.dropDownValues.partnerTypeCode.primary.filter(option => option.fieldCode.toLowerCase().startsWith(filter));
-  }
 
-  getPolicyGroup() {
-    const filterObject = new FilterValuesModel('id', 'unique', '');
+  getPolicyGroup(key) {
+    const filterObject = new FilterValuesModel('name', 'unique', '');
     let optinalFilterObject = new OptionalFilterValuesModel('isActive', 'equals', 'true');
     let filterRequest = new FilterRequest([filterObject], this.primaryLang, [optinalFilterObject]);
     filterRequest["purpose"] = "REGISTRATION";
@@ -477,9 +466,7 @@ export class MaterDataCommonBodyComponent implements OnInit {
     this.dataStorageService
       .getFiltersForAllDropDown('policymanager/policies/group', request)
       .subscribe(response => {
-        if(response.response.filters)   
-        this.searchResult = response.response.filters.sort((a, b) => (a.id && b.id) ? a.id.localeCompare(b.id) : 0);
-        this.dropDownValues.partnerTypeCode.primary = response.response.filters.sort((a, b) => (a.id && b.id) ? a.id.localeCompare(b.id) : 0);        
+        this.dropDownValues[key] = response.response.filters;
       });
   }
 
diff --git a/pmp-ui/src/assets/entity-spec/policy-mapping.json b/pmp-ui/src/assets/entity-spec/policy-mapping.json
index 371cbe83d..f00e0a2b3 100644
--- a/pmp-ui/src/assets/entity-spec/policy-mapping.json
+++ b/pmp-ui/src/assets/entity-spec/policy-mapping.json
@@ -95,7 +95,7 @@
 			"showAsLink": "",
 			"linkType": "",
 			"LinkURL": "",
-			"inputType": "dropdown",
+			"inputType": "dropdownpartner",
 			"ismandatory": "true",
 			"showInListView": "false",
 			"showInSingleView": "true"