diff --git a/lib/wanderer_app/map/map_server_impl.ex b/lib/wanderer_app/map/map_server_impl.ex
index 014a7190..b06edd85 100644
--- a/lib/wanderer_app/map/map_server_impl.ex
+++ b/lib/wanderer_app/map/map_server_impl.ex
@@ -201,7 +201,7 @@ defmodule WandererApp.Map.Server.Impl do
       | map: map |> WandererApp.Map.update_subscription_settings!(subscription_settings)
     }
 
-  def handle_event(:update_characters, %{map_id: map_id} = state) do
+  def handle_event(:update_characters, state) do
     Process.send_after(self(), :update_characters, @update_characters_timeout)
 
     CharactersImpl.update_characters(state)
@@ -259,7 +259,7 @@ defmodule WandererApp.Map.Server.Impl do
     state
   end
 
-  def handle_event(:cleanup_systems, %{map_id: map_id} = state) do
+  def handle_event(:cleanup_systems, state) do
     Process.send_after(self(), :cleanup_systems, @systems_cleanup_timeout)
 
     state |> SystemsImpl.cleanup_systems()
diff --git a/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex b/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
index 8eeb2c65..995e32a7 100644
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
@@ -192,16 +192,15 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
   end
 
   def handle_ui_event(
-      "toggle_follow",
-      %{"character-id" => clicked_char_id},
-      %{
-        assigns: %{
-          map_id: map_id,
-          current_user: current_user
-        }
-      } = socket
-    ) do
-
+        "toggle_follow",
+        %{"character-id" => clicked_char_id},
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user
+          }
+        } = socket
+      ) do
     {:ok, all_settings} = WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id)
 
     # Find and filter user's characters
@@ -217,7 +216,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
     existing = Enum.find(my_settings, &(&1.character_id == clicked_char_id))
 
     {:ok, target_setting} =
-      if existing do
+      if not is_nil(existing) do
         {:ok, existing}
       else
         WandererApp.MapCharacterSettingsRepo.create(%{
@@ -276,7 +275,6 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
     {:noreply, socket}
   end
 
-
   def handle_ui_event("hide_tracking", _, socket),
     do: {:noreply, socket |> assign(show_tracking?: false)}
 
diff --git a/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex b/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
index d9f09e66..bfd63914 100644
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
@@ -162,7 +162,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
         socket
       )
 
-    def handle_ui_event("toggle_follow_" <> character_id, _, socket),
+  def handle_ui_event("toggle_follow_" <> character_id, _, socket),
     do:
       MapCharactersEventHandler.handle_ui_event(
         "toggle_follow",
@@ -234,7 +234,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
          |> MapCharactersEventHandler.add_character()}
 
   def handle_ui_event(event, body, socket) do
-    Logger.warning(fn -> "unhandled map ui event: #{event} #{inspect(body)}" end)
+    Logger.warning(fn -> "unhandled map ui event: #{inspect(event)} #{inspect(body)}" end)
     {:noreply, socket}
   end
 
diff --git a/lib/wanderer_app_web/live/maps/map_live.ex b/lib/wanderer_app_web/live/maps/map_live.ex
index 3d5d198d..2d9990ed 100644
--- a/lib/wanderer_app_web/live/maps/map_live.ex
+++ b/lib/wanderer_app_web/live/maps/map_live.ex
@@ -77,13 +77,14 @@ defmodule WandererAppWeb.MapLive do
   def handle_info(:not_all_characters_tracked, %{assigns: %{map_slug: map_slug}} = socket),
     do:
       WandererAppWeb.MapEventHandler.handle_ui_event(
-        %{event: "add_character"},
+        "add_character",
         nil,
         socket
         |> put_flash(
           :error,
           "You should enable tracking for all characters that have access to this map first!"
         )
+        |> push_navigate(to: ~p"/tracking/#{map_slug}")
       )
 
   @impl true
@@ -101,17 +102,4 @@ defmodule WandererAppWeb.MapLive do
     socket
     |> assign(:active_page, :map)
   end
-
-  def character_item(assigns) do
-    ~H"""
-    <div class="flex items-center gap-3">
-      <div class="avatar">
-        <div class="rounded-md w-12 h-12">
-          <img src={member_icon_url(@character.eve_id)} alt={@character.name} />
-        </div>
-      </div>
-      <%= @character.name %>
-    </div>
-    """
-  end
 end