diff --git a/lib/mv/membership/member_export/build.ex b/lib/mv/membership/member_export/build.ex
index ff8cf76..9e0cc7b 100644
--- a/lib/mv/membership/member_export/build.ex
+++ b/lib/mv/membership/member_export/build.ex
@@ -272,24 +272,34 @@ defmodule Mv.Membership.MemberExport.Build do
     if field == "groups" do
       sort_members_by_groups_export(members, order)
     else
-      id_str = String.trim_leading(field, @custom_field_prefix)
-      custom_field = Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
-
-      if is_nil(custom_field), do: members
-
-      key_fn = fn member ->
-        cfv = find_cfv(member, custom_field)
-        raw = if cfv, do: cfv.value, else: nil
-        MemberExportSort.custom_field_sort_key(custom_field.value_type, raw)
-      end
-
-      members
-      |> Enum.map(fn m -> {m, key_fn.(m)} end)
-      |> Enum.sort(fn {_, ka}, {_, kb} -> MemberExportSort.key_lt(ka, kb, order) end)
-      |> Enum.map(fn {m, _} -> m end)
+      sort_by_custom_field_value(members, field, order, custom_fields)
     end
   end
 
+  defp sort_by_custom_field_value(members, field, order, custom_fields) do
+    id_str = String.trim_leading(field, @custom_field_prefix)
+    custom_field = Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
+
+    if is_nil(custom_field) do
+      members
+    else
+      sort_members_with_custom_field(members, custom_field, order)
+    end
+  end
+
+  defp sort_members_with_custom_field(members, custom_field, order) do
+    key_fn = fn member ->
+      cfv = find_cfv(member, custom_field)
+      raw = if cfv, do: cfv.value, else: nil
+      MemberExportSort.custom_field_sort_key(custom_field.value_type, raw)
+    end
+
+    members
+    |> Enum.map(fn m -> {m, key_fn.(m)} end)
+    |> Enum.sort(fn {_, ka}, {_, kb} -> MemberExportSort.key_lt(ka, kb, order) end)
+    |> Enum.map(fn {m, _} -> m end)
+  end
+
   defp sort_members_by_groups_export(members, order) do
     # Members with groups first, then by first group name alphabetically (min = first by sort order)
     # Match table behavior from MvWeb.MemberLive.Index.sort_members_by_groups/2
diff --git a/lib/mv_web/controllers/member_export_controller.ex b/lib/mv_web/controllers/member_export_controller.ex
index 4ed8f2d..08bcba7 100644
--- a/lib/mv_web/controllers/member_export_controller.ex
+++ b/lib/mv_web/controllers/member_export_controller.ex
@@ -380,33 +380,37 @@ defmodule MvWeb.MemberExportController do
     if field == "groups" do
       sort_members_by_groups_export(members, order)
     else
-      id_str = String.trim_leading(field, @custom_field_prefix)
+      sort_by_custom_field_value(members, field, order, custom_fields)
+    end
+  end
 
-      custom_field =
-        Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
+  defp sort_by_custom_field_value(members, field, order, custom_fields) do
+    id_str = String.trim_leading(field, @custom_field_prefix)
 
-      if is_nil(custom_field) do
-        members
-      else
-        # Match table:
-        # 1) values first, empty last
-        # 2) sort only values
-        # 3) for desc, reverse only the values-part
-        {with_values, without_values} =
-          Enum.split_with(members, fn member ->
-            has_non_empty_custom_field_value?(member, custom_field)
-          end)
+    custom_field =
+      Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
 
-        sorted_with_values =
-          Enum.sort_by(with_values, fn member ->
-            extract_member_sort_value(member, custom_field)
-          end)
+    if is_nil(custom_field) do
+      members
+    else
+      # Match table:
+      # 1) values first, empty last
+      # 2) sort only values
+      # 3) for desc, reverse only the values-part
+      {with_values, without_values} =
+        Enum.split_with(members, fn member ->
+          has_non_empty_custom_field_value?(member, custom_field)
+        end)
 
-        sorted_with_values =
-          if order == "desc", do: Enum.reverse(sorted_with_values), else: sorted_with_values
+      sorted_with_values =
+        Enum.sort_by(with_values, fn member ->
+          extract_member_sort_value(member, custom_field)
+        end)
 
-        sorted_with_values ++ without_values
-      end
+      sorted_with_values =
+        if order == "desc", do: Enum.reverse(sorted_with_values), else: sorted_with_values
+
+      sorted_with_values ++ without_values
     end
   end
 
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 9d93b08..218fa6f 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -686,6 +686,7 @@ defmodule MvWeb.MemberLive.Index do
     socket =
       if socket.assigns[:sort_needs_update] do
         old_field = socket.assigns[:previous_sort_field] || socket.assigns.sort_field
+
         socket
         |> update_sort_components(old_field, socket.assigns.sort_field, socket.assigns.sort_order)
         |> assign(:sort_needs_update, false)
@@ -1066,7 +1067,6 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
-
   defp apply_sort_to_query(query, field, order) do
     cond do
       # Groups sort -> after load (in memory)