diff --git a/app/Http/Controllers/Dungeon/DungeonExploreController.php b/app/Http/Controllers/Dungeon/DungeonExploreController.php
index 0408695eb..39c8b6a11 100644
--- a/app/Http/Controllers/Dungeon/DungeonExploreController.php
+++ b/app/Http/Controllers/Dungeon/DungeonExploreController.php
@@ -112,7 +112,7 @@ public function viewDungeonFloor(
             $combatLogEventFilter = new CombatLogEventFilter(
                 $seasonService,
                 $dungeon,
-                CombatLogEventEventType::EnemyKilled,
+                CombatLogEventEventType::NpcDeath,
                 CombatLogEventDataType::PlayerPosition,
             );
 
diff --git a/app/Models/CombatLog/CombatLogEventEventType.php b/app/Models/CombatLog/CombatLogEventEventType.php
index d913844db..9ece7315a 100644
--- a/app/Models/CombatLog/CombatLogEventEventType.php
+++ b/app/Models/CombatLog/CombatLogEventEventType.php
@@ -4,7 +4,7 @@
 
 enum CombatLogEventEventType: string
 {
-    case EnemyKilled = 'enemy_killed';
+    case NpcDeath    = 'npc_death';
     case PlayerDeath = 'player_death';
-    case SpellCast   = 'spell_cast';
+    case PlayerSpell = 'player_spell';
 }
diff --git a/app/Service/CombatLog/Builders/CombatLogRouteCombatLogEventsBuilder.php b/app/Service/CombatLog/Builders/CombatLogRouteCombatLogEventsBuilder.php
index 66f893fe3..3b49afb07 100644
--- a/app/Service/CombatLog/Builders/CombatLogRouteCombatLogEventsBuilder.php
+++ b/app/Service/CombatLog/Builders/CombatLogRouteCombatLogEventsBuilder.php
@@ -94,7 +94,7 @@ public function getCombatLogEvents(): Collection
                         // Original event location
                         'pos_x'      => round($npc->coord->x, 2),
                         'pos_y'      => round($npc->coord->y, 2),
-                        'event_type' => CombatLogEventEventType::EnemyKilled->value,
+                        'event_type' => CombatLogEventEventType::NpcDeath->value,
                         'context'    => json_encode([
                             '@timestamp'  => $npc->getDiedAt(),
                             // Resolved enemy location
@@ -123,7 +123,7 @@ public function getCombatLogEvents(): Collection
                         // Original event location
                         'pos_x'      => round($spell->coord->x, 2),
                         'pos_y'      => round($spell->coord->y, 2),
-                        'event_type' => CombatLogEventEventType::SpellCast->value,
+                        'event_type' => CombatLogEventEventType::PlayerSpell->value,
                         'context'    => json_encode([
                             '@timestamp' => $spell->getCastAt(),
                             'spell_id'   => $spell->spellId,
diff --git a/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php b/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
index 7bdbbbd7d..a70198bd0 100644
--- a/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
+++ b/app/Service/RaiderIO/Dtos/HeatmapDataFilter.php
@@ -224,8 +224,8 @@ public static function fromArray(array $requestArray): HeatmapDataFilter
     {
         $heatmapDataFilter = new HeatmapDataFilter(
             dungeon: Dungeon::firstWhere('id', $requestArray['dungeonId']),
-            eventType: CombatLogEventEventType::from($requestArray['type'] ?? 'enemy_killed'),
-            dataType: CombatLogEventDataType::from($requestArray['dataType'] ?? 'player_position')
+            eventType: CombatLogEventEventType::from($requestArray['type'] ?? CombatLogEventEventType::NpcDeath->value),
+            dataType: CombatLogEventDataType::from($requestArray['dataType'] ?? CombatLogEventDataType::PlayerPosition->value)
         );
 
         $heatmapDataFilter->setKeyLevelMin(isset($requestArray['minMythicLevel']) ? (int)$requestArray['minMythicLevel'] : null);
diff --git a/lang/en_US/combatlogeventtypes.php b/lang/en_US/combatlogeventtypes.php
index 6b1d060b4..6195cddb6 100644
--- a/lang/en_US/combatlogeventtypes.php
+++ b/lang/en_US/combatlogeventtypes.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
+    'npc_death'    => 'Enemy death',
     'player_death' => 'Player death',
-    'enemy_killed' => 'Enemy killed',
-    'spell_cast'   => 'Bloodlust casts',
+    'player_spell' => 'Bloodlust casts',
 ];
diff --git a/resources/views/common/maps/controls/heatmapsearch.blade.php b/resources/views/common/maps/controls/heatmapsearch.blade.php
index d04f654ac..17f8e54a2 100644
--- a/resources/views/common/maps/controls/heatmapsearch.blade.php
+++ b/resources/views/common/maps/controls/heatmapsearch.blade.php
@@ -83,7 +83,7 @@
     'filterWeeklyAffixGroupsSelector' => '#filter_weekly_affix_groups',
     'filterDurationSelector' => '#filter_duration',
 
-    'filterCollapseNames' => ['level', 'affixes', 'duration'],
+    'filterCollapseNames' => ['keyLevel', 'includeAffixIds', 'duration'],
     'filterCookiePrefix' => $filterExpandedCookiePrefix,
 
     'leafletHeatOptionsMinOpacitySelector' => '#heatmap_heat_option_min_opacity',
@@ -165,10 +165,10 @@ class="route_sidebar top right row no-gutters map_fade_out
                          data-toggle="buttons">
                         <label class="btn btn-secondary active">
                             <input type="radio" name="event_type"
-                                   class="{{ CombatLogEventEventType::EnemyKilled->value }}"
-                                   value="{{ CombatLogEventEventType::EnemyKilled->value }}"
+                                   class="{{ CombatLogEventEventType::NpcDeath->value }}"
+                                   value="{{ CombatLogEventEventType::NpcDeath->value }}"
                                    checked>
-                            <i class="fas fa-users"></i> {{ __('combatlogeventtypes.enemy_killed') }}
+                            <i class="fas fa-users"></i> {{ __('combatlogeventtypes.npc_death') }}
                         </label>
                         <label class="btn btn-secondary">
                             <input type="radio" name="event_type"
@@ -178,11 +178,11 @@ class="{{ CombatLogEventEventType::PlayerDeath->value }}"
                         </label>
                         <label class="btn btn-secondary">
                             <input type="radio" name="event_type"
-                                   class="{{ CombatLogEventEventType::SpellCast->value }}"
-                                   value="{{ CombatLogEventEventType::SpellCast->value }}">
+                                   class="{{ CombatLogEventEventType::PlayerSpell->value }}"
+                                   value="{{ CombatLogEventEventType::PlayerSpell->value }}">
                             <img src="{{ url('images/heatmap/bloodlust_smaller.png') }}"
                                  alt="{{ __('view_common.maps.controls.heatmapsearch.bloodlust_alt') }}">
-                            {{ __('combatlogeventtypes.spell_cast') }}
+                            {{ __('combatlogeventtypes.player_spell') }}
                         </label>
                     </div>
                 </div>
diff --git a/tests/Feature/Controller/Ajax/AjaxHeatmapControllerTest.php b/tests/Feature/Controller/Ajax/AjaxHeatmapControllerTest.php
index e342c0e83..195f3bf02 100644
--- a/tests/Feature/Controller/Ajax/AjaxHeatmapControllerTest.php
+++ b/tests/Feature/Controller/Ajax/AjaxHeatmapControllerTest.php
@@ -21,7 +21,7 @@ final class AjaxHeatmapControllerTest extends DungeonRouteTestBase
 {
     use CreatesCombatLogEvent;
 
-    const EVENT_TYPE = CombatLogEventEventType::EnemyKilled;
+    const EVENT_TYPE = CombatLogEventEventType::NpcDeath;
     const DATA_TYPE = CombatLogEventDataType::PlayerPosition;
 
     /**