diff --git a/client/stillbox/src/app/calls/calls.component.html b/client/stillbox/src/app/calls/calls.component.html
index 8870ca3..4a599e0 100644
--- a/client/stillbox/src/app/calls/calls.component.html
+++ b/client/stillbox/src/app/calls/calls.component.html
@@ -83,12 +83,15 @@
       <button class="sbButton" (click)="refresh()">
         <mat-icon>refresh</mat-icon>
       </button>
-      <button [ngClass]="{ sbButton: true, hidden: !selection.hasValue() }" [matMenuTriggerFor]="callMenu">
+      <button
+        [ngClass]="{ sbButton: true, hidden: !selection.hasValue() }"
+        [matMenuTriggerFor]="callMenu"
+      >
         <mat-icon>playlist_add</mat-icon>
       </button>
       <mat-menu #callMenu="matMenu">
-       <button mat-menu-item>Add to new incident...</button> 
-       <button mat-menu-item>Add to existing incident...</button> 
+        <button mat-menu-item>Add to new incident...</button>
+        <button mat-menu-item>Add to existing incident...</button>
       </mat-menu>
     </div>
   </form>
diff --git a/client/stillbox/src/app/calls/calls.component.ts b/client/stillbox/src/app/calls/calls.component.ts
index 0a3c077..4836f9a 100644
--- a/client/stillbox/src/app/calls/calls.component.ts
+++ b/client/stillbox/src/app/calls/calls.component.ts
@@ -30,7 +30,7 @@ import { debounceTime } from 'rxjs/operators';
 import { ToolbarContextService } from '../navigation/toolbar-context.service';
 import { MatSelectModule } from '@angular/material/select';
 import { CallPlayerComponent } from './player/call-player/call-player.component';
-import {MatMenuModule} from '@angular/material/menu';
+import { MatMenuModule } from '@angular/material/menu';
 
 @Pipe({
   name: 'grabDate',
diff --git a/client/stillbox/src/app/incidents/incident/incident.component.ts b/client/stillbox/src/app/incidents/incident/incident.component.ts
index 952efba..211c5ca 100644
--- a/client/stillbox/src/app/incidents/incident/incident.component.ts
+++ b/client/stillbox/src/app/incidents/incident/incident.component.ts
@@ -1,7 +1,14 @@
 import { Component, computed, inject, ViewChild } from '@angular/core';
 import { map, take, tap } from 'rxjs/operators';
 import { CommonModule } from '@angular/common';
-import { BehaviorSubject, Subject, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  forkJoin,
+  merge,
+  Subject,
+  Subscription,
+  zip,
+} from 'rxjs';
 import { Observable } from 'rxjs';
 import {
   ReactiveFormsModule,
@@ -82,26 +89,36 @@ export class IncidentEditDialogComponent {
     if (!this.data.new) {
       this.inc$ = this.incSvc.getIncident(this.data.incID).pipe(
         tap((inc) => {
-         this.form.patchValue(inc);
+          this.form.patchValue(inc);
         }),
       );
-   }
+    }
   }
 
   save() {
-    this.incSvc.updateIncident(this.data.incID, <IncidentRecord>{
-      name: this.form.controls['name'].dirty ? this.form.controls['name'].value : null,
-      startTime: this.form.controls['start'].dirty ? this.form.controls['start'].value : null,
-      endTime: this.form.controls['end'].dirty ? this.form.controls['end'].value : null,
-      description: this.form.controls['description'].dirty ? this.form.controls['description'].value : null,
-    }).subscribe({
-      next: (ok) => {
-        this.dialogRef.close(ok);
-      },
-      error: (er) => {
-        alert(er);
-      },
-    });
+    this.incSvc
+      .updateIncident(this.data.incID, <IncidentRecord>{
+        name: this.form.controls['name'].dirty
+          ? this.form.controls['name'].value
+          : null,
+        startTime: this.form.controls['start'].dirty
+          ? this.form.controls['start'].value
+          : null,
+        endTime: this.form.controls['end'].dirty
+          ? this.form.controls['end'].value
+          : null,
+        description: this.form.controls['description'].dirty
+          ? this.form.controls['description'].value
+          : null,
+      })
+      .subscribe({
+        next: (ok) => {
+          this.dialogRef.close(ok);
+        },
+        error: (er) => {
+          alert(er);
+        },
+      });
   }
 
   cancel() {
@@ -133,7 +150,7 @@ export class IncidentEditDialogComponent {
   styleUrl: './incident.component.scss',
 })
 export class IncidentComponent {
-  incPrime = new Subject<IncidentRecord>();
+  incPrime = new BehaviorSubject<IncidentRecord>(<IncidentRecord>{});
   inc$!: Observable<IncidentRecord>;
   subscriptions: Subscription = new Subscription();
   dialog = inject(MatDialog);
@@ -161,16 +178,13 @@ export class IncidentComponent {
 
   ngOnInit() {
     this.incID = this.route.snapshot.paramMap.get('id')!;
-    this.inc$ = this.incPrime.pipe();
-    this.incSvc
-      .getIncident(this.incID)
-      .pipe(
-        tap((inc) => {
-          if (inc.calls) {
-            this.callsResult.data = inc.calls;
-          }
-        }),
-      ).subscribe(this.incPrime);
+    this.inc$ = merge(this.incSvc.getIncident(this.incID), this.incPrime).pipe(
+      tap((inc) => {
+        if (inc.calls) {
+          this.callsResult.data = inc.calls;
+        }
+      }),
+    );
   }
 
   editIncident(incID: string) {
@@ -181,12 +195,7 @@ export class IncidentComponent {
       },
     });
 
-    dialogRef.afterClosed().subscribe((res) => {
-      if (res !== undefined) {
-        console.log(res);
-        this.incPrime.next(res);
-      }
-    });
+    dialogRef.afterClosed().subscribe(this.incPrime);
   }
 
   ngOnDestroy() {