diff --git a/README.md b/README.md
index dd1ba48..1cdd79b 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ _Deployments list view_
 
 ## Tags
 
-Tags are used for multiple purposes: To group __deployments__ into units of dependent devices (for example a WiFi Accesspoint, Camera Nodes and an Aggregator Node), and to mark/tag __entries__ on the map ([viz.mitwelten.org](https://viz.mitwelten.org)). The tag list view gives an overview of all existing tags with number of assignments to either __deployment__ or __entry__ records.
+Tags are used for multiple purposes: To group __deployments__ into units of dependent devices (for example a WiFi Accesspoint, Camera Nodes and an Aggregator Node), and to mark/tag __notes__ on the map ([viz.mitwelten.org](https://viz.mitwelten.org)). The tag list view gives an overview of all existing tags with number of assignments to either __deployment__ or __note__ records.
 
 ![list-tags](./assets/list-tags.png)
 _Tags list view_
diff --git a/assets/list-tags.png b/assets/list-tags.png
index 176285c..2a010a1 100644
Binary files a/assets/list-tags.png and b/assets/list-tags.png differ
diff --git a/package.json b/package.json
index 4f96713..286356f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deploy-app",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/components/tag-list/tag-list.component.html b/src/app/components/tag-list/tag-list.component.html
index 2b39b4a..4063f79 100644
--- a/src/app/components/tag-list/tag-list.component.html
+++ b/src/app/components/tag-list/tag-list.component.html
@@ -31,7 +31,7 @@ <h2 class="icon-header">
           </button>
           <button mat-icon-button (click)="deleteTag(row)"
             matTooltip="Delete this tag" matTooltipPosition="before" matTooltipClass="tight-tooltip"
-            [disabled]="!(row.deployments === 0 && row.entries === 0)">
+            [disabled]="!(row.deployments === 0 && row.notes === 0)">
             <mat-icon class="material-symbols-outlined">delete</mat-icon>
           </button>
         </td>
@@ -49,10 +49,10 @@ <h2 class="icon-header">
         <td mat-cell *matCellDef="let row"><ng-container *ngIf="row.deployments > 0">{{row.deployments}}</ng-container></td>
       </ng-container>
 
-      <!-- Entries Column -->
-      <ng-container matColumnDef="entries">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Entries</th>
-        <td mat-cell *matCellDef="let row"><ng-container *ngIf="row.entries > 0">{{row.entries}}</ng-container></td>
+      <!-- Notes Column -->
+      <ng-container matColumnDef="notes">
+        <th mat-header-cell *matHeaderCellDef mat-sort-header>Notes</th>
+        <td mat-cell *matCellDef="let row"><ng-container *ngIf="row.notes > 0">{{row.notes}}</ng-container></td>
       </ng-container>
 
       <!-- Created At Column -->
diff --git a/src/app/components/tag-list/tag-list.component.ts b/src/app/components/tag-list/tag-list.component.ts
index 7091a1b..d917d82 100644
--- a/src/app/components/tag-list/tag-list.component.ts
+++ b/src/app/components/tag-list/tag-list.component.ts
@@ -38,7 +38,7 @@ export class TagListComponent implements OnInit, AfterViewInit {
   };
 
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
-  displayedColumns = ['action', 'name', 'deployments', 'entries', 'created', 'updated'];
+  displayedColumns = ['action', 'name', 'deployments', 'notes', 'created', 'updated'];
 
   isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
     .pipe(
diff --git a/src/app/components/tag-list/tags-datasource.ts b/src/app/components/tag-list/tags-datasource.ts
index 400b492..7ca640d 100644
--- a/src/app/components/tag-list/tags-datasource.ts
+++ b/src/app/components/tag-list/tags-datasource.ts
@@ -88,7 +88,7 @@ export class TagsDataSource extends DataSource<Tag> {
       switch (this.sort?.active) {
         case 'name': return compare(a.name ?? '', b.name ?? '', isAsc);
         case 'deployments': return compare(a.deployments ?? 0, b.deployments ?? 0, isAsc);
-        case 'entries': return compare(a.entries ?? 0, b.entries ?? 0, isAsc);
+        case 'notes': return compare(a.notes ?? 0, b.notes ?? 0, isAsc);
         case 'created': return compare(a.created_at ?? 0, b.created_at ?? 0, isAsc);
         case 'updated': return compare(a.updated_at ?? 0, b.updated_at ?? 0, isAsc);
         default: return 0;
diff --git a/src/app/shared/tag.type.ts b/src/app/shared/tag.type.ts
index dcecba2..ab96942 100644
--- a/src/app/shared/tag.type.ts
+++ b/src/app/shared/tag.type.ts
@@ -2,7 +2,7 @@ export type Tag = {
     tag_id?: number;
     name: string;
     deployments?: number;
-    entries?: number;
+    notes?: number;
     created_at?: string;
     updated_at?: string;
 };