diff --git a/src/components/AnnotationViewer.vue b/src/components/AnnotationViewer.vue
index ecf57693..3cf601c7 100644
--- a/src/components/AnnotationViewer.vue
+++ b/src/components/AnnotationViewer.vue
@@ -117,6 +117,31 @@ function filterAnnotations(
   return output;
 }
 
+// Custom class to ensure type safety for the parent map
+class ParentMap {
+  private map = new Map<string, string>();
+
+  set(key: string, value: string) {
+    this.map.set(key, value);
+  }
+
+  get(key: string): string {
+    const value = this.map.get(key);
+    if (value === undefined) {
+      throw new Error(`Key not found in ParentMap: ${key}`);
+    }
+    return value;
+  }
+
+  has(key: string): boolean {
+    return this.map.has(key);
+  }
+
+  forEach(callback: (value: string, key: string) => void) {
+    this.map.forEach(callback);
+  }
+}
+
 // Draws annotations on the given layer, and provides functionality for the user selected tool.
 @Component({
   components: {
@@ -1075,17 +1100,15 @@ export default class AnnotationViewer extends Vue {
     connections: IAnnotationConnection[],
   ): { annotations: Set<string>; connections: IAnnotationConnection[] }[] {
     // Simple Union-Find implementation
-    const parent = new Map<string, string>();
+    // Use our custom ParentMap instead of Map to ensure type safety
+    const parent = new ParentMap();
 
     // Find with path compression
     function find(x: string): string {
       if (!parent.has(x)) {
         parent.set(x, x);
       }
-      if (parent.get(x) !== x) {
-        parent.set(x, find(parent.get(x)!));
-      }
-      return parent.get(x)!;
+      return parent.get(x) === x ? x : find(parent.get(x));
     }
 
     // Union operation
@@ -1209,30 +1232,34 @@ export default class AnnotationViewer extends Vue {
 
       component.annotations.forEach((id) => {
         const annotation = this.getAnnotationFromId(id);
-        if (annotation) {
-          // If the annotation doesn't have a tag in the timelapseTags list, skip it
-          // If the timelapseTags list is empty, include all annotations
-          if (
-            timelapseTags.length > 0 &&
-            !annotation.tags.some((tag: string) => timelapseTags.includes(tag))
-          ) {
-            return;
-          }
+        if (!annotation) {
+          return;
+        }
+        // If the annotation doesn't have a tag in the timelapseTags list, skip it
+        // If the timelapseTags list is empty, include all annotations
+        if (
+          timelapseTags.length > 0 &&
+          !annotation.tags.some((tag: string) => timelapseTags.includes(tag))
+        ) {
+          return;
         }
         const timelapseAnnotation: ITimelapseAnnotation = {
           // Cast to IAnnotation to access the common properties
           ...(annotation as IAnnotation),
           trackPositionType: TrackPositionType.INTERIOR,
         };
-        if (annotation) {
-          if (
-            annotation.location.Time >= currentTime - timelapseModeWindow &&
-            annotation.location.Time <= currentTime + timelapseModeWindow
-          ) {
-            componentAnnotations.push(timelapseAnnotation);
-          }
+        if (
+          annotation.location.Time >= currentTime - timelapseModeWindow &&
+          annotation.location.Time <= currentTime + timelapseModeWindow
+        ) {
+          componentAnnotations.push(timelapseAnnotation);
         }
       });
+
+      if (componentAnnotations.length === 0) {
+        return;
+      }
+
       // Set the trackPositionType for the start and end annotations
       // We define START as annotations with no connection to an earlier point, and
       // END as annotations with no connection to a later point.
@@ -1267,14 +1294,12 @@ export default class AnnotationViewer extends Vue {
         currentAnnotation.trackPositionType = TrackPositionType.CURRENT;
       }
 
-      if (componentAnnotations.length > 0) {
-        this.drawTimelapseTrack(
-          componentAnnotations,
-          component.connections,
-          color,
-        );
-        this.drawTimelapseAnnotationCentroidsAndLabels(componentAnnotations);
-      }
+      this.drawTimelapseTrack(
+        componentAnnotations,
+        component.connections,
+        color,
+      );
+      this.drawTimelapseAnnotationCentroidsAndLabels(componentAnnotations);
     });
 
     // Find orphaned annotations
diff --git a/src/store/annotation.ts b/src/store/annotation.ts
index f920a08e..89f901f1 100644
--- a/src/store/annotation.ts
+++ b/src/store/annotation.ts
@@ -618,7 +618,7 @@ export class Annotations extends VuexModule {
     const allIds = new Set([...parentIds, ...childIds]);
     const annotations = Array.from(allIds)
       .map((id) => this.annotations.find((a) => a.id === id))
-      .filter((a): a is IAnnotation => a !== undefined);
+      .filter((a): a is IAnnotation => !!a);
 
     // 2. Find closest temporal parent for each annotation
     const connectionBases: IAnnotationConnectionBase[] = [];