diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
index d65418f920f..7ab82b948b8 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
@@ -121,8 +121,8 @@
         </ng-container>
         <ng-container *ngIf="displayCategories">
             <mat-expansion-panel
-                            (opened)="handleCategoriesPanelState(true)"
-                            (closed)="handleCategoriesPanelState(false)"
+                            (opened)="toggleCategoriesPanel(true)"
+                            (closed)="toggleCategoriesPanel(false)"
                             hideToggle
                             [expanded]="isCategoriesPanelVisible">
                 <mat-expansion-panel-header>
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
index 281ab53118a..a9d400bcc52 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -476,7 +476,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
         this.cdr.detectChanges();
     }
 
-    handleCategoriesPanelState(isCategoriesPanelVisible: boolean) {
+    toggleCategoriesPanel(isCategoriesPanelVisible: boolean) {
         this.isCategoriesPanelVisible = isCategoriesPanelVisible;
         this.cdr.detectChanges();
     }
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
index db83d893da8..ce9705b26a4 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
@@ -230,7 +230,7 @@ export class TagsCreatorComponent implements OnInit, OnDestroy {
      * Returns `true` if tags empty, otherwise `false`
     */
     get isTagsEmpty(): boolean {
-        return this.tags.length === 0 && !this.tagNameControlVisible;
+        return this.tags?.length === 0 && !this.tagNameControlVisible;
     }
 
     get existingTags(): TagEntry[] {