diff --git a/src/app/common/table/columns/ago-date/ago-date-column.component.html b/src/app/common/table/columns/ago-date/ago-date-column.component.html
index 6d81eb12..c604cb64 100644
--- a/src/app/common/table/columns/ago-date/ago-date-column.component.html
+++ b/src/app/common/table/columns/ago-date/ago-date-column.component.html
@@ -4,7 +4,7 @@
 			{{ header() ?? (name | titlecase) }}
 		</ng-template>
 		<ng-template
-			[ngTemplateOutlet]="headerTemplate ?? defaultHeaderTemplate"
+			[ngTemplateOutlet]="headerTemplate() ?? defaultHeaderTemplate"
 			[ngTemplateOutletContext]="{
 				header: header()
 			}"
diff --git a/src/app/common/table/columns/asy-abstract-value-column.component.ts b/src/app/common/table/columns/asy-abstract-value-column.component.ts
index 827fe09e..974161c4 100644
--- a/src/app/common/table/columns/asy-abstract-value-column.component.ts
+++ b/src/app/common/table/columns/asy-abstract-value-column.component.ts
@@ -1,4 +1,4 @@
-import { ContentChild, Directive, TemplateRef, booleanAttribute, input } from '@angular/core';
+import { Directive, TemplateRef, booleanAttribute, contentChild, input } from '@angular/core';
 
 import { AsyAbstractColumnComponent } from './asy-abstract-column.component';
 import { HeaderTemplateDirective } from './header-template.directive';
@@ -8,5 +8,5 @@ export abstract class AsyAbstractValueColumnComponent<T> extends AsyAbstractColu
 	readonly header = input<string>();
 	readonly sortable = input(true, { transform: booleanAttribute });
 
-	@ContentChild(HeaderTemplateDirective, { read: TemplateRef }) headerTemplate?: TemplateRef<any>;
+	readonly headerTemplate = contentChild(HeaderTemplateDirective, { read: TemplateRef });
 }
diff --git a/src/app/common/table/columns/date/date-column.component.html b/src/app/common/table/columns/date/date-column.component.html
index 7fc325d1..00037523 100644
--- a/src/app/common/table/columns/date/date-column.component.html
+++ b/src/app/common/table/columns/date/date-column.component.html
@@ -4,7 +4,7 @@
 			{{ header() ?? (name | titlecase) }}
 		</ng-template>
 		<ng-template
-			[ngTemplateOutlet]="headerTemplate ?? defaultHeaderTemplate"
+			[ngTemplateOutlet]="headerTemplate() ?? defaultHeaderTemplate"
 			[ngTemplateOutletContext]="{
 				header: header()
 			}"
diff --git a/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.html b/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.html
index 139e0e0f..463699ca 100644
--- a/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.html
+++ b/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.html
@@ -4,7 +4,7 @@
 			{{ header() ?? (name | titlecase) }}
 		</ng-template>
 		<ng-template
-			[ngTemplateOutlet]="headerTemplate ?? defaultHeaderTemplate"
+			[ngTemplateOutlet]="headerTemplate() ?? defaultHeaderTemplate"
 			[ngTemplateOutletContext]="{
 				header: header()
 			}"
@@ -26,7 +26,7 @@
 								{{ listItem }}
 							</ng-template>
 							<ng-template
-								[ngTemplateOutlet]="itemTemplate ?? defaultItemTemplate"
+								[ngTemplateOutlet]="itemTemplate() ?? defaultItemTemplate"
 								[ngTemplateOutletContext]="{
 									listItem: listItem,
 									item: item,
diff --git a/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.ts b/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.ts
index f712d58b..f3c031fe 100644
--- a/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.ts
+++ b/src/app/common/table/columns/expandable-list/asy-expandable-list-column.component.ts
@@ -1,7 +1,7 @@
 import { SelectionModel } from '@angular/cdk/collections';
 import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
-import { Component, ContentChild, Directive, OnInit, TemplateRef } from '@angular/core';
+import { Component, Directive, OnInit, TemplateRef, contentChild } from '@angular/core';
 
 import { AsyAbstractValueColumnComponent } from '../asy-abstract-value-column.component';
 
@@ -23,8 +23,7 @@ export class AsyExpandableListColumnComponent<T>
 {
 	readonly #selectionModel = new SelectionModel<T>();
 
-	@ContentChild(ItemTemplateDirective, { read: TemplateRef })
-	itemTemplate?: TemplateRef<any>;
+	readonly itemTemplate = contentChild(ItemTemplateDirective, { read: TemplateRef });
 
 	toggle(item: T) {
 		this.#selectionModel.toggle(item);
diff --git a/src/app/common/table/columns/text/text-column.component.html b/src/app/common/table/columns/text/text-column.component.html
index 1a64a7be..70966f77 100644
--- a/src/app/common/table/columns/text/text-column.component.html
+++ b/src/app/common/table/columns/text/text-column.component.html
@@ -4,7 +4,7 @@
 			{{ header() ?? (name | titlecase) }}
 		</ng-template>
 		<ng-template
-			[ngTemplateOutlet]="headerTemplate ?? defaultHeaderTemplate"
+			[ngTemplateOutlet]="headerTemplate() ?? defaultHeaderTemplate"
 			[ngTemplateOutletContext]="{
 				header: header()
 			}"