diff --git a/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte b/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
index 996a6ae678..6c571ee370 100644
--- a/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
+++ b/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
@@ -138,6 +138,10 @@
           on:click|stopPropagation={toggleFilterMenu}
           class="st-button icon w-100"
           style:position="relative"
+          use:tooltip={{
+            content: `Filter Activities${filterCount > 0 ? ` (${filterCount} applied)` : ''}`,
+            placement: 'top',
+          }}
         >
           <div class="activity-layer-name st-select">
             <div class="activity-layer-name-text">
diff --git a/src/utilities/timeline.ts b/src/utilities/timeline.ts
index 2410b4a445..44e214396b 100644
--- a/src/utilities/timeline.ts
+++ b/src/utilities/timeline.ts
@@ -1578,7 +1578,6 @@ export function directiveOrSpanMatchesDynamicFilters(
       }
       matches = matchesDynamicFilter(argument, curr.operator, curr.value);
     } else if (curr.field === 'SchedulingGoalId') {
-      // TODO need to test this once model is working
       const goalId = (directiveOrSpan as ActivityDirective).source_scheduling_goal_id;
       if (typeof goalId === 'number') {
         matches = matchesDynamicFilter(goalId, curr.operator, curr.value);