diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
index fec9f6d7..db26a841 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -7,7 +7,7 @@
                 <span
                   *ngIf="!disableForms"
                   matTooltip="{{ 'center.keyboard-tooltip' | translate }}"
-                  (click)="openKeyboard('primary')"
+                  (click)="openKeyboard('primary', primaryData.langCode)"
                   style="color: grey; cursor: pointer;"
                   [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
                   ><i class="material-icons">keyboard</i></span
@@ -432,7 +432,7 @@
                 <span
                   *ngIf="!disableForms"
                   matTooltip="{{languageNames['keyboard-tooltip'] | translate }}"
-                  (click)="openKeyboard('secondary')"
+                  (click)="openKeyboard('secondary', '')"
                   style="color: grey; cursor: pointer;"
                   [ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
                   ><i class="material-icons">keyboard</i></span
@@ -762,7 +762,7 @@
             <span
               *ngIf="!disableForms && pageName !=='Blacklisted Word'"
               matTooltip="{{ 'center.keyboard-tooltip' | translate }}"
-              (click)="openKeyboard('primary')"
+              (click)="openKeyboard('primary','')"
               style="float: right; color: grey; cursor: pointer;"
               ><i class="material-icons">keyboard</i></span
             >
@@ -792,7 +792,7 @@
             <span
               *ngIf="!disableForms"
               matTooltip="{{languageNames['keyboard-tooltip'] | translate }}"
-              (click)="openKeyboard('secondary')"
+              (click)="openKeyboard('secondary', '')"
               style="float: right; color: grey; cursor: pointer;"
               ><i class="material-icons">keyboard</i></span
             >
diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
index 0ed30bd8..8fd11ebb 100644
--- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
+++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.ts
@@ -499,16 +499,19 @@ export class MaterDataCommonBodyComponent implements OnInit {
     }
   }
 
-  openKeyboard(type: string) {
+  openKeyboard(type: string, lang:any) {
+    let finalLang
     if (this.keyboardService.isOpened && this.keyboardType === type) {
       this.keyboardService.dismiss();
       this.keyboardRef = undefined;
     } else {
       this.keyboardType = type;
       if (type === 'primary') {
-        this.keyboardRef = this.keyboardService.open(this.primaryKeyboard);
+        finalLang = lang !== '' ? defaultJson.keyboardMapping[lang] : this.primaryLang;
+        this.keyboardRef = this.keyboardService.open(finalLang);
       } else if (type === 'secondary') {
-        this.keyboardRef = this.keyboardService.open(this.secondaryKeyboard);
+        finalLang = lang !== '' ? defaultJson.keyboardMapping[lang] : this.secondaryLang;
+        this.keyboardRef = this.keyboardService.open(finalLang);
       }
       if (this.selectedField) {
         this.selectedField.focus();
diff --git a/admin-ui/src/app/features/resources/users/view/view.component.ts b/admin-ui/src/app/features/resources/users/view/view.component.ts
index fe3b1068..4e52be30 100644
--- a/admin-ui/src/app/features/resources/users/view/view.component.ts
+++ b/admin-ui/src/app/features/resources/users/view/view.component.ts
@@ -150,6 +150,7 @@ export class ViewComponent implements OnInit {
   getUsers() {
     this.users = [];
     this.noData = false;
+    this.actionButtons = [];
     this.filtersApplied = false;
     const filters = Utils.convertFilter(this.activatedRoute.snapshot.queryParams, this.primaryLang);
     if (filters.filters.length > 0) {
@@ -161,16 +162,13 @@ export class ViewComponent implements OnInit {
     }
     let currenturl = this.router.url.split('/')[3];
     this.requestModel = new RequestModel(null, null, filters);
-    console.log(JSON.stringify(this.requestModel));
     this.dataStorageService
       .getUsersData(this.requestModel, currenturl)
       .subscribe(({ response, errors }) => {
-        console.log(response);
         if (response != null) {
           this.paginatorOptions.totalEntries = response.totalRecord;
           this.paginatorOptions.pageIndex = filters.pagination.pageStart;
           this.paginatorOptions.pageSize = filters.pagination.pageFetch;
-          console.log(this.paginatorOptions);
           if (response.data != null) {
             this.users = [...response.data];
             let url = this.router.url.split('/')[3];