diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts
index 82618e2364..7a203d4dff 100644
--- a/e2e/content-services/metadata/metadata-properties.e2e.ts
+++ b/e2e/content-services/metadata/metadata-properties.e2e.ts
@@ -114,6 +114,7 @@ describe('CardView Component - properties', () => {
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
 
+
         await metadataViewPage.checkMetadataGroupIsExpand('properties');
         await metadataViewPage.checkMetadataGroupIsNotExpand('EXIF');
 
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
index d37a5aff5c..9cc1235d16 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
@@ -1,5 +1,6 @@
 .adf-categories-management {
     padding-top: 12px;
+
     .adf-category-name-field {
         display: flex;
         justify-content: space-between;
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
index a3f1e2c65e..ac84cd907c 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
@@ -228,8 +228,6 @@ export class CategoriesManagementComponent implements OnInit, OnDestroy {
             const newCat = new Category({ id: newCatName, name: newCatName });
             this.categories.push(newCat);
             this.clearCategoryNameInput();
-            this.categoryNameControl.setValue('');
-            this.categoryNameControl.markAsUntouched();
             this._existingCategories = null;
             this.categoriesChange.emit(this.categories);
         }
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
index d4ca5e83a8..1835a7030a 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
@@ -102,11 +102,6 @@ describe('ContentMetadataComponent', () => {
         fixture.detectChanges();
     }
 
-    const clickOnTagsSave = () => {
-        findSaveTagsButton().click();
-        fixture.detectChanges();
-    }
-
     const clickOnTagsSave = () => {
         findSaveTagsButton().click();
         fixture.detectChanges();
@@ -334,7 +329,7 @@ describe('ContentMetadataComponent', () => {
             tag2.tag = tagName2;
             expect(tagService.removeTag).toHaveBeenCalledWith(node.id, tagPaging.list.entries[1].entry.id);
             expect(tagService.assignTagsToNode).toHaveBeenCalledWith(node.id, [tag1, tag2]);
-          }));
+        }));
 
         it('should call getTagsByNodeId on TagService on save click', () => {
             component.editableTags = true;
@@ -1164,7 +1159,6 @@ describe('ContentMetadataComponent', () => {
         it('should render tags after loading tags in ngOnInit', () => {
             spyOn(tagService, 'getTagsByNodeId').and.returnValue(of(tagPaging));
             component.ngOnInit();
-            fixture.whenStable();
             fixture.detectChanges();
             const tagElements = findTagElements();
             expect(tagElements).toHaveSize(2);
diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json
index 13a51f1214..482dedf814 100644
--- a/lib/content-services/src/lib/i18n/en.json
+++ b/lib/content-services/src/lib/i18n/en.json
@@ -148,6 +148,7 @@
       "NO_EXISTING_TAGS": "No Existing Tags",
       "TITLE": "Create Tags",
       "CREATE_TAG": "Create: {{tag}}",
+      "NAME": "Name",
       "INPUT_PLACEHOLDER": "Add a tag to these items",
       "ERRORS": {
         "EXISTING_TAG": "Tag already exists",
@@ -159,6 +160,7 @@
       },
       "TOOLTIPS": {
         "DELETE_TAG": "Delete tag",
+        "HIDE_INPUT": "Hide input"
       },
       "TAGS_LOADING": "Tags loading",
       "CREATE_TAGS_SUCCESS": "Tags created successfully"
@@ -175,6 +177,7 @@
     "SELECT_EXISTING_CATEGORY": "Select an existing Category:",
     "NO_EXISTING_CATEGORIES": "No existing Categories",
     "GENERIC_CREATE": "Create: {{name}}",
+    "NAME": "Category name",
     "LOADING": "Loading",
     "HIDE_INPUT": "Hide input",
     "NO_CATEGORIES_ADDED": "There are currently no categories added",
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
index 7d9c7d4e2e..d7309491ad 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
@@ -21,7 +21,7 @@ import { NotificationService } from '@alfresco/adf-core';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatIconModule } from '@angular/material/icon';
-import { MatError, MatFormFieldModule } from '@angular/material/form-field';
+import { MatError, MatFormField, MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
@@ -300,7 +300,7 @@ describe('TagsCreatorComponent', () => {
             const tagNameField = fixture.debugElement.query(By.css(tagNameFieldSelector));
             expect(tagNameField).toBeTruthy();
             expect(tagNameField.nativeElement.hasAttribute('hidden')).toBeFalsy();
-            expect(tagNameField).toBeTruthy();
+            expect(tagNameField.query(By.directive(MatFormField))).toBeTruthy();
         });
 
         it('should input be autofocused', fakeAsync(() => {