diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html
index 46afd577c..da035dc66 100644
--- a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html
+++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.html
@@ -6,19 +6,19 @@
   [subTitle]="activeTabLabel"
   [loading]="activeHeaderLoading"
   >
-  @if (activeBulkList) {
+  @if (activeAttributeList) {
     <div ngbDropdown class="btn-group flex-fill d-sm-none">
       <button class="btn btn-sm btn-outline-primary" id="dropdownSelectMobile" ngbDropdownToggle>
         <i-bs name="text-indent-left"></i-bs>
         <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Select</ng-container></div>
-        @if (activeBulkList.selectedObjects.size > 0) {
-          <pngx-clearable-badge [selected]="activeBulkList.selectedObjects.size > 0" [number]="activeBulkList.selectedObjects.size" (cleared)="activeBulkList.selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
+        @if (activeAttributeList.selectedObjects.size > 0) {
+          <pngx-clearable-badge [selected]="activeAttributeList.selectedObjects.size > 0" [number]="activeAttributeList.selectedObjects.size" (cleared)="activeAttributeList.selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
         }
       </button>
       <div ngbDropdownMenu aria-labelledby="dropdownSelectMobile" class="shadow">
-        <button ngbDropdownItem (click)="activeBulkList.selectNone()" i18n>Select none</button>
-        <button ngbDropdownItem (click)="activeBulkList.selectPage(true)" i18n>Select page</button>
-        <button ngbDropdownItem (click)="activeBulkList.selectAll()" i18n>Select all</button>
+        <button ngbDropdownItem (click)="activeAttributeList.selectNone()" i18n>Select none</button>
+        <button ngbDropdownItem (click)="activeAttributeList.selectPage(true)" i18n>Select page</button>
+        <button ngbDropdownItem (click)="activeAttributeList.selectAll()" i18n>Select all</button>
       </div>
     </div>
 
@@ -27,30 +27,30 @@
         <span class="input-group-text border-0" i18n>Select:</span>
       </div>
       <div class="btn-group btn-group-sm flex-nowrap">
-        @if (activeBulkList.selectedObjects.size > 0) {
-          <button class="btn btn-sm btn-outline-secondary" (click)="activeBulkList.selectNone()">
+        @if (activeAttributeList.selectedObjects.size > 0) {
+          <button class="btn btn-sm btn-outline-secondary" (click)="activeAttributeList.selectNone()">
             <i-bs name="slash-circle"></i-bs>&nbsp;<ng-container i18n>None</ng-container>
           </button>
         }
-        <button class="btn btn-sm btn-outline-primary" (click)="activeBulkList.selectPage(true)">
+        <button class="btn btn-sm btn-outline-primary" (click)="activeAttributeList.selectPage(true)">
           <i-bs name="file-earmark-check"></i-bs>&nbsp;<ng-container i18n>Page</ng-container>
         </button>
-        <button class="btn btn-sm btn-outline-primary" (click)="activeBulkList.selectAll()">
+        <button class="btn btn-sm btn-outline-primary" (click)="activeAttributeList.selectAll()">
           <i-bs name="check-all"></i-bs>&nbsp;<ng-container i18n>All</ng-container>
         </button>
       </div>
     </div>
 
-    <button type="button" class="btn btn-sm btn-outline-primary" (click)="activeBulkList.setPermissions()"
-      [disabled]="!activeBulkList.userCanBulkEdit(PermissionAction.Change) || activeBulkList.selectedObjects.size === 0">
+    <button type="button" class="btn btn-sm btn-outline-primary" (click)="activeAttributeList.setPermissions()"
+      [disabled]="!activeAttributeList.userCanBulkEdit(PermissionAction.Change) || activeAttributeList.selectedObjects.size === 0">
       <i-bs name="person-fill-lock"></i-bs>&nbsp;<ng-container i18n>Permissions</ng-container>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-danger" (click)="activeBulkList.delete()"
-      [disabled]="!activeBulkList.userCanBulkEdit(PermissionAction.Delete) || activeBulkList.selectedObjects.size === 0">
+    <button type="button" class="btn btn-sm btn-outline-danger" (click)="activeAttributeList.delete()"
+      [disabled]="!activeAttributeList.userCanBulkEdit(PermissionAction.Delete) || activeAttributeList.selectedObjects.size === 0">
       <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="activeBulkList.openCreateDialog()"
-      *pngxIfPermissions="{ action: PermissionAction.Add, type: activeBulkList.permissionType }">
+    <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="activeAttributeList.openCreateDialog()"
+      *pngxIfPermissions="{ action: PermissionAction.Add, type: activeAttributeList.permissionType }">
       <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Create</ng-container>
     </button>
   } @else if (activeCustomFields) {
@@ -62,13 +62,13 @@
 </pngx-page-header>
 
 <ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" [(activeId)]="activeNavID" class="nav-tabs">
-  @for (tab of visibleTabs; track tab.id) {
-    <li [ngbNavItem]="tab.id">
+  @for (section of visibleSections; track section.id) {
+    <li [ngbNavItem]="section.id">
       <a ngbNavLink>
-        <i-bs class="me-1" [name]="tab.icon"></i-bs>{{ tab.label }}
+        <i-bs class="me-2" [name]="section.icon"></i-bs>{{ section.label }}
       </a>
       <ng-template ngbNavContent>
-        <ng-container [ngComponentOutlet]="tab.component"></ng-container>
+        <ng-container [ngComponentOutlet]="section.component"></ng-container>
       </ng-template>
     </li>
   }
diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts
index aebf141ed..38376be77 100644
--- a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts
+++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts
@@ -4,8 +4,10 @@ import {
   inject,
   OnDestroy,
   OnInit,
+  QueryList,
   Type,
   ViewChild,
+  ViewChildren,
 } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import {
@@ -38,15 +40,15 @@ enum DocumentAttributesNavIDs {
   CustomFields = 5,
 }
 
-type DocumentAttributesTabKind = 'bulk' | 'customFields'
+type DocumentAttributesSectionKind = 'attributeList' | 'customFields'
 
-interface DocumentAttributesTab {
+interface DocumentAttributesSection {
   id: DocumentAttributesNavIDs
-  section: string
+  path: string
   label: string
   icon: string
   permissionType: PermissionType
-  kind: DocumentAttributesTabKind
+  kind: DocumentAttributesSectionKind
   component: Type<any>
 }
 
@@ -73,46 +75,46 @@ export class DocumentAttributesComponent implements OnInit, OnDestroy {
   protected readonly PermissionAction = PermissionAction
   protected readonly PermissionType = PermissionType
 
-  readonly tabs: DocumentAttributesTab[] = [
+  readonly sections: DocumentAttributesSection[] = [
     {
       id: DocumentAttributesNavIDs.Tags,
-      section: 'tags',
+      path: 'tags',
       label: $localize`Tags`,
       icon: 'tags',
       permissionType: PermissionType.Tag,
-      kind: 'bulk',
+      kind: 'attributeList',
       component: TagListComponent,
     },
     {
       id: DocumentAttributesNavIDs.Correspondents,
-      section: 'correspondents',
+      path: 'correspondents',
       label: $localize`Correspondents`,
       icon: 'person',
       permissionType: PermissionType.Correspondent,
-      kind: 'bulk',
+      kind: 'attributeList',
       component: CorrespondentListComponent,
     },
     {
       id: DocumentAttributesNavIDs.DocumentTypes,
-      section: 'documenttypes',
+      path: 'documenttypes',
       label: $localize`Document types`,
       icon: 'hash',
       permissionType: PermissionType.DocumentType,
-      kind: 'bulk',
+      kind: 'attributeList',
       component: DocumentTypeListComponent,
     },
     {
       id: DocumentAttributesNavIDs.StoragePaths,
-      section: 'storagepaths',
+      path: 'storagepaths',
       label: $localize`Storage paths`,
       icon: 'folder',
       permissionType: PermissionType.StoragePath,
-      kind: 'bulk',
+      kind: 'attributeList',
       component: StoragePathListComponent,
     },
     {
       id: DocumentAttributesNavIDs.CustomFields,
-      section: 'customfields',
+      path: 'customfields',
       label: $localize`Custom fields`,
       icon: 'ui-radios',
       permissionType: PermissionType.CustomField,
@@ -121,59 +123,54 @@ export class DocumentAttributesComponent implements OnInit, OnDestroy {
     },
   ]
 
-  @ViewChild(TagListComponent) private tagList?: TagListComponent
-  @ViewChild(CorrespondentListComponent)
-  private correspondentList?: CorrespondentListComponent
-  @ViewChild(DocumentTypeListComponent)
-  private documentTypeList?: DocumentTypeListComponent
-  @ViewChild(StoragePathListComponent)
-  private storagePathList?: StoragePathListComponent
-  @ViewChild(CustomFieldsComponent)
-  private customFields?: CustomFieldsComponent
+  @ViewChildren(ManagementListComponent)
+  private attributeLists?: QueryList<ManagementListComponent<any>>
+
+  @ViewChild(CustomFieldsComponent) private customFields?: CustomFieldsComponent
 
   activeNavID: number = null
 
-  get visibleTabs(): DocumentAttributesTab[] {
-    return this.tabs.filter((tab) =>
+  get visibleSections(): DocumentAttributesSection[] {
+    return this.sections.filter((section) =>
       this.permissionsService.currentUserCan(
         PermissionAction.View,
-        tab.permissionType
+        section.permissionType
       )
     )
   }
 
-  get activeTab(): DocumentAttributesTab | null {
-    return this.visibleTabs.find((t) => t.id === this.activeNavID) ?? null
+  get activeSection(): DocumentAttributesSection | null {
+    return (
+      this.visibleSections.find((section) => section.id === this.activeNavID) ??
+      null
+    )
   }
 
-  get activeBulkList(): ManagementListComponent<any> | null {
-    switch (this.activeNavID) {
-      case DocumentAttributesNavIDs.Tags:
-        return this.tagList ?? null
-      case DocumentAttributesNavIDs.Correspondents:
-        return this.correspondentList ?? null
-      case DocumentAttributesNavIDs.DocumentTypes:
-        return this.documentTypeList ?? null
-      case DocumentAttributesNavIDs.StoragePaths:
-        return this.storagePathList ?? null
-      default:
-        return null
-    }
+  get activeAttributeList(): ManagementListComponent<any> | null {
+    if (this.activeSection?.kind !== 'attributeList') return null
+    const permissionType = this.activeSection.permissionType
+    return (
+      this.attributeLists?.find(
+        (list) => list.permissionType === permissionType
+      ) ?? null
+    )
   }
 
   get activeCustomFields(): CustomFieldsComponent | null {
-    return this.activeNavID === DocumentAttributesNavIDs.CustomFields
+    return this.activeSection?.kind === 'customFields'
       ? (this.customFields ?? null)
       : null
   }
 
   get activeTabLabel(): string {
-    return this.activeTab?.label ?? ''
+    return this.activeSection?.label ?? ''
   }
 
   get activeHeaderLoading(): boolean {
     return (
-      this.activeBulkList?.loading ?? this.activeCustomFields?.loading ?? false
+      this.activeAttributeList?.loading ??
+      this.activeCustomFields?.loading ??
+      false
     )
   }
 
@@ -217,19 +214,19 @@ export class DocumentAttributesComponent implements OnInit, OnDestroy {
   }
 
   private getDefaultNavID(): DocumentAttributesNavIDs | null {
-    return this.visibleTabs[0]?.id ?? null
+    return this.visibleSections[0]?.id ?? null
   }
 
   private getNavIDForSection(section: string): DocumentAttributesNavIDs | null {
-    const sectionKey = section?.toLowerCase()
-    if (!sectionKey) return null
+    const path = section?.toLowerCase()
+    if (!path) return null
 
-    const tab = this.visibleTabs.find((t) => t.section === sectionKey)
-    return tab?.id ?? null
+    const found = this.visibleSections.find((s) => s.path === path)
+    return found?.id ?? null
   }
 
   private getSectionForNavID(navID: number): string | null {
-    const tab = this.visibleTabs.find((t) => t.id === navID)
-    return tab?.section ?? null
+    const section = this.visibleSections.find((s) => s.id === navID)
+    return section?.path ?? null
   }
 }