From ba39632c38f408380aa45e88c38b7c1fcc860016 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@local-it.org>
Date: Wed, 1 Jul 2026 00:09:58 +0000
Subject: [PATCH 01/30] chore(deps): update mix dependencies

---
 mix.exs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mix.exs b/mix.exs
index 23e8a6fe..02861f93 100644
--- a/mix.exs
+++ b/mix.exs
@@ -37,7 +37,7 @@ defmodule Mv.MixProject do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:tidewave, "~> 0.5", only: [:dev]},
+      {:tidewave, "~> 0.6", only: [:dev]},
       {:sourceror, "~> 1.8", only: [:dev, :test]},
       {:live_debugger, "~> 1.0", only: [:dev]},
       {:ash_admin, "~> 1.0"},
@@ -54,11 +54,11 @@ defmodule Mv.MixProject do
       {:postgrex, ">= 0.0.0"},
       {:phoenix_html, "~> 4.1"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 1.1.0-rc.3"},
+      {:phoenix_live_view, "~> 1.2.0"},
       {:lazy_html, ">= 0.0.0", only: :test},
       {:phoenix_live_dashboard, "~> 0.8.3"},
       {:esbuild, "~> 0.9", runtime: Mix.env() == :dev},
-      {:tailwind, "~> 0.4", runtime: Mix.env() == :dev},
+      {:tailwind, "~> 0.5", runtime: Mix.env() == :dev},
       {:heroicons,
        github: "tailwindlabs/heroicons",
        tag: "v2.2.0",
@@ -70,7 +70,7 @@ defmodule Mv.MixProject do
       {:swoosh, "~> 1.16"},
       # Required by Swoosh.Adapters.SMTP (and its Helpers use mimemail, which gen_smtp brings in)
       {:gen_smtp, "~> 1.0"},
-      {:req, "~> 0.5"},
+      {:req, "~> 0.6"},
       {:telemetry_metrics, "~> 1.0"},
       {:telemetry_poller, "~> 1.0"},
       {:gettext, "~> 1.0"},

From b745b13ca56d6ea84c44f948a447546fc1de720b Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 3 Jul 2026 11:04:43 +0200
Subject: [PATCH 02/30] feat(membership-fees): denormalize cycle_end so fee
 status filters run in the database

Store the cycle's end date alongside its start so the payment-status
filter can be a plain date comparison in SQL instead of loading every
cycle and classifying it in memory. The value is fixed when the cycle
is created (the fee type's interval is immutable and the update action
never changes the start date), so the denormalized column can never
drift from the computed end and needs no write-time reconciliation.
---
 lib/membership_fees/cycle_end_backfill.ex     |  53 ++++++
 lib/membership_fees/membership_fee_cycle.ex   |  19 +-
 .../changes/set_cycle_end.ex                  |  68 +++++++
 lib/mv/membership_fees/cycle_generator.ex     |   9 +-
 ...add_cycle_end_to_membership_fee_cycles.exs |  32 ++++
 .../membership_fee_cycles/20260630163240.json | 173 ++++++++++++++++++
 test/membership_fees/cycle_end_test.exs       |  98 ++++++++++
 7 files changed, 448 insertions(+), 4 deletions(-)
 create mode 100644 lib/membership_fees/cycle_end_backfill.ex
 create mode 100644 lib/membership_fees/membership_fee_cycle/changes/set_cycle_end.ex
 create mode 100644 priv/repo/migrations/20260630163238_add_cycle_end_to_membership_fee_cycles.exs
 create mode 100644 priv/resource_snapshots/repo/membership_fee_cycles/20260630163240.json
 create mode 100644 test/membership_fees/cycle_end_test.exs

diff --git a/lib/membership_fees/cycle_end_backfill.ex b/lib/membership_fees/cycle_end_backfill.ex
new file mode 100644
index 00000000..1d739dad
--- /dev/null
+++ b/lib/membership_fees/cycle_end_backfill.ex
@@ -0,0 +1,53 @@
+defmodule Mv.MembershipFees.CycleEndBackfill do
+  @moduledoc """
+  One-time backfill for the denormalized `cycle_end` column on
+  `membership_fee_cycles`.
+
+  For every cycle whose `cycle_end` is still `NULL`, sets it to
+  `CalendarCycles.calculate_cycle_end(cycle_start, interval)` using the cycle's
+  own fee-type interval. Idempotent: rows that already have a `cycle_end` are
+  left untouched, so it is safe to re-run.
+
+  Invoked from the `cycle_end` migration. Kept as a module function (rather than
+  inline migration SQL) so the exact calendar arithmetic is reused from
+  `CalendarCycles` and can be tested directly.
+  """
+
+  import Ecto.Query
+
+  alias Mv.MembershipFees.CalendarCycles
+  alias Mv.Repo
+
+  @doc """
+  Backfills `cycle_end` for all cycles missing it. Returns `{:ok, updated_count}`.
+  """
+  @spec run() :: {:ok, non_neg_integer()}
+  def run do
+    rows =
+      from(c in "membership_fee_cycles",
+        join: t in "membership_fee_types",
+        on: c.membership_fee_type_id == t.id,
+        where: is_nil(c.cycle_end),
+        select: {c.id, c.cycle_start, t.interval}
+      )
+      |> Repo.all()
+
+    count =
+      Enum.reduce(rows, 0, fn {id, cycle_start, interval}, acc ->
+        cycle_end = CalendarCycles.calculate_cycle_end(cycle_start, normalize_interval(interval))
+
+        from(c in "membership_fee_cycles", where: c.id == ^id)
+        |> Repo.update_all(set: [cycle_end: cycle_end])
+
+        acc + 1
+      end)
+
+    {:ok, count}
+  end
+
+  # The raw query returns the enum column as a string.
+  defp normalize_interval(interval) when is_atom(interval), do: interval
+
+  defp normalize_interval(interval) when is_binary(interval),
+    do: String.to_existing_atom(interval)
+end
diff --git a/lib/membership_fees/membership_fee_cycle.ex b/lib/membership_fees/membership_fee_cycle.ex
index cd628871..cb881938 100644
--- a/lib/membership_fees/membership_fee_cycle.ex
+++ b/lib/membership_fees/membership_fee_cycle.ex
@@ -13,7 +13,9 @@ defmodule Mv.MembershipFees.MembershipFeeCycle do
   - `notes` - Optional notes for this cycle
 
   ## Design Decisions
-  - **No cycle_end field**: Calculated from cycle_start + interval (from fee type)
+  - **Denormalized cycle_end**: Set at create from cycle_start + interval (fee type).
+    Because the fee type interval and the cycle_start are immutable after create,
+    cycle_end never drifts, so it can be filtered/sorted in SQL.
   - **Amount stored per cycle**: Preserves historical amounts when fee type changes
   - **Calendar-aligned cycles**: All cycles start on calendar boundaries
 
@@ -46,6 +48,14 @@ defmodule Mv.MembershipFees.MembershipFeeCycle do
     create :create do
       primary? true
       accept [:cycle_start, :amount, :status, :notes, :member_id, :membership_fee_type_id]
+
+      argument :interval, :atom do
+        allow_nil? true
+
+        description "Optional pre-resolved fee-type interval; when given, SetCycleEnd skips the fee-type lookup"
+      end
+
+      change Mv.MembershipFees.MembershipFeeCycle.Changes.SetCycleEnd
     end
 
     update :update do
@@ -106,6 +116,13 @@ defmodule Mv.MembershipFees.MembershipFeeCycle do
       description "Start date of the billing cycle"
     end
 
+    attribute :cycle_end, :date do
+      allow_nil? false
+      public? true
+
+      description "Denormalized end date of the cycle (cycle_start + interval), set at create"
+    end
+
     attribute :amount, :decimal do
       allow_nil? false
       public? true
diff --git a/lib/membership_fees/membership_fee_cycle/changes/set_cycle_end.ex b/lib/membership_fees/membership_fee_cycle/changes/set_cycle_end.ex
new file mode 100644
index 00000000..296f952c
--- /dev/null
+++ b/lib/membership_fees/membership_fee_cycle/changes/set_cycle_end.ex
@@ -0,0 +1,68 @@
+defmodule Mv.MembershipFees.MembershipFeeCycle.Changes.SetCycleEnd do
+  @moduledoc """
+  Ash change that denormalizes `cycle_end` on a membership fee cycle at create time.
+
+  `cycle_end` is computed as `CalendarCycles.calculate_cycle_end(cycle_start, interval)`,
+  where `interval` is read from the cycle's `membership_fee_type`. Because a fee type's
+  `interval` is immutable and the cycle's `cycle_start` is never updated, the stored
+  `cycle_end` is fixed at create time and never drifts.
+
+  When the caller already knows the interval (e.g. the bulk cycle generator, which
+  resolves the fee type once for a whole batch), it may pass it via the `:interval`
+  create argument; the change then uses that value and issues no fee-type query,
+  avoiding an N+1 lookup across a batch of cycles.
+
+  Otherwise the fee-type interval is read with `authorize?: false`: it is an internal
+  lookup of immutable reference data needed to populate a derived column, not a
+  user-facing read, and cycle creation is itself a systemic operation. Reading it under
+  the caller's actor is unreliable here (the actor is not always present in the change
+  context, e.g. when a changeset is built with `for_create/3` and the actor is only
+  supplied to `Ash.create/2`).
+
+  When `cycle_start` or `membership_fee_type_id` are missing the changeset is returned
+  unchanged so the normal `allow_nil?` validations surface the error.
+  """
+  use Ash.Resource.Change
+
+  alias Mv.MembershipFees.CalendarCycles
+  alias Mv.MembershipFees.MembershipFeeType
+
+  @impl true
+  def change(changeset, _opts, _context) do
+    with {:ok, cycle_start} <- fetch(changeset, :cycle_start),
+         {:ok, fee_type_id} <- fetch(changeset, :membership_fee_type_id),
+         {:ok, interval} <- resolve_interval(changeset, fee_type_id) do
+      cycle_end = CalendarCycles.calculate_cycle_end(cycle_start, interval)
+      Ash.Changeset.force_change_attribute(changeset, :cycle_end, cycle_end)
+    else
+      _ -> changeset
+    end
+  end
+
+  defp fetch(changeset, field) do
+    case Ash.Changeset.fetch_change(changeset, field) do
+      {:ok, value} when not is_nil(value) ->
+        {:ok, value}
+
+      _ ->
+        case Map.get(changeset.data, field) do
+          nil -> :error
+          value -> {:ok, value}
+        end
+    end
+  end
+
+  defp resolve_interval(changeset, fee_type_id) do
+    case Ash.Changeset.get_argument(changeset, :interval) do
+      nil -> fetch_interval(fee_type_id)
+      interval -> {:ok, interval}
+    end
+  end
+
+  defp fetch_interval(fee_type_id) do
+    case Ash.get(MembershipFeeType, fee_type_id, authorize?: false) do
+      {:ok, %{interval: interval}} -> {:ok, interval}
+      _ -> :error
+    end
+  end
+end
diff --git a/lib/mv/membership_fees/cycle_generator.ex b/lib/mv/membership_fees/cycle_generator.ex
index a6c2d300..8bd76d5e 100644
--- a/lib/mv/membership_fees/cycle_generator.ex
+++ b/lib/mv/membership_fees/cycle_generator.ex
@@ -305,7 +305,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     # Only generate if start_date <= end_date
     if start_date && Date.compare(start_date, end_date) != :gt do
       cycle_starts = generate_cycle_starts(start_date, end_date, interval)
-      create_cycles(cycle_starts, member.id, fee_type.id, amount, opts)
+      create_cycles(cycle_starts, member.id, fee_type.id, amount, interval, opts)
     else
       {:ok, [], []}
     end
@@ -400,7 +400,7 @@ defmodule Mv.MembershipFees.CycleGenerator do
     end
   end
 
-  defp create_cycles(cycle_starts, member_id, fee_type_id, amount, opts) do
+  defp create_cycles(cycle_starts, member_id, fee_type_id, amount, interval, opts) do
     actor = get_actor(opts)
     create_opts = Helpers.ash_actor_opts(actor)
 
@@ -414,7 +414,10 @@ defmodule Mv.MembershipFees.CycleGenerator do
           member_id: member_id,
           membership_fee_type_id: fee_type_id,
           amount: amount,
-          status: :unpaid
+          status: :unpaid,
+          # Pass the already-resolved interval so SetCycleEnd does not re-fetch the
+          # fee type for every cycle in the batch (avoids an N+1 lookup).
+          interval: interval
         }
 
         handle_cycle_creation_result(
diff --git a/priv/repo/migrations/20260630163238_add_cycle_end_to_membership_fee_cycles.exs b/priv/repo/migrations/20260630163238_add_cycle_end_to_membership_fee_cycles.exs
new file mode 100644
index 00000000..5cabc9a5
--- /dev/null
+++ b/priv/repo/migrations/20260630163238_add_cycle_end_to_membership_fee_cycles.exs
@@ -0,0 +1,32 @@
+defmodule Mv.Repo.Migrations.AddCycleEndToMembershipFeeCycles do
+  @moduledoc """
+  Adds the denormalized `cycle_end` column to `membership_fee_cycles`.
+
+  The column is added nullable, backfilled from `cycle_start + interval` for every
+  existing row (via `Mv.MembershipFees.CycleEndBackfill`), and only then made
+  `NOT NULL`. Going forward the column is populated at create time by the
+  `SetCycleEnd` change.
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:membership_fee_cycles) do
+      add :cycle_end, :date
+    end
+
+    flush()
+
+    {:ok, _count} = Mv.MembershipFees.CycleEndBackfill.run()
+
+    alter table(:membership_fee_cycles) do
+      modify :cycle_end, :date, null: false
+    end
+  end
+
+  def down do
+    alter table(:membership_fee_cycles) do
+      remove :cycle_end
+    end
+  end
+end
diff --git a/priv/resource_snapshots/repo/membership_fee_cycles/20260630163240.json b/priv/resource_snapshots/repo/membership_fee_cycles/20260630163240.json
new file mode 100644
index 00000000..e2646f6e
--- /dev/null
+++ b/priv/resource_snapshots/repo/membership_fee_cycles/20260630163240.json
@@ -0,0 +1,173 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"uuid_generate_v7()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "cycle_start",
+      "type": "date"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "cycle_end",
+      "type": "date"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": 2,
+      "size": null,
+      "source": "amount",
+      "type": "decimal"
+    },
+    {
+      "allow_nil?": false,
+      "default": "\"unpaid\"",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "status",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "notes",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "membership_fee_cycles_member_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "membership_fee_cycles_membership_fee_type_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "membership_fee_types"
+      },
+      "scale": null,
+      "size": null,
+      "source": "membership_fee_type_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "create_table_options": null,
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "455B6D49C804301DF13F950318644BF28B491535A94F4ABF7805AA1A53287401",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "membership_fee_cycles_unique_cycle_per_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        },
+        {
+          "type": "atom",
+          "value": "cycle_start"
+        }
+      ],
+      "name": "unique_cycle_per_member",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "membership_fee_cycles"
+}
\ No newline at end of file
diff --git a/test/membership_fees/cycle_end_test.exs b/test/membership_fees/cycle_end_test.exs
new file mode 100644
index 00000000..23e6ed59
--- /dev/null
+++ b/test/membership_fees/cycle_end_test.exs
@@ -0,0 +1,98 @@
+defmodule Mv.MembershipFees.CycleEndTest do
+  @moduledoc """
+  Tests for the denormalized `cycle_end` column on membership fee cycles:
+  the create-time change that sets it, and the one-time backfill helper.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2]
+
+  alias Mv.MembershipFees.CalendarCycles
+  alias Mv.MembershipFees.CycleEndBackfill
+  alias Mv.MembershipFees.MembershipFeeCycle
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  defp create_member(fee_type, actor) do
+    member_fixture_with_actor(%{membership_fee_type_id: fee_type.id}, actor)
+  end
+
+  describe "create sets cycle_end" do
+    for interval <- [:monthly, :quarterly, :half_yearly, :yearly] do
+      test "create sets cycle_end from cycle_start + #{interval} interval", %{actor: actor} do
+        interval = unquote(interval)
+        fee_type = create_fee_type(%{interval: interval}, actor)
+        member = create_member(fee_type, actor)
+        cycle_start = ~D[2024-02-01]
+
+        cycle =
+          MembershipFeeCycle
+          |> Ash.Changeset.for_create(:create, %{
+            cycle_start: cycle_start,
+            amount: Decimal.new("50.00"),
+            member_id: member.id,
+            membership_fee_type_id: fee_type.id
+          })
+          |> Ash.create!(actor: actor)
+
+        assert cycle.cycle_end == CalendarCycles.calculate_cycle_end(cycle_start, interval)
+      end
+    end
+  end
+
+  describe "create with interval argument" do
+    test "uses the passed interval and skips the fee-type lookup", %{actor: actor} do
+      # Fee type carries :yearly, but the caller passes :monthly explicitly.
+      # If the interval argument is honored (no per-row fee-type lookup), the
+      # stored cycle_end reflects the argument, not the fee type's interval.
+      fee_type = create_fee_type(%{interval: :yearly}, actor)
+      member = create_member(fee_type, actor)
+      cycle_start = ~D[2024-02-01]
+
+      cycle =
+        MembershipFeeCycle
+        |> Ash.Changeset.for_create(:create, %{
+          cycle_start: cycle_start,
+          amount: Decimal.new("50.00"),
+          member_id: member.id,
+          membership_fee_type_id: fee_type.id,
+          interval: :monthly
+        })
+        |> Ash.create!(actor: actor)
+
+      assert cycle.cycle_end == CalendarCycles.calculate_cycle_end(cycle_start, :monthly)
+    end
+  end
+
+  describe "backfill" do
+    test "fills cycle_end for pre-existing rows matching calculate_cycle_end/2", %{actor: actor} do
+      fee_type = create_fee_type(%{interval: :quarterly}, actor)
+      member = create_member(fee_type, actor)
+
+      cycle =
+        MembershipFeeCycle
+        |> Ash.Changeset.for_create(:create, %{
+          cycle_start: ~D[2024-04-01],
+          amount: Decimal.new("50.00"),
+          member_id: member.id,
+          membership_fee_type_id: fee_type.id
+        })
+        |> Ash.create!(actor: actor)
+
+      # Simulate a pre-existing row that predates the cycle_end column.
+      Repo.query!("ALTER TABLE membership_fee_cycles ALTER COLUMN cycle_end DROP NOT NULL")
+
+      Repo.query!("UPDATE membership_fee_cycles SET cycle_end = NULL WHERE id = $1", [
+        Ecto.UUID.dump!(cycle.id)
+      ])
+
+      assert {:ok, count} = CycleEndBackfill.run()
+      assert count >= 1
+
+      reloaded = Ash.get!(MembershipFeeCycle, cycle.id, actor: actor)
+      assert reloaded.cycle_end == CalendarCycles.calculate_cycle_end(~D[2024-04-01], :quarterly)
+    end
+  end
+end

From e64f55c36a68fc0bdead9c67d184d7efdc8e0833 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 3 Jul 2026 11:12:38 +0200
Subject: [PATCH 03/30] feat(member): back the overview with a keyset-paginated
 :overview read action

---
 lib/membership/member.ex                      |  75 +++--
 lib/membership/membership.ex                  |   1 +
 .../live/member_live/index/overview_query.ex  | 261 ++++++++++++++++++
 .../member_live/index/overview_query_test.exs | 135 +++++++++
 .../index_cycle_status_filter_test.exs        |  78 ++++++
 .../index_keyset_property_test.exs            |  86 ++++++
 6 files changed, 615 insertions(+), 21 deletions(-)
 create mode 100644 lib/mv_web/live/member_live/index/overview_query.ex
 create mode 100644 test/mv_web/live/member_live/index/overview_query_test.exs
 create mode 100644 test/mv_web/member_live/index_cycle_status_filter_test.exs
 create mode 100644 test/mv_web/member_live/index_keyset_property_test.exs

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 0f67a00d..f57c32a5 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -266,6 +266,15 @@ defmodule Mv.Membership.Member do
       accept [:vereinfacht_contact_id]
     end
 
+    # Keyset-paginated read for the member overview. Filters and sort are
+    # composed onto the query by `MvWeb.MemberLive.Index.OverviewQuery`; this
+    # action only enables keyset pagination with a unique `id` tie-breaker so
+    # pages never skip or duplicate rows.
+    read :overview do
+      description "Keyset-paginated member overview read"
+      pagination keyset?: true, default_limit: 50, required?: false
+    end
+
     # Action to handle fuzzy search on specific fields
     read :search do
       argument :query, :string, allow_nil?: true
@@ -279,27 +288,7 @@ defmodule Mv.Membership.Member do
         threshold =
           Ash.Query.get_argument(query, :similarity_threshold) || @default_similarity_threshold
 
-        if is_binary(q) and String.trim(q) != "" do
-          q2 = String.trim(q)
-          # Sanitize for LIKE patterns (escape % and _), limit length to 100 chars
-          q2_sanitized = sanitize_search_query(q2)
-          pat = "%" <> q2_sanitized <> "%"
-
-          # Build search filters grouped by search type for maintainability
-          # Priority: FTS > Substring > Custom Fields > Fuzzy Matching
-          # Note: FTS and fuzzy use q2 (unsanitized), LIKE-based filters use pat (sanitized)
-          fts_match = build_fts_filter(q2)
-          substring_match = build_substring_filter(q2_sanitized, pat)
-          custom_field_match = build_custom_field_filter(pat)
-          fuzzy_match = build_fuzzy_filter(q2, threshold)
-
-          query
-          |> Ash.Query.filter(
-            expr(^fts_match or ^substring_match or ^custom_field_match or ^fuzzy_match)
-          )
-        else
-          query
-        end
+        apply_fuzzy_search_filter(query, q, threshold)
       end
     end
 
@@ -738,6 +727,13 @@ defmodule Mv.Membership.Member do
     end
   end
 
+  aggregates do
+    # Alphabetically-first group name, used to sort the overview by group DB-side.
+    # Mirrors the previous in-memory "first group name" sort key; members with no
+    # groups yield nil (sorted last ascending via NULLS LAST).
+    min :first_group_name, :groups, :name
+  end
+
   # Define identities for upsert operations
   identities do
     identity :unique_email, [:email]
@@ -1212,6 +1208,43 @@ defmodule Mv.Membership.Member do
     end
   end
 
+  @doc """
+  Applies the same fuzzy/full-text search filter as the `:search` action as a
+  plain filter on the given query, without switching the query's read action.
+
+  Used by the overview query builder so search composes with the `:overview`
+  keyset-paginated read action instead of replacing it.
+  """
+  @spec apply_overview_search(Ash.Query.t(), String.t() | nil) :: Ash.Query.t()
+  def apply_overview_search(query, q) do
+    apply_fuzzy_search_filter(query, q || "", @default_similarity_threshold)
+  end
+
+  # Shared by the `:search` action and `apply_overview_search/2`.
+  defp apply_fuzzy_search_filter(query, q, threshold) do
+    if is_binary(q) and String.trim(q) != "" do
+      q2 = String.trim(q)
+      # Sanitize for LIKE patterns (escape % and _), limit length to 100 chars
+      q2_sanitized = sanitize_search_query(q2)
+      pat = "%" <> q2_sanitized <> "%"
+
+      # Build search filters grouped by search type for maintainability
+      # Priority: FTS > Substring > Custom Fields > Fuzzy Matching
+      # Note: FTS and fuzzy use q2 (unsanitized), LIKE-based filters use pat (sanitized)
+      fts_match = build_fts_filter(q2)
+      substring_match = build_substring_filter(q2_sanitized, pat)
+      custom_field_match = build_custom_field_filter(pat)
+      fuzzy_match = build_fuzzy_filter(q2, threshold)
+
+      Ash.Query.filter(
+        query,
+        expr(^fts_match or ^substring_match or ^custom_field_match or ^fuzzy_match)
+      )
+    else
+      query
+    end
+  end
+
   # ============================================================================
   # Search Input Sanitization
   # ============================================================================
diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex
index 2a5b17fb..b7c5974d 100644
--- a/lib/membership/membership.ex
+++ b/lib/membership/membership.ex
@@ -45,6 +45,7 @@ defmodule Mv.Membership do
     resource Mv.Membership.Member do
       define :create_member, action: :create_member
       define :list_members, action: :read
+      define :overview_members, action: :overview
       define :update_member, action: :update_member
       define :destroy_member, action: :destroy
     end
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
new file mode 100644
index 00000000..93882d4d
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -0,0 +1,261 @@
+defmodule MvWeb.MemberLive.Index.OverviewQuery do
+  @moduledoc """
+  Builds the Ash query for the member overview from the LiveView's filter/sort
+  state, so every filter and sort resolves in PostgreSQL via the `:overview`
+  keyset-paginated read action.
+
+  All previously in-memory passes (cycle status, boolean/date custom fields,
+  group sort) are expressed here as DB filters/sorts. A unique `id` tie-breaker
+  is always appended to the sort so keyset pages never skip or duplicate rows.
+
+  `build/1` returns an unread `Ash.Query`; the caller supplies `page:`/`actor:`
+  options to `Ash.read/2`.
+  """
+
+  import Ash.Expr
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.DateFilter
+
+  require Ash.Query
+
+  @type opts :: %{optional(atom()) => term()}
+
+  @doc """
+  Builds the `:overview` query from the given filter/sort options.
+
+  Recognised keys (all optional):
+
+    * `:search` — full-text search string
+    * `:group_filters` / `:groups` — `%{group_id => :in | :not_in}` and the valid groups
+    * `:fee_type_filters` / `:fee_types` — `%{fee_type_id => :in | :not_in}` and valid fee types
+    * `:date_filters` — built-in join/exit date filter map (see `DateFilter`)
+    * `:sort_field` / `:sort_order` — sort key and direction
+    * `:today` — reference date for cycle math (defaults to `Date.utc_today/0`)
+  """
+  @spec build(opts()) :: Ash.Query.t()
+  def build(opts \\ %{}) do
+    Member
+    |> Ash.Query.for_read(:overview)
+    |> apply_search(opts[:search])
+    |> apply_group_filters(opts[:group_filters], opts[:groups])
+    |> apply_fee_type_filters(opts[:fee_type_filters], opts[:fee_types])
+    |> apply_date_filters(opts[:date_filters])
+    |> apply_cycle_status_filter(
+      opts[:cycle_status_filter],
+      opts[:show_current_cycle],
+      today(opts)
+    )
+    |> apply_sort(opts[:sort_field], opts[:sort_order])
+  end
+
+  defp today(opts), do: opts[:today] || Date.utc_today()
+
+  # ---------------------------------------------------------------------------
+  # Search
+  # ---------------------------------------------------------------------------
+
+  defp apply_search(query, search) when is_binary(search),
+    do: Member.apply_overview_search(query, search)
+
+  defp apply_search(query, _), do: query
+
+  # ---------------------------------------------------------------------------
+  # Group filters (AND across selected groups)
+  # ---------------------------------------------------------------------------
+
+  defp apply_group_filters(query, group_filters, _groups)
+       when group_filters in [nil, %{}],
+       do: query
+
+  defp apply_group_filters(query, group_filters, groups) do
+    valid_ids = valid_id_set(groups)
+
+    Enum.reduce(group_filters, query, fn {group_id_str, value}, q ->
+      if MapSet.member?(valid_ids, group_id_str) do
+        apply_one_group_filter(q, group_id_str, value)
+      else
+        q
+      end
+    end)
+  end
+
+  defp apply_one_group_filter(query, group_id_str, :in) do
+    case Ecto.UUID.cast(group_id_str) do
+      {:ok, uuid} -> Ash.Query.filter(query, expr(exists(member_groups, group_id == ^uuid)))
+      _ -> query
+    end
+  end
+
+  defp apply_one_group_filter(query, group_id_str, :not_in) do
+    case Ecto.UUID.cast(group_id_str) do
+      {:ok, uuid} -> Ash.Query.filter(query, expr(not exists(member_groups, group_id == ^uuid)))
+      _ -> query
+    end
+  end
+
+  defp apply_one_group_filter(query, _id, _value), do: query
+
+  # ---------------------------------------------------------------------------
+  # Fee-type filters (:in OR; :not_in AND)
+  # ---------------------------------------------------------------------------
+
+  defp apply_fee_type_filters(query, fee_type_filters, _fee_types)
+       when fee_type_filters in [nil, %{}],
+       do: query
+
+  defp apply_fee_type_filters(query, fee_type_filters, fee_types) do
+    valid_ids = valid_id_set(fee_types)
+
+    {in_filters, not_in_filters} =
+      fee_type_filters
+      |> Enum.filter(fn {id_str, _} -> MapSet.member?(valid_ids, id_str) end)
+      |> Enum.split_with(fn {_, value} -> value == :in end)
+
+    in_uuids = cast_uuids(Enum.map(in_filters, fn {id_str, _} -> id_str end))
+
+    query =
+      if in_uuids == [] do
+        query
+      else
+        Ash.Query.filter(query, expr(membership_fee_type_id in ^in_uuids))
+      end
+
+    Enum.reduce(not_in_filters, query, fn {id_str, _}, q ->
+      case Ecto.UUID.cast(id_str) do
+        {:ok, uuid} ->
+          Ash.Query.filter(
+            q,
+            expr(membership_fee_type_id != ^uuid or is_nil(membership_fee_type_id))
+          )
+
+        _ ->
+          q
+      end
+    end)
+  end
+
+  # ---------------------------------------------------------------------------
+  # Cycle-status filter (paid/unpaid, current or last-completed cycle)
+  #
+  # Backed by the DB cycle-status aggregates (denormalized `cycle_end`). A member
+  # matches only when its selected-cycle status equals the requested status;
+  # members with no matching cycle (nil aggregate) are excluded — exactly as the
+  # previous in-memory classifier behaved.
+  # ---------------------------------------------------------------------------
+
+  defp apply_cycle_status_filter(query, status, _show_current, _today)
+       when status not in [:paid, :unpaid],
+       do: query
+
+  defp apply_cycle_status_filter(query, status, true = _show_current, today) do
+    # Current cycle: contains today; when several would, the one with the latest
+    # cycle_start wins. Keep members whose winning current cycle has `status`.
+    Ash.Query.filter(
+      query,
+      expr(
+        exists(
+          membership_fee_cycles,
+          cycle_start <= ^today and cycle_end >= ^today and status == ^status and
+            not exists(
+              member.membership_fee_cycles,
+              cycle_start <= ^today and cycle_end >= ^today and
+                cycle_start > parent(cycle_start)
+            )
+        )
+      )
+    )
+  end
+
+  defp apply_cycle_status_filter(query, status, _show_current, today) do
+    # Last completed cycle: most recent cycle that has ended (cycle_end < today).
+    Ash.Query.filter(
+      query,
+      expr(
+        exists(
+          membership_fee_cycles,
+          cycle_end < ^today and status == ^status and
+            not exists(
+              member.membership_fee_cycles,
+              cycle_end < ^today and cycle_start > parent(cycle_start)
+            )
+        )
+      )
+    )
+  end
+
+  # ---------------------------------------------------------------------------
+  # Built-in date filters (join/exit)
+  # ---------------------------------------------------------------------------
+
+  defp apply_date_filters(query, nil), do: query
+
+  defp apply_date_filters(query, filters) when is_map(filters),
+    do: DateFilter.apply_ash_filter(query, filters)
+
+  # ---------------------------------------------------------------------------
+  # Sort (always append the unique id tie-breaker for keyset stability)
+  # ---------------------------------------------------------------------------
+
+  defp apply_sort(query, nil, _order), do: Ash.Query.sort(query, id: :asc)
+  defp apply_sort(query, _field, nil), do: Ash.Query.sort(query, id: :asc)
+
+  defp apply_sort(query, field, order) do
+    case sort_key(field) do
+      nil -> Ash.Query.sort(query, id: :asc)
+      key -> Ash.Query.sort(query, [{key, order}, {:id, :asc}])
+    end
+  end
+
+  # Resolves a sort field (atom or string) to a DB sort key, or nil if it is a
+  # computed field handled elsewhere / not sortable.
+  defp sort_key(field) when field in [:membership_fee_type, "membership_fee_type"],
+    do: "membership_fee_type.name"
+
+  defp sort_key(field) when field in [:groups, "groups"], do: :first_group_name
+
+  defp sort_key(field) when is_atom(field) do
+    if field in member_sort_fields(), do: field, else: nil
+  end
+
+  defp sort_key(field) when is_binary(field) do
+    allowed = MapSet.new(member_sort_fields(), &Atom.to_string/1)
+    if MapSet.member?(allowed, field), do: String.to_existing_atom(field), else: nil
+  end
+
+  defp sort_key(_), do: nil
+
+  defp member_sort_fields do
+    Mv.Constants.member_fields() -- [:notes]
+  end
+
+  # ---------------------------------------------------------------------------
+  # Helpers
+  # ---------------------------------------------------------------------------
+
+  defp valid_id_set(records) when is_list(records) do
+    records
+    |> Enum.map(&to_string(&1.id))
+    |> Enum.map(&normalize_uuid/1)
+    |> Enum.reject(&is_nil/1)
+    |> MapSet.new()
+  end
+
+  defp valid_id_set(_), do: MapSet.new()
+
+  defp normalize_uuid(raw) when is_binary(raw) do
+    case Ecto.UUID.cast(String.trim(raw)) do
+      {:ok, uuid} -> to_string(uuid)
+      _ -> nil
+    end
+  end
+
+  defp normalize_uuid(_), do: nil
+
+  defp cast_uuids(id_strs) do
+    id_strs
+    |> Enum.map(&Ecto.UUID.cast/1)
+    |> Enum.filter(&match?({:ok, _}, &1))
+    |> Enum.map(fn {:ok, uuid} -> uuid end)
+  end
+end
diff --git a/test/mv_web/live/member_live/index/overview_query_test.exs b/test/mv_web/live/member_live/index/overview_query_test.exs
new file mode 100644
index 00000000..c8ec3fdc
--- /dev/null
+++ b/test/mv_web/live/member_live/index/overview_query_test.exs
@@ -0,0 +1,135 @@
+defmodule MvWeb.MemberLive.Index.OverviewQueryTest do
+  @moduledoc """
+  Resource-level tests for the DB-backed overview query builder: keyset
+  pagination and the standard DB filters/sort pushed down from the LiveView.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures,
+    only: [member_fixture_with_actor: 2, create_fee_type: 2, group_fixture: 1]
+
+  alias Mv.Membership
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  defp ids(results), do: Enum.map(results, & &1.id) |> MapSet.new()
+
+  defp read_all_pages(query, actor, limit) do
+    page = Ash.read!(query, page: [limit: limit], actor: actor)
+    collect_pages(page, [page.results])
+  end
+
+  defp collect_pages(%{more?: true} = page, acc) do
+    next = Ash.page!(page, :next)
+    collect_pages(next, [next.results | acc])
+  end
+
+  defp collect_pages(_page, acc), do: acc |> Enum.reverse() |> List.flatten()
+
+  describe "keyset pagination" do
+    test "concatenated pages cover the full set once with no duplicates", %{actor: actor} do
+      members =
+        for _ <- 1..5, do: member_fixture_with_actor(%{}, actor)
+
+      expected = ids(members)
+
+      query = OverviewQuery.build(%{sort_field: :inserted_at, sort_order: :asc})
+      all = read_all_pages(query, actor, 2)
+
+      assert ids(all) == expected
+      assert length(all) == length(Enum.uniq_by(all, & &1.id))
+    end
+  end
+
+  describe "DB filters" do
+    test "search matches name DB-side", %{actor: actor} do
+      hit = member_fixture_with_actor(%{first_name: "Zorblax", last_name: "Quux"}, actor)
+      _miss = member_fixture_with_actor(%{first_name: "Otto", last_name: "Normal"}, actor)
+
+      results =
+        OverviewQuery.build(%{search: "Zorblax"})
+        |> Ash.read!(actor: actor)
+
+      assert hit.id in Enum.map(results, & &1.id)
+      refute Enum.any?(results, &(&1.first_name == "Otto"))
+    end
+
+    test "group :in and :not_in resolve DB-side", %{actor: actor} do
+      group = group_fixture(%{name: "Board #{System.unique_integer([:positive])}"})
+      in_member = member_fixture_with_actor(%{}, actor)
+      out_member = member_fixture_with_actor(%{}, actor)
+
+      {:ok, _} =
+        Membership.create_member_group(%{member_id: in_member.id, group_id: group.id},
+          actor: actor
+        )
+
+      opts = %{group_filters: %{to_string(group.id) => :in}, groups: [group]}
+      in_ids = OverviewQuery.build(opts) |> Ash.read!(actor: actor) |> Enum.map(& &1.id)
+      assert in_member.id in in_ids
+      refute out_member.id in in_ids
+
+      not_opts = %{group_filters: %{to_string(group.id) => :not_in}, groups: [group]}
+      out_ids = OverviewQuery.build(not_opts) |> Ash.read!(actor: actor) |> Enum.map(& &1.id)
+      refute in_member.id in out_ids
+      assert out_member.id in out_ids
+    end
+
+    test "fee-type :in resolves DB-side", %{actor: actor} do
+      ft = create_fee_type(%{}, actor)
+      with_ft = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
+      without_ft = member_fixture_with_actor(%{}, actor)
+
+      opts = %{fee_type_filters: %{to_string(ft.id) => :in}, fee_types: [ft]}
+      result_ids = OverviewQuery.build(opts) |> Ash.read!(actor: actor) |> Enum.map(& &1.id)
+
+      assert with_ft.id in result_ids
+      refute without_ft.id in result_ids
+    end
+  end
+
+  describe "group sort (DB aggregate)" do
+    test "sorts by first group name DB-side, members with groups before those without", %{
+      actor: actor
+    } do
+      g_a = group_fixture(%{name: "AAA #{System.unique_integer([:positive])}"})
+      g_z = group_fixture(%{name: "ZZZ #{System.unique_integer([:positive])}"})
+
+      m_a = member_fixture_with_actor(%{}, actor)
+      m_z = member_fixture_with_actor(%{}, actor)
+      m_none = member_fixture_with_actor(%{}, actor)
+
+      {:ok, _} =
+        Membership.create_member_group(%{member_id: m_a.id, group_id: g_a.id}, actor: actor)
+
+      {:ok, _} =
+        Membership.create_member_group(%{member_id: m_z.id, group_id: g_z.id}, actor: actor)
+
+      asc =
+        OverviewQuery.build(%{sort_field: :groups, sort_order: :asc})
+        |> Ash.read!(actor: actor)
+        |> Enum.map(& &1.id)
+        |> Enum.filter(&(&1 in [m_a.id, m_z.id, m_none.id]))
+
+      # group members first (AAA before ZZZ), member without groups last
+      assert asc == [m_a.id, m_z.id, m_none.id]
+    end
+  end
+
+  describe "sort" do
+    test "sort by last_name is deterministic with id tie-breaker", %{actor: actor} do
+      a = member_fixture_with_actor(%{last_name: "Same"}, actor)
+      b = member_fixture_with_actor(%{last_name: "Same"}, actor)
+
+      results =
+        OverviewQuery.build(%{sort_field: :last_name, sort_order: :asc})
+        |> Ash.read!(actor: actor)
+
+      ordered = results |> Enum.filter(&(&1.id in [a.id, b.id])) |> Enum.map(& &1.id)
+      assert ordered == Enum.sort([a.id, b.id])
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_cycle_status_filter_test.exs b/test/mv_web/member_live/index_cycle_status_filter_test.exs
new file mode 100644
index 00000000..f6bb4467
--- /dev/null
+++ b/test/mv_web/member_live/index_cycle_status_filter_test.exs
@@ -0,0 +1,78 @@
+defmodule MvWeb.MemberLive.IndexCycleStatusFilterTest do
+  @moduledoc """
+  §1.13 — the paid/unpaid cycle-status filter, under the current or last-completed
+  cycle view, returns the same members as the previous in-memory classifier,
+  computed DB-side via the `cycle_end`-backed aggregates.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.MembershipFeeStatus
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  @today ~D[2024-07-15]
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    ft = create_fee_type(%{interval: :yearly}, actor)
+
+    # current 2024 paid, last-completed 2023 unpaid
+    paid_now = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
+    create_cycle(paid_now, ft, %{cycle_start: ~D[2024-01-01], status: :paid}, actor)
+    create_cycle(paid_now, ft, %{cycle_start: ~D[2023-01-01], status: :unpaid}, actor)
+
+    # current 2024 unpaid, last-completed 2023 paid
+    unpaid_now = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
+    create_cycle(unpaid_now, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
+    create_cycle(unpaid_now, ft, %{cycle_start: ~D[2023-01-01], status: :paid}, actor)
+
+    # no cycles
+    _no_cycles = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
+
+    %{actor: actor, paid_now: paid_now, unpaid_now: unpaid_now}
+  end
+
+  defp db_ids(status, show_current, actor) do
+    OverviewQuery.build(%{
+      cycle_status_filter: status,
+      show_current_cycle: show_current,
+      today: @today
+    })
+    |> Ash.read!(actor: actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  defp oracle_ids(status, show_current, actor) do
+    Member
+    |> Ash.Query.load(membership_fee_cycles: [:membership_fee_type])
+    |> Ash.Query.load(:membership_fee_type)
+    |> Ash.read!(actor: actor)
+    |> Enum.filter(fn m ->
+      MembershipFeeStatus.get_cycle_status_for_member(m, show_current, @today) == status
+    end)
+    |> MapSet.new(& &1.id)
+  end
+
+  # {status, show_current, member-key expected in the result}
+  @cases [
+    {:paid, true, :paid_now},
+    {:unpaid, true, :unpaid_now},
+    {:paid, false, :unpaid_now},
+    {:unpaid, false, :paid_now}
+  ]
+
+  for {status, show_current, expected_key} <- @cases do
+    test "#{status} under #{if show_current, do: "current", else: "last"} cycle matches oracle",
+         %{actor: actor} = ctx do
+      status = unquote(status)
+      show_current = unquote(show_current)
+      expected = Map.fetch!(ctx, unquote(expected_key))
+
+      db = db_ids(status, show_current, actor)
+      assert db == oracle_ids(status, show_current, actor)
+      assert expected.id in db
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_keyset_property_test.exs b/test/mv_web/member_live/index_keyset_property_test.exs
new file mode 100644
index 00000000..aaaa43b8
--- /dev/null
+++ b/test/mv_web/member_live/index_keyset_property_test.exs
@@ -0,0 +1,86 @@
+defmodule MvWeb.MemberLive.IndexKeysetPropertyTest do
+  @moduledoc """
+  §2.2 — Keyset pagination completeness: concatenating every keyset page yields
+  exactly the full filtered set once each (no duplicates, no gaps) in a stable
+  total order.
+
+  §2.3 — Sort determinism with the unique `id` tie-breaker: members equal on the
+  sort key are ordered by `id`, and the result set equals the unsorted set.
+  """
+  use Mv.DataCase, async: false
+  use ExUnitProperties
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2]
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  defp clear_members(actor) do
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+  end
+
+  defp read_all_pages(query, actor, limit) do
+    page = Ash.read!(query, page: [limit: limit], actor: actor)
+    collect(page, page.results)
+  end
+
+  defp collect(%{more?: true} = page, acc) do
+    next = Ash.page!(page, :next)
+    collect(next, acc ++ next.results)
+  end
+
+  defp collect(_page, acc), do: acc
+
+  property "keyset pages cover the full set once, no dupes or gaps", %{actor: actor} do
+    check all(
+            n <- integer(1..12),
+            limit <- integer(1..5),
+            sort <- member_of([:last_name, :join_date, :inserted_at]),
+            order <- member_of([:asc, :desc]),
+            max_runs: 25
+          ) do
+      clear_members(actor)
+      # Deliberate ties on last_name so the tie-breaker is exercised.
+      members =
+        for i <- 1..n do
+          member_fixture_with_actor(%{last_name: "Tie#{rem(i, 3)}"}, actor)
+        end
+
+      expected = MapSet.new(members, & &1.id)
+
+      query = OverviewQuery.build(%{sort_field: sort, sort_order: order})
+      paged = read_all_pages(query, actor, limit)
+      paged_ids = Enum.map(paged, & &1.id)
+
+      assert MapSet.new(paged_ids) == expected
+      assert length(paged_ids) == MapSet.size(expected)
+    end
+  end
+
+  property "sort with ties is a deterministic total order broken by id", %{actor: actor} do
+    check all(
+            n <- integer(2..10),
+            order <- member_of([:asc, :desc]),
+            max_runs: 25
+          ) do
+      clear_members(actor)
+
+      members =
+        for _ <- 1..n do
+          member_fixture_with_actor(%{last_name: "Same"}, actor)
+        end
+
+      ordered =
+        OverviewQuery.build(%{sort_field: :last_name, sort_order: order})
+        |> Ash.read!(actor: actor)
+        |> Enum.map(& &1.id)
+
+      # All last_names equal -> order is fully determined by the id tie-breaker (asc).
+      assert ordered == Enum.sort(Enum.map(members, & &1.id))
+    end
+  end
+end

From b09cdf7f3ad859c491d8875a1bb211210c895e40 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 3 Jul 2026 11:19:59 +0200
Subject: [PATCH 04/30] feat(member): resolve custom-field filters and sorting
 in PostgreSQL

Push the boolean and date custom-field predicates and custom-field
sorting down to JSONB expressions so the overview stops classifying
custom-field values in memory. A GIN index on custom_field_values.value
keeps the boolean membership predicates index-served.
---
 lib/membership/custom_field_value.ex          |  17 ++
 .../live/member_live/index/date_filter.ex     |  48 ++++
 .../live/member_live/index/overview_query.ex  | 137 +++++++++-
 ...dd_custom_field_values_value_gin_index.exs |  21 ++
 .../custom_field_values/20260630170638.json   | 148 +++++++++++
 ...index_boolean_custom_field_filter_test.exs |  83 ++++++
 .../index_date_custom_field_filter_test.exs   |  91 +++++++
 .../index_filter_parity_property_test.exs     | 245 ++++++++++++++++++
 .../index_overview_query_sort_test.exs        |  98 +++++++
 9 files changed, 883 insertions(+), 5 deletions(-)
 create mode 100644 priv/repo/migrations/20260630170637_add_custom_field_values_value_gin_index.exs
 create mode 100644 priv/resource_snapshots/repo/custom_field_values/20260630170638.json
 create mode 100644 test/mv_web/member_live/index_boolean_custom_field_filter_test.exs
 create mode 100644 test/mv_web/member_live/index_date_custom_field_filter_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_parity_property_test.exs
 create mode 100644 test/mv_web/member_live/index_overview_query_sort_test.exs

diff --git a/lib/membership/custom_field_value.ex b/lib/membership/custom_field_value.ex
index 623455d6..91404aad 100644
--- a/lib/membership/custom_field_value.ex
+++ b/lib/membership/custom_field_value.ex
@@ -48,6 +48,13 @@ defmodule Mv.Membership.CustomFieldValue do
     table "custom_field_values"
     repo Mv.Repo
 
+    custom_indexes do
+      # GIN index on the JSONB value to serve boolean custom-field containment
+      # predicates (`value @> '{"value": <bool>}'`) used by the member overview.
+      # Default jsonb_ops supports the `@>` operator we rely on.
+      index ["value"], name: "custom_field_values_value_gin_index", using: "gin"
+    end
+
     references do
       reference :member, on_delete: :delete
       reference :custom_field, on_delete: :delete
@@ -133,6 +140,16 @@ defmodule Mv.Membership.CustomFieldValue do
 
   calculations do
     calculate :value_to_string, :string, expr(value[:value] <> "")
+
+    # Typed sort keys for DB-side ordering of the member overview by a custom
+    # field. The stored JSONB value (`{"type": ..., "value": ...}`) is cast per
+    # the field's value type so integers sort numerically and dates
+    # chronologically. Empty strings collapse to NULL so they sort last, matching
+    # the previous in-memory `CustomFieldSort` behaviour.
+    calculate :sort_text, :string, expr(fragment("nullif(?->>'value','')", value))
+    calculate :sort_numeric, :decimal, expr(fragment("nullif(?->>'value','')::numeric", value))
+    calculate :sort_date, :date, expr(fragment("nullif(?->>'value','')::date", value))
+    calculate :sort_boolean, :boolean, expr(fragment("nullif(?->>'value','')::boolean", value))
   end
 
   # Ensure a member can only have one custom field value per custom field
diff --git a/lib/mv_web/live/member_live/index/date_filter.ex b/lib/mv_web/live/member_live/index/date_filter.ex
index 14d1aef0..b24c2f49 100644
--- a/lib/mv_web/live/member_live/index/date_filter.ex
+++ b/lib/mv_web/live/member_live/index/date_filter.ex
@@ -271,6 +271,54 @@ defmodule MvWeb.MemberLive.Index.DateFilter do
     end
   end
 
+  @doc """
+  DB-side equivalent of the custom-date portion of `apply_in_memory/3`.
+
+  For each active custom-date filter, adds a predicate keeping members that have
+  a stored date value for the field within the inclusive `[from, to]` bounds.
+  The value is read from the JSONB union (`value->>'type' = 'date'`, then
+  `(value->>'value')::date`). Members without a date value row for the field are
+  excluded, mirroring the in-memory behaviour exactly.
+  """
+  @spec apply_custom_date_ash_filter(Ash.Query.t(), map(), [map()]) :: Ash.Query.t()
+  def apply_custom_date_ash_filter(%Ash.Query{} = query, filters, date_custom_fields)
+      when is_map(filters) and is_list(date_custom_fields) do
+    filters
+    |> active_custom_date_filters(date_custom_fields)
+    |> Enum.reduce(query, fn {id, bounds}, q -> apply_one_custom_date_filter(q, id, bounds) end)
+  end
+
+  defp apply_one_custom_date_filter(query, id, %{from: from, to: to}) do
+    case Ecto.UUID.cast(id) do
+      {:ok, uuid} -> filter_custom_date(query, uuid, from, to)
+      _ -> query
+    end
+  end
+
+  defp filter_custom_date(query, uuid, from, to) do
+    Ash.Query.filter(
+      query,
+      expr(
+        exists(
+          custom_field_values,
+          custom_field_id == ^uuid and
+            fragment("?->>'type' = 'date'", value) and
+            ^custom_date_bounds(from, to)
+        )
+      )
+    )
+  end
+
+  defp custom_date_bounds(nil, to), do: expr(fragment("(?->>'value')::date <= ?", value, ^to))
+  defp custom_date_bounds(from, nil), do: expr(fragment("(?->>'value')::date >= ?", value, ^from))
+
+  defp custom_date_bounds(from, to) do
+    expr(
+      fragment("(?->>'value')::date >= ?", value, ^from) and
+        fragment("(?->>'value')::date <= ?", value, ^to)
+    )
+  end
+
   @doc """
   Returns the UUID string keys of `filters` that name an active (at-least-one-
   bound-set) custom date field. The UUID must appear in `date_custom_fields`
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index 93882d4d..bf4ef85c 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -18,6 +18,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   alias MvWeb.MemberLive.Index.DateFilter
 
   require Ash.Query
+  require Ash.Sort
 
   @type opts :: %{optional(atom()) => term()}
 
@@ -40,13 +41,18 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     |> apply_search(opts[:search])
     |> apply_group_filters(opts[:group_filters], opts[:groups])
     |> apply_fee_type_filters(opts[:fee_type_filters], opts[:fee_types])
+    |> apply_boolean_custom_field_filters(
+      opts[:boolean_custom_field_filters],
+      opts[:boolean_custom_fields]
+    )
     |> apply_date_filters(opts[:date_filters])
+    |> apply_custom_date_filters(opts[:date_filters], opts[:date_custom_fields])
     |> apply_cycle_status_filter(
       opts[:cycle_status_filter],
       opts[:show_current_cycle],
       today(opts)
     )
-    |> apply_sort(opts[:sort_field], opts[:sort_order])
+    |> apply_sort(opts[:sort_field], opts[:sort_order], opts[:custom_fields] || [])
   end
 
   defp today(opts), do: opts[:today] || Date.utc_today()
@@ -135,6 +141,48 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     end)
   end
 
+  # ---------------------------------------------------------------------------
+  # Boolean custom-field filters (AND across selected fields)
+  #
+  # Mirrors the previous in-memory behaviour: a member matches a `{field => bool}`
+  # filter only if it has a stored value row for that field whose boolean value
+  # equals `bool`. A member with no value row is excluded. Uses a JSONB
+  # containment predicate (`value @> '{"value": <bool>}'`), which the GIN index on
+  # `custom_field_values.value` can serve.
+  # ---------------------------------------------------------------------------
+
+  defp apply_boolean_custom_field_filters(query, filters, _boolean_fields)
+       when filters in [nil, %{}],
+       do: query
+
+  defp apply_boolean_custom_field_filters(query, filters, boolean_fields) do
+    valid_ids = valid_id_set(boolean_fields)
+
+    filters
+    |> Enum.filter(fn {id_str, _} -> MapSet.member?(valid_ids, id_str) end)
+    |> Enum.reduce(query, fn {id_str, bool}, q ->
+      case Ecto.UUID.cast(id_str) do
+        {:ok, uuid} -> apply_one_boolean_filter(q, uuid, bool)
+        _ -> q
+      end
+    end)
+  end
+
+  defp apply_one_boolean_filter(query, uuid, bool) when is_boolean(bool) do
+    Ash.Query.filter(
+      query,
+      expr(
+        exists(
+          custom_field_values,
+          custom_field_id == ^uuid and
+            fragment("? @> jsonb_build_object('value', ?::boolean)", value, ^bool)
+        )
+      )
+    )
+  end
+
+  defp apply_one_boolean_filter(query, _uuid, _bool), do: query
+
   # ---------------------------------------------------------------------------
   # Cycle-status filter (paid/unpaid, current or last-completed cycle)
   #
@@ -193,20 +241,99 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   defp apply_date_filters(query, filters) when is_map(filters),
     do: DateFilter.apply_ash_filter(query, filters)
 
+  defp apply_custom_date_filters(query, filters, custom_fields)
+       when is_map(filters) and is_list(custom_fields),
+       do: DateFilter.apply_custom_date_ash_filter(query, filters, custom_fields)
+
+  defp apply_custom_date_filters(query, _filters, _custom_fields), do: query
+
   # ---------------------------------------------------------------------------
   # Sort (always append the unique id tie-breaker for keyset stability)
   # ---------------------------------------------------------------------------
 
-  defp apply_sort(query, nil, _order), do: Ash.Query.sort(query, id: :asc)
-  defp apply_sort(query, _field, nil), do: Ash.Query.sort(query, id: :asc)
+  defp apply_sort(query, nil, _order, _custom_fields), do: Ash.Query.sort(query, id: :asc)
+  defp apply_sort(query, _field, nil, _custom_fields), do: Ash.Query.sort(query, id: :asc)
 
-  defp apply_sort(query, field, order) do
+  defp apply_sort(query, field, order, custom_fields) do
     case sort_key(field) do
-      nil -> Ash.Query.sort(query, id: :asc)
+      nil -> apply_custom_field_sort(query, field, order, custom_fields)
       key -> Ash.Query.sort(query, [{key, order}, {:id, :asc}])
     end
   end
 
+  # Sorts by a custom field's JSONB value DB-side. The value is read from the
+  # first matching `custom_field_values` row for the field, cast per the field's
+  # value type so integers sort numerically and dates chronologically. Empty
+  # strings and members without a value row sort last in both directions
+  # (NULLS LAST), mirroring the previous in-memory `CustomFieldSort` behaviour.
+  defp apply_custom_field_sort(query, field, order, custom_fields) do
+    with id_str when is_binary(id_str) <- custom_field_id(field),
+         %{} = cf <- Enum.find(custom_fields, &(to_string(&1.id) == id_str)) do
+      nils_order = if order == :desc, do: :desc_nils_last, else: :asc_nils_last
+
+      Ash.Query.sort(query, [
+        {custom_field_sort_calc(cf.value_type, cf.id), nils_order},
+        {:id, :asc}
+      ])
+    else
+      _ -> Ash.Query.sort(query, id: :asc)
+    end
+  end
+
+  defp custom_field_id(field) when is_atom(field), do: custom_field_id(Atom.to_string(field))
+
+  defp custom_field_id(field) when is_binary(field) do
+    case String.split(field, Mv.Constants.custom_field_prefix()) do
+      ["", id_str] -> id_str
+      _ -> nil
+    end
+  end
+
+  defp custom_field_id(_), do: nil
+
+  # Maps the field's value type to the first matching custom-field value's typed
+  # sort key (scoped to the field), backed by the `sort_*` calculations on
+  # `CustomFieldValue` (a raw fragment is not allowed as an aggregate `field:`).
+  defp custom_field_sort_calc(:integer, id),
+    do:
+      Ash.Sort.expr_sort(
+        first(custom_field_values,
+          field: :sort_numeric,
+          query: [filter: expr(custom_field_id == ^id)]
+        ),
+        :decimal
+      )
+
+  defp custom_field_sort_calc(:date, id),
+    do:
+      Ash.Sort.expr_sort(
+        first(custom_field_values,
+          field: :sort_date,
+          query: [filter: expr(custom_field_id == ^id)]
+        ),
+        :date
+      )
+
+  defp custom_field_sort_calc(:boolean, id),
+    do:
+      Ash.Sort.expr_sort(
+        first(custom_field_values,
+          field: :sort_boolean,
+          query: [filter: expr(custom_field_id == ^id)]
+        ),
+        :boolean
+      )
+
+  defp custom_field_sort_calc(_type, id),
+    do:
+      Ash.Sort.expr_sort(
+        first(custom_field_values,
+          field: :sort_text,
+          query: [filter: expr(custom_field_id == ^id)]
+        ),
+        :string
+      )
+
   # Resolves a sort field (atom or string) to a DB sort key, or nil if it is a
   # computed field handled elsewhere / not sortable.
   defp sort_key(field) when field in [:membership_fee_type, "membership_fee_type"],
diff --git a/priv/repo/migrations/20260630170637_add_custom_field_values_value_gin_index.exs b/priv/repo/migrations/20260630170637_add_custom_field_values_value_gin_index.exs
new file mode 100644
index 00000000..00ba06c5
--- /dev/null
+++ b/priv/repo/migrations/20260630170637_add_custom_field_values_value_gin_index.exs
@@ -0,0 +1,21 @@
+defmodule Mv.Repo.Migrations.AddCustomFieldValuesValueGinIndex do
+  @moduledoc """
+  Adds a GIN index on `custom_field_values.value` (JSONB) to serve the boolean
+  custom-field containment predicates used by the member overview.
+  """
+
+  use Ecto.Migration
+
+  def up do
+    create index(:custom_field_values, ["value"],
+             name: "custom_field_values_value_gin_index",
+             using: "gin"
+           )
+  end
+
+  def down do
+    drop_if_exists index(:custom_field_values, ["value"],
+                     name: "custom_field_values_value_gin_index"
+                   )
+  end
+end
diff --git a/priv/resource_snapshots/repo/custom_field_values/20260630170638.json b/priv/resource_snapshots/repo/custom_field_values/20260630170638.json
new file mode 100644
index 00000000..654d4231
--- /dev/null
+++ b/priv/resource_snapshots/repo/custom_field_values/20260630170638.json
@@ -0,0 +1,148 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "value",
+      "type": "map"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "custom_field_values_member_id_fkey",
+        "on_delete": "delete",
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "custom_field_values_custom_field_id_fkey",
+        "on_delete": "delete",
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "custom_fields"
+      },
+      "scale": null,
+      "size": null,
+      "source": "custom_field_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "create_table_options": null,
+  "custom_indexes": [
+    {
+      "all_tenants?": false,
+      "concurrently": false,
+      "error_fields": [
+        "value"
+      ],
+      "fields": [
+        {
+          "type": "string",
+          "value": "value"
+        }
+      ],
+      "include": null,
+      "message": null,
+      "name": "custom_field_values_value_gin_index",
+      "nulls_distinct": true,
+      "prefix": null,
+      "table": null,
+      "unique": false,
+      "using": "gin",
+      "where": null
+    }
+  ],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "6B19604F0AA26F503094E6AF5086FDAE0D054096B24099376EFF4BBCFF7E3CB5",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "custom_field_values_unique_custom_field_per_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        },
+        {
+          "type": "atom",
+          "value": "custom_field_id"
+        }
+      ],
+      "name": "unique_custom_field_per_member",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "custom_field_values"
+}
\ No newline at end of file
diff --git a/test/mv_web/member_live/index_boolean_custom_field_filter_test.exs b/test/mv_web/member_live/index_boolean_custom_field_filter_test.exs
new file mode 100644
index 00000000..46eaf64b
--- /dev/null
+++ b/test/mv_web/member_live/index_boolean_custom_field_filter_test.exs
@@ -0,0 +1,83 @@
+defmodule MvWeb.MemberLive.IndexBooleanCustomFieldFilterTest do
+  @moduledoc """
+  §1.15 — DB-backed boolean custom-field filter (in/not_in) must match the
+  previous in-memory behaviour exactly, including a member with no stored value
+  row for the field.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2]
+
+  alias Mv.Membership.CustomField
+  alias Mv.Membership.CustomFieldValue
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, field} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "newsletter_#{System.unique_integer([:positive])}",
+        value_type: :boolean,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    yes = member_fixture_with_actor(%{}, actor)
+    no = member_fixture_with_actor(%{}, actor)
+    none = member_fixture_with_actor(%{}, actor)
+
+    set_bool(yes, field, true, actor)
+    set_bool(no, field, false, actor)
+
+    %{actor: actor, field: field, yes: yes, no: no, none: none}
+  end
+
+  defp set_bool(member, field, bool, actor) do
+    CustomFieldValue
+    |> Ash.Changeset.for_create(:create, %{
+      member_id: member.id,
+      custom_field_id: field.id,
+      value: %{"_union_type" => "boolean", "_union_value" => bool}
+    })
+    |> Ash.create!(actor: actor)
+  end
+
+  defp db_ids(filters, field, actor) do
+    OverviewQuery.build(%{
+      boolean_custom_field_filters: filters,
+      boolean_custom_fields: [field]
+    })
+    |> Ash.read!(actor: actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  defp oracle_ids(filters, field, actor) do
+    members =
+      Member
+      |> Ash.Query.load(custom_field_values: [:custom_field])
+      |> Ash.read!(actor: actor)
+
+    Index.apply_boolean_custom_field_filters(members, filters, [field])
+    |> MapSet.new(& &1.id)
+  end
+
+  test "filter true matches only members with stored true value", ctx do
+    filters = %{to_string(ctx.field.id) => true}
+    assert db_ids(filters, ctx.field, ctx.actor) == oracle_ids(filters, ctx.field, ctx.actor)
+    assert ctx.yes.id in db_ids(filters, ctx.field, ctx.actor)
+    refute ctx.no.id in db_ids(filters, ctx.field, ctx.actor)
+    refute ctx.none.id in db_ids(filters, ctx.field, ctx.actor)
+  end
+
+  test "filter false matches only members with stored false value (not missing rows)", ctx do
+    filters = %{to_string(ctx.field.id) => false}
+    assert db_ids(filters, ctx.field, ctx.actor) == oracle_ids(filters, ctx.field, ctx.actor)
+    assert ctx.no.id in db_ids(filters, ctx.field, ctx.actor)
+    refute ctx.yes.id in db_ids(filters, ctx.field, ctx.actor)
+    refute ctx.none.id in db_ids(filters, ctx.field, ctx.actor)
+  end
+end
diff --git a/test/mv_web/member_live/index_date_custom_field_filter_test.exs b/test/mv_web/member_live/index_date_custom_field_filter_test.exs
new file mode 100644
index 00000000..3e8ad7df
--- /dev/null
+++ b/test/mv_web/member_live/index_date_custom_field_filter_test.exs
@@ -0,0 +1,91 @@
+defmodule MvWeb.MemberLive.IndexDateCustomFieldFilterTest do
+  @moduledoc """
+  §1.16 — DB-backed date custom-field range filter must match the previous
+  in-memory behaviour exactly, including inclusive boundaries and members with
+  no stored value row (excluded).
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2]
+
+  alias Mv.Membership.CustomField
+  alias Mv.Membership.CustomFieldValue
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.DateFilter
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, field} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "birthday_#{System.unique_integer([:positive])}",
+        value_type: :date,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    on_lower = member_with_date(field, ~D[2024-01-01], actor)
+    inside = member_with_date(field, ~D[2024-06-15], actor)
+    on_upper = member_with_date(field, ~D[2024-12-31], actor)
+    below = member_with_date(field, ~D[2023-12-31], actor)
+    above = member_with_date(field, ~D[2025-01-01], actor)
+    none = member_fixture_with_actor(%{}, actor)
+
+    %{
+      actor: actor,
+      field: field,
+      on_lower: on_lower,
+      inside: inside,
+      on_upper: on_upper,
+      below: below,
+      above: above,
+      none: none
+    }
+  end
+
+  defp member_with_date(field, date, actor) do
+    member = member_fixture_with_actor(%{}, actor)
+
+    CustomFieldValue
+    |> Ash.Changeset.for_create(:create, %{
+      member_id: member.id,
+      custom_field_id: field.id,
+      value: %{"_union_type" => "date", "_union_value" => date}
+    })
+    |> Ash.create!(actor: actor)
+
+    member
+  end
+
+  defp filters(field), do: %{to_string(field.id) => %{from: ~D[2024-01-01], to: ~D[2024-12-31]}}
+
+  defp db_ids(field, actor) do
+    OverviewQuery.build(%{date_filters: filters(field), date_custom_fields: [field]})
+    |> Ash.read!(actor: actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  defp oracle_ids(field, actor) do
+    members =
+      Member
+      |> Ash.Query.load(custom_field_values: [:custom_field])
+      |> Ash.read!(actor: actor)
+
+    DateFilter.apply_in_memory(members, filters(field), [field])
+    |> MapSet.new(& &1.id)
+  end
+
+  test "inclusive range matches in-memory oracle, boundaries included", ctx do
+    db = db_ids(ctx.field, ctx.actor)
+    assert db == oracle_ids(ctx.field, ctx.actor)
+
+    assert ctx.on_lower.id in db
+    assert ctx.inside.id in db
+    assert ctx.on_upper.id in db
+    refute ctx.below.id in db
+    refute ctx.above.id in db
+    refute ctx.none.id in db
+  end
+end
diff --git a/test/mv_web/member_live/index_filter_parity_property_test.exs b/test/mv_web/member_live/index_filter_parity_property_test.exs
new file mode 100644
index 00000000..8cd17ce8
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_parity_property_test.exs
@@ -0,0 +1,245 @@
+defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
+  @moduledoc """
+  §2.1 — Filter result-set parity.
+
+  For generated member populations × filter-parameter combinations, the set of
+  member ids returned by the DB-backed `:overview` query equals the set returned
+  by the previous in-memory implementation (the reference oracle).
+
+  The unchanged DB filters (group, fee-type) are applied identically in both
+  arms; the property isolates the filters that moved from memory to the DB
+  (boolean custom fields, date custom fields, paid/unpaid cycle status) by
+  applying them DB-side in one arm and in-memory in the other.
+  """
+  use Mv.DataCase, async: false
+  use ExUnitProperties
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias Mv.Membership.CustomField
+  alias Mv.Membership.CustomFieldValue
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index
+  alias MvWeb.MemberLive.Index.DateFilter
+  alias MvWeb.MemberLive.Index.MembershipFeeStatus
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  @today ~D[2024-07-15]
+  @cycle_starts [~D[2023-01-01], ~D[2024-01-01], ~D[2025-01-01]]
+  @date_values [~D[2023-06-01], ~D[2024-06-15], ~D[2025-06-01]]
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    ft1 = create_fee_type(%{interval: :yearly}, actor)
+    ft2 = create_fee_type(%{interval: :yearly}, actor)
+
+    {:ok, bool_cf} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "flag_#{System.unique_integer([:positive])}",
+        value_type: :boolean,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    {:ok, date_cf} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "dt_#{System.unique_integer([:positive])}",
+        value_type: :date,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    %{actor: actor, ft1: ft1, ft2: ft2, bool_cf: bool_cf, date_cf: date_cf}
+  end
+
+  # ----- generators ---------------------------------------------------------
+
+  defp status_gen, do: StreamData.member_of([:unpaid, :paid, :suspended])
+
+  defp member_spec_gen do
+    StreamData.fixed_map(%{
+      fee_type: StreamData.member_of([:ft1, :ft2]),
+      cycles:
+        StreamData.list_of(
+          StreamData.tuple({StreamData.member_of(@cycle_starts), status_gen()}),
+          max_length: 3
+        ),
+      bool: StreamData.member_of([:none, true, false]),
+      date: StreamData.member_of([:none | @date_values]),
+      in_group: StreamData.boolean()
+    })
+  end
+
+  defp filter_params_gen do
+    StreamData.fixed_map(%{
+      cycle_status: StreamData.member_of([nil, :paid, :unpaid]),
+      show_current: StreamData.boolean(),
+      bool: StreamData.member_of([nil, true, false]),
+      date_range: StreamData.member_of([nil, {~D[2024-01-01], ~D[2024-12-31]}]),
+      group: StreamData.member_of([nil, :in, :not_in]),
+      fee_type: StreamData.member_of([nil, :in, :not_in])
+    })
+  end
+
+  # ----- helpers ------------------------------------------------------------
+
+  defp clear_members(actor) do
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+  end
+
+  defp create_population(specs, ctx) do
+    Enum.map(specs, fn spec ->
+      ft = if spec.fee_type == :ft1, do: ctx.ft1, else: ctx.ft2
+      member = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, ctx.actor)
+
+      spec.cycles
+      |> Enum.uniq_by(fn {start, _} -> start end)
+      |> Enum.each(fn {start, status} ->
+        create_cycle(member, ft, %{cycle_start: start, status: status}, ctx.actor)
+      end)
+
+      maybe_set_value(member, ctx.bool_cf, spec.bool, "boolean", ctx.actor)
+      maybe_set_value(member, ctx.date_cf, spec.date, "date", ctx.actor)
+
+      if spec.in_group, do: add_to_group(member, ctx, ctx.actor)
+      {member.id, spec}
+    end)
+  end
+
+  defp maybe_set_value(_member, _cf, :none, _type, _actor), do: :ok
+
+  defp maybe_set_value(member, cf, value, type, actor) do
+    CustomFieldValue
+    |> Ash.Changeset.for_create(:create, %{
+      member_id: member.id,
+      custom_field_id: cf.id,
+      value: %{"_union_type" => type, "_union_value" => value}
+    })
+    |> Ash.create!(actor: actor)
+  end
+
+  defp add_to_group(member, ctx, actor) do
+    Mv.Membership.create_member_group(%{member_id: member.id, group_id: ctx.group.id},
+      actor: actor
+    )
+  end
+
+  defp base_opts(params, ctx) do
+    %{}
+    |> put_group(params.group, ctx)
+    |> put_fee_type(params.fee_type, ctx)
+  end
+
+  defp put_group(opts, nil, _ctx), do: opts
+
+  defp put_group(opts, dir, ctx),
+    do: Map.merge(opts, %{group_filters: %{to_string(ctx.group.id) => dir}, groups: [ctx.group]})
+
+  defp put_fee_type(opts, nil, _ctx), do: opts
+
+  defp put_fee_type(opts, dir, ctx),
+    do:
+      Map.merge(opts, %{fee_type_filters: %{to_string(ctx.ft1.id) => dir}, fee_types: [ctx.ft1]})
+
+  defp moved_opts(params, ctx) do
+    %{today: @today}
+    |> put_cycle(params.cycle_status, params.show_current)
+    |> put_bool(params.bool, ctx)
+    |> put_date(params.date_range, ctx)
+  end
+
+  defp put_cycle(opts, nil, _show), do: opts
+
+  defp put_cycle(opts, status, show),
+    do: Map.merge(opts, %{cycle_status_filter: status, show_current_cycle: show})
+
+  defp put_bool(opts, nil, _ctx), do: opts
+
+  defp put_bool(opts, bool, ctx),
+    do:
+      Map.merge(opts, %{
+        boolean_custom_field_filters: %{to_string(ctx.bool_cf.id) => bool},
+        boolean_custom_fields: [ctx.bool_cf]
+      })
+
+  defp put_date(opts, nil, _ctx), do: opts
+
+  defp put_date(opts, {from, to}, ctx),
+    do:
+      Map.merge(opts, %{
+        date_filters: %{to_string(ctx.date_cf.id) => %{from: from, to: to}},
+        date_custom_fields: [ctx.date_cf]
+      })
+
+  defp db_ids(params, ctx) do
+    base_opts(params, ctx)
+    |> Map.merge(moved_opts(params, ctx))
+    |> OverviewQuery.build()
+    |> Ash.read!(actor: ctx.actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  defp oracle_ids(params, ctx) do
+    base_members =
+      base_opts(params, ctx)
+      |> OverviewQuery.build()
+      |> Ash.Query.load([
+        :membership_fee_type,
+        {:custom_field_values, [:custom_field]},
+        {:membership_fee_cycles, [:membership_fee_type]}
+      ])
+      |> Ash.read!(actor: ctx.actor)
+
+    base_members
+    |> apply_oracle_bool(params, ctx)
+    |> apply_oracle_date(params, ctx)
+    |> apply_oracle_cycle(params)
+    |> MapSet.new(& &1.id)
+  end
+
+  defp apply_oracle_bool(members, %{bool: nil}, _ctx), do: members
+
+  defp apply_oracle_bool(members, %{bool: bool}, ctx) do
+    Index.apply_boolean_custom_field_filters(
+      members,
+      %{to_string(ctx.bool_cf.id) => bool},
+      [ctx.bool_cf]
+    )
+  end
+
+  defp apply_oracle_date(members, %{date_range: nil}, _ctx), do: members
+
+  defp apply_oracle_date(members, %{date_range: {from, to}}, ctx) do
+    DateFilter.apply_in_memory(
+      members,
+      %{to_string(ctx.date_cf.id) => %{from: from, to: to}},
+      [ctx.date_cf]
+    )
+  end
+
+  defp apply_oracle_cycle(members, %{cycle_status: nil}), do: members
+
+  defp apply_oracle_cycle(members, %{cycle_status: status, show_current: show}) do
+    Enum.filter(members, fn m ->
+      MembershipFeeStatus.get_cycle_status_for_member(m, show, @today) == status
+    end)
+  end
+
+  property "DB-backed filter result set equals the in-memory oracle", ctx do
+    check all(
+            specs <- StreamData.list_of(member_spec_gen(), min_length: 1, max_length: 5),
+            params <- filter_params_gen(),
+            max_runs: 30
+          ) do
+      clear_members(ctx.actor)
+      group = Mv.Fixtures.group_fixture(%{name: "G#{System.unique_integer([:positive])}"})
+      ctx = Map.put(ctx, :group, group)
+
+      _population = create_population(specs, ctx)
+
+      assert db_ids(params, ctx) == oracle_ids(params, ctx)
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_overview_query_sort_test.exs b/test/mv_web/member_live/index_overview_query_sort_test.exs
new file mode 100644
index 00000000..ddf0320b
--- /dev/null
+++ b/test/mv_web/member_live/index_overview_query_sort_test.exs
@@ -0,0 +1,98 @@
+defmodule MvWeb.MemberLive.IndexOverviewQuerySortTest do
+  @moduledoc """
+  §2.3 — Sort determinism for custom-field sorts pushed to the DB.
+
+  The keyset property test covers standard fields; these examples pin the
+  type-aware custom-field ordering (numeric vs lexical, chronological dates) and
+  the NULLS-LAST behaviour for missing/empty values in both directions, which
+  the previous in-memory `CustomFieldSort` guaranteed.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2]
+
+  alias Mv.Membership.CustomField
+  alias Mv.Membership.CustomFieldValue
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  defp clear_members(actor) do
+    Mv.Membership.Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+  end
+
+  defp create_field(value_type, actor) do
+    {:ok, field} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "sort_#{value_type}_#{System.unique_integer([:positive])}",
+        value_type: value_type,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    field
+  end
+
+  defp set_value(member, field, union_type, union_value, actor) do
+    {:ok, _} =
+      CustomFieldValue
+      |> Ash.Changeset.for_create(:create, %{
+        member_id: member.id,
+        custom_field_id: field.id,
+        value: %{"_union_type" => union_type, "_union_value" => union_value}
+      })
+      |> Ash.create(actor: actor)
+  end
+
+  defp sorted_ids(field, order, actor) do
+    OverviewQuery.build(%{
+      sort_field: "custom_field_#{field.id}",
+      sort_order: order,
+      custom_fields: [field]
+    })
+    |> Ash.read!(actor: actor, page: [limit: 100])
+    |> then(& &1.results)
+    |> Enum.map(& &1.id)
+  end
+
+  test "integer custom field sorts numerically, missing value last in both directions", %{
+    actor: actor
+  } do
+    clear_members(actor)
+    field = create_field(:integer, actor)
+    a = member_fixture_with_actor(%{first_name: "A"}, actor)
+    b = member_fixture_with_actor(%{first_name: "B"}, actor)
+    none = member_fixture_with_actor(%{first_name: "N"}, actor)
+    # 9 vs 10: lexical order would place "10" before "9"; numeric must not.
+    set_value(a, field, "integer", 10, actor)
+    set_value(b, field, "integer", 9, actor)
+
+    assert sorted_ids(field, :asc, actor) == [b.id, a.id, none.id]
+    assert sorted_ids(field, :desc, actor) == [a.id, b.id, none.id]
+  end
+
+  test "date custom field sorts chronologically", %{actor: actor} do
+    clear_members(actor)
+    field = create_field(:date, actor)
+    older = member_fixture_with_actor(%{first_name: "Older"}, actor)
+    newer = member_fixture_with_actor(%{first_name: "Newer"}, actor)
+    set_value(older, field, "date", "1981-01-29", actor)
+    set_value(newer, field, "date", "1986-07-02", actor)
+
+    assert sorted_ids(field, :asc, actor) == [older.id, newer.id]
+  end
+
+  test "empty string value sorts last like a missing value", %{actor: actor} do
+    clear_members(actor)
+    field = create_field(:string, actor)
+    filled = member_fixture_with_actor(%{first_name: "Filled"}, actor)
+    empty = member_fixture_with_actor(%{first_name: "Empty"}, actor)
+    set_value(filled, field, "string", "AAA", actor)
+    set_value(empty, field, "string", "", actor)
+
+    assert sorted_ids(field, :asc, actor) == [filled.id, empty.id]
+  end
+end

From b79d7ac9eac468fd2ee12fd1c5f09c2c3d89b8a4 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 3 Jul 2026 11:31:44 +0200
Subject: [PATCH 05/30] feat(member): stream the overview with keyset infinite
 scroll instead of loading every member

---
 assets/js/app.js                              |  63 ++
 .../components/bulk_actions_dropdown.ex       |  32 +-
 lib/mv_web/components/core_components.ex      |  38 +-
 lib/mv_web/live/member_live/index.ex          | 649 ++++++++----------
 lib/mv_web/live/member_live/index.html.heex   |  55 +-
 priv/gettext/de/LC_MESSAGES/default.po        | 104 ++-
 priv/gettext/default.pot                      |  89 ++-
 priv/gettext/en/LC_MESSAGES/default.po        | 104 ++-
 .../member_live/index_bulk_scope_test.exs     |  71 ++
 .../member_live/index_filter_panel_test.exs   |  79 +++
 .../member_live/index_live_region_test.exs    |  68 ++
 .../member_live/index_pagination_test.exs     |  96 +++
 test/mv_web/member_live/index_test.exs        |  70 +-
 13 files changed, 1067 insertions(+), 451 deletions(-)
 create mode 100644 test/mv_web/member_live/index_bulk_scope_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_panel_test.exs
 create mode 100644 test/mv_web/member_live/index_live_region_test.exs
 create mode 100644 test/mv_web/member_live/index_pagination_test.exs

diff --git a/assets/js/app.js b/assets/js/app.js
index a003e279..a6a7d694 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -126,6 +126,29 @@ Hooks.RowSelectionGuard = {
   }
 }
 
+// StickyViewportWidth: size a `position: sticky; left: 0` element to the visible width
+// (clientWidth) of its horizontally-scrolling container. The infinite-scroll loading bar
+// lives in a full-width table row that is wider than the viewport when the table scrolls
+// horizontally; matching the sticky element to the container's visible width keeps its
+// centered content pinned at the bottom-center of the visible area instead of drifting off
+// with the scrolled table. The data-scroll-container attribute names the container element id.
+Hooks.StickyViewportWidth = {
+  mounted() {
+    this.container = document.getElementById(this.el.dataset.scrollContainer)
+    this.sync = () => {
+      if (this.container) this.el.style.width = this.container.clientWidth + "px"
+    }
+    this.sync()
+    window.addEventListener("resize", this.sync)
+  },
+  updated() {
+    this.sync()
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.sync)
+  }
+}
+
 // FocusRestore hook: WCAG 2.4.3 — when a modal closes, focus returns to the trigger element (e.g. "Delete member" button)
 Hooks.FocusRestore = {
   mounted() {
@@ -360,6 +383,37 @@ Hooks.SidebarState = {
   }
 }
 
+// LoadMorePrefetch: fires an infinite-scroll load event as the sentinel
+// approaches the viewport, rather than only once it is fully scrolled into view.
+// An IntersectionObserver rooted at the scroll container with a positive bottom
+// rootMargin treats the sentinel as visible while it is still that many pixels
+// below the fold, so the next page loads ahead of time. It complements the
+// built-in phx-viewport-bottom binding (which stays as a reliable backstop);
+// duplicate loads are harmless because the server guards on "more?" and the
+// stream de-duplicates rows by id.
+Hooks.LoadMorePrefetch = {
+  mounted() {
+    const container = document.getElementById(this.el.dataset.scrollContainer)
+    const rootMargin = `0px 0px ${this.el.dataset.margin || "600px"} 0px`
+    const event = this.el.dataset.event || "load_more"
+    let lastPush = 0
+
+    this.observer = new IntersectionObserver((entries) => {
+      if (!entries.some((entry) => entry.isIntersecting)) return
+      const now = Date.now()
+      if (now - lastPush < 400) return
+      lastPush = now
+      this.pushEvent(event)
+    }, {root: container || null, rootMargin, threshold: 0})
+
+    this.observer.observe(this.el)
+  },
+
+  destroyed() {
+    if (this.observer) this.observer.disconnect()
+  }
+}
+
 let liveSocket = new LiveSocket("/live", Socket, {
   longPollFallbackMs: 2500,
   params: {
@@ -378,6 +432,15 @@ window.addEventListener("phx:set-input-value", (e) => {
   }
 })
 
+// Return the members list to the top after a sort or filter change. The server
+// resets the keyset stream to page 1 on those changes and pushes this event; a
+// user scrolled down would otherwise be stranded past the shorter content with
+// infinite scroll not re-arming. No-op if the scroll container is absent.
+window.addEventListener("phx:members:scroll-top", () => {
+  const el = document.getElementById("members-table-guard")
+  if (el) el.scrollTop = 0
+})
+
 // Show progress bar on live navigation and form submits
 topbar.config({barColors: {0: "#29d"}, shadowColor: "rgba(0, 0, 0, .3)"})
 window.addEventListener("phx:page-loading-start", _info => topbar.show(300))
diff --git a/lib/mv_web/components/bulk_actions_dropdown.ex b/lib/mv_web/components/bulk_actions_dropdown.ex
index d0b6172a..c6db9145 100644
--- a/lib/mv_web/components/bulk_actions_dropdown.ex
+++ b/lib/mv_web/components/bulk_actions_dropdown.ex
@@ -36,11 +36,13 @@ defmodule MvWeb.Components.BulkActionsDropdown do
 
   ## Event routing
 
-  `dropdown_menu/1` sends `toggle_dropdown`/`close_dropdown` to `@myself`, so the
-  component owns its own `:open` state. The copy item carries an *un-targeted*
-  `phx-click="copy_emails"`, which therefore reaches the parent LiveView's
-  `handle_event/3` (which keeps access to `@members`), plus the
-  `CopyToClipboard` hook.
+  `dropdown_menu/1` sends `toggle_dropdown`/`close_dropdown` *un-targeted*, so the
+  parent LiveView owns the `:open` state (passed back in via the `open` assign).
+  This lets the parent fetch the mailto recipients lazily when the dropdown opens
+  rather than on every selection/filter change. The copy item likewise carries an
+  un-targeted `phx-click="copy_emails"`, which reaches the parent's
+  `handle_event/3` (which keeps access to `@members`), plus the `CopyToClipboard`
+  hook.
   """
   use MvWeb, :live_component
   use Gettext, backend: MvWeb.Gettext
@@ -72,13 +74,13 @@ defmodule MvWeb.Components.BulkActionsDropdown do
       |> assign(:recipient_count, assigns[:recipient_count] || 0)
       |> assign(:mailto_disabled?, assigns[:mailto_disabled?] || false)
 
-    # The parent never sets :open (the component owns it via toggle/close).
-    # Honouring an explicit :open assign keeps the component renderable in
-    # isolation (render_component/2) for structural tests.
+    # The parent owns :open and passes it in. Defaulting to false keeps the
+    # component renderable in isolation (render_component/2) for structural tests
+    # that omit it.
     socket =
       case Map.fetch(assigns, :open) do
         {:ok, open} -> assign(socket, :open, open)
-        :error -> socket
+        :error -> assign_new(socket, :open, fn -> false end)
       end
 
     {:ok, socket}
@@ -98,7 +100,7 @@ defmodule MvWeb.Components.BulkActionsDropdown do
         button_label={gettext("Actions")}
         icon="hero-bolt"
         open={@open}
-        phx_target={@myself}
+        phx_target={nil}
         menu_width="w-70"
         menu_align="left"
         button_class="btn-secondary gap-2"
@@ -232,12 +234,6 @@ defmodule MvWeb.Components.BulkActionsDropdown do
     end
   end
 
-  @impl true
-  def handle_event("toggle_dropdown", _params, socket) do
-    {:noreply, assign(socket, :open, !socket.assigns.open)}
-  end
-
-  def handle_event("close_dropdown", _params, socket) do
-    {:noreply, assign(socket, :open, false)}
-  end
+  # Open/close are handled by the parent LiveView (see "Event routing"); the
+  # component no longer owns dropdown state.
 end
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 2ed22fd1..d01b3d63 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -953,6 +953,11 @@ defmodule MvWeb.CoreComponents do
     doc:
       "when true, first header/body column gets sticky left positioning to keep selection controls visible"
 
+  attr :viewport_bottom, :any,
+    default: nil,
+    doc:
+      "optional phx-viewport-bottom event (string) rendered on the streamed tbody so the built-in InfiniteScroll hook appends the next page without shifting the scroll position; nil omits the binding"
+
   slot :col, required: true do
     attr :label, :string
     attr :class, :string
@@ -964,6 +969,10 @@ defmodule MvWeb.CoreComponents do
 
   slot :action, doc: "the slot for showing user actions in the last table column"
 
+  slot :footer,
+    doc:
+      "optional after-rows content rendered as a full-width row in a separate, non-streamed tbody. Combined with viewport_bottom it acts as the infinite-scroll sentinel (e.g. a loading indicator) that fires the load event and disappears once no more pages remain."
+
   def table(assigns) do
     assigns =
       with %{rows: %Phoenix.LiveView.LiveStream{}} <- assigns do
@@ -986,6 +995,15 @@ defmodule MvWeb.CoreComponents do
     assigns =
       assign(assigns, :first_row_click_col_idx, first_row_click_col_idx)
 
+    # Total column span for full-width footer rows (e.g. the infinite-scroll
+    # loading indicator): fixed columns + dynamic custom-field columns + the
+    # optional action column.
+    col_count =
+      length(assigns.col) + length(assigns[:dynamic_cols] || []) +
+        if assigns.action != [], do: 1, else: 0
+
+    assigns = assign(assigns, :col_count, col_count)
+
     ~H"""
     <div
       id={@row_click && "#{@id}-keyboard"}
@@ -1021,7 +1039,10 @@ defmodule MvWeb.CoreComponents do
             </th>
           </tr>
         </thead>
-        <tbody id={@id} phx-update={is_struct(@rows, Phoenix.LiveView.LiveStream) && "stream"}>
+        <tbody
+          id={@id}
+          phx-update={is_struct(@rows, Phoenix.LiveView.LiveStream) && "stream"}
+        >
           <tr
             :for={row <- @rows}
             id={@row_id && @row_id.(row)}
@@ -1126,6 +1147,21 @@ defmodule MvWeb.CoreComponents do
             </td>
           </tr>
         </tbody>
+        <%!-- After-rows footer in its own, non-streamed tbody so it stays put
+        outside the phx-update="stream" container. When viewport_bottom is set it
+        doubles as the infinite-scroll sentinel: rendered only while more pages
+        exist, so once the last page loads it disappears and stops firing. --%>
+        <tbody
+          :if={@footer != [] && @viewport_bottom}
+          id={"#{@id}-footer"}
+          phx-viewport-bottom={@viewport_bottom}
+        >
+          <tr>
+            <td colspan={@col_count}>
+              {render_slot(@footer)}
+            </td>
+          </tr>
+        </tbody>
       </table>
     </div>
     """
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index c991f7fe..f246f5ee 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -30,8 +30,6 @@ defmodule MvWeb.MemberLive.Index do
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   alias Mv.Membership
-  alias Mv.Membership.CustomFieldSort
-  alias Mv.Membership.Member, as: MemberResource
   alias Mv.MembershipFees
   alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.DateFormatter
@@ -42,6 +40,7 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.MemberLive.Index.FilterParams
   alias MvWeb.MemberLive.Index.Formatter
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
+  alias MvWeb.MemberLive.Index.OverviewQuery
 
   require Ash.Query
   require Logger
@@ -173,11 +172,29 @@ defmodule MvWeb.MemberLive.Index do
       )
       |> assign(:show_current_cycle, false)
       |> assign(:membership_fee_status_filter, nil)
+      |> assign(:page, nil)
+      |> assign(:after_cursor, nil)
+      |> assign(:more?, false)
+      |> assign(:total_count, 0)
+      |> assign(:loading?, false)
+      # The bulk-actions dropdown's open state lives here so the mailto recipient
+      # list can be fetched lazily on open (never on a mere selection change).
+      |> assign(:bulk_actions_open, false)
+      |> assign(:mailto_bcc, "")
+      |> assign(:recipient_count, 0)
+      |> assign(:mailto_disabled?, false)
+      |> stream_configure(:members, dom_id: &"row-#{&1.id}")
+      |> stream(:members, [])
       |> assign_export_payload()
 
     {:ok, socket}
   end
 
+  # Number of members fetched per keyset page (matches the :overview action's
+  # default_limit). Mount loads one page; further pages arrive via infinite
+  # scroll (phx-viewport-bottom) so the socket never holds the full table.
+  @page_limit 50
+
   # -----------------------------------------------------------------
   # Handle Events
   # -----------------------------------------------------------------
@@ -208,12 +225,15 @@ defmodule MvWeb.MemberLive.Index do
     {:noreply,
      socket
      |> assign(:selected_members, selected)
+     |> restream_member(id)
      |> update_selection_assigns()}
   end
 
   @impl true
   def handle_event("select_all", _params, socket) do
-    all_ids = socket.assigns.members |> Enum.map(& &1.id) |> MapSet.new()
+    # Select-all spans the whole filtered set, not just the loaded page (§1.17):
+    # re-query every matching id. Toggling off when all are already selected.
+    all_ids = all_filtered_member_ids(socket)
 
     selected =
       if MapSet.equal?(socket.assigns.selected_members, all_ids) do
@@ -225,6 +245,33 @@ defmodule MvWeb.MemberLive.Index do
     {:noreply,
      socket
      |> assign(:selected_members, selected)
+     |> restream_all_members()
+     |> update_selection_assigns()}
+  end
+
+  # The bulk-actions dropdown routes its open/close here (un-targeted) so the
+  # mailto recipient list is fetched only when the menu actually opens, not on
+  # every selection or filter change.
+  @impl true
+  def handle_event("toggle_dropdown", _params, socket) do
+    open? = !socket.assigns.bulk_actions_open
+
+    socket = assign(socket, :bulk_actions_open, open?)
+    socket = if open?, do: assign_mailto_recipients(socket), else: socket
+
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("close_dropdown", _params, socket) do
+    {:noreply, assign(socket, :bulk_actions_open, false)}
+  end
+
+  @impl true
+  def handle_event("load_more", _params, socket) do
+    {:noreply,
+     socket
+     |> load_more()
      |> update_selection_assigns()}
   end
 
@@ -236,6 +283,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:show_current_cycle, new_show_current)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -247,21 +295,16 @@ defmodule MvWeb.MemberLive.Index do
 
     new_path = ~p"/members?#{query_params}"
 
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
   def handle_event("copy_emails", _params, socket) do
-    members = socket.assigns.members
-    selected_ids = socket.assigns.selected_members
-    any_selected? = Enum.any?(members, &MapSet.member?(selected_ids, &1.id))
-
-    # Recipients follow the current scope: the selection when present, otherwise
-    # every member in the (filtered) list. Members without an email are excluded
-    # in both cases (unchanged missing-email handling). With no selection we no
-    # longer hard-stop with "No members selected" — we act on the scope; the
-    # empty-recipient feedback below is preserved.
-    formatted_emails = scope_member_emails(members, selected_ids, any_selected?)
+    # Recipients follow the current scope, re-queried from the DB so a no-selection
+    # (all/filtered) copy or a select-all copy spans the whole filtered set rather
+    # than only the loaded page (§1.17). Members without an email are excluded;
+    # the empty-recipient feedback below is preserved.
+    formatted_emails = scope_emails(socket)
     email_count = length(formatted_emails)
 
     if email_count == 0 do
@@ -310,6 +353,7 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:sort_order, new_order)
       |> update_sort_components(old_field, new_field, new_order)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     # URL sync - push_patch happens synchronously in the event handler
@@ -325,7 +369,7 @@ defmodule MvWeb.MemberLive.Index do
         socket.assigns[:fields_in_url?] || false
       )
 
-    {:noreply, push_patch(socket, to: ~p"/members?#{query_params}", replace: true)}
+    {:noreply, push_reload(socket, ~p"/members?#{query_params}")}
   end
 
   # -----------------------------------------------------------------
@@ -347,6 +391,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:query, q)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -358,7 +403,7 @@ defmodule MvWeb.MemberLive.Index do
 
     new_path = ~p"/members?#{query_params}"
 
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -367,6 +412,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:cycle_status_filter, filter)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -377,7 +423,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -393,6 +439,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:boolean_custom_field_filters, updated_filters)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -403,7 +450,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -421,6 +468,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:group_filters, group_filters)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -431,7 +479,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -449,6 +497,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:fee_type_filters, fee_type_filters)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -459,7 +508,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -468,6 +517,7 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> assign(:date_filters, new_date_filters)
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -478,7 +528,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   # Backward compatibility: tuple form delegates to map form
@@ -537,6 +587,7 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:boolean_custom_field_filters, Map.get(opts, :boolean_filters, %{}))
       |> assign(:date_filters, Map.get(opts, :date_filters, DateFilter.default()))
       |> load_members()
+      |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
@@ -547,7 +598,7 @@ defmodule MvWeb.MemberLive.Index do
       )
 
     new_path = ~p"/members?#{query_params}"
-    {:noreply, push_patch(socket, to: new_path, replace: true)}
+    {:noreply, push_reload(socket, new_path)}
   end
 
   @impl true
@@ -691,6 +742,9 @@ defmodule MvWeb.MemberLive.Index do
         |> update_selection_assigns()
       end
 
+    # The (re)load is complete: clear the busy flag set by `push_reload/2` (§1.10).
+    socket = assign(socket, :loading?, false)
+
     # Update sort components after rendering
     socket =
       if socket.assigns[:sort_needs_update] do
@@ -806,7 +860,7 @@ defmodule MvWeb.MemberLive.Index do
       |> maybe_add_field_selection(socket.assigns[:user_field_selection], true)
 
     new_path = ~p"/members?#{query_params}"
-    push_patch(socket, to: new_path, replace: true)
+    push_reload(socket, new_path)
   end
 
   defp update_session_field_selection(socket, selection) do
@@ -975,81 +1029,145 @@ defmodule MvWeb.MemberLive.Index do
   # Loading members
   # -------------------------------------------------------------
 
+  # Loads the first keyset page of the overview and resets the stream. All
+  # filtering and sorting run in PostgreSQL via the `:overview` read action
+  # (see OverviewQuery); the socket holds only the loaded window, never the
+  # whole table.
   defp load_members(socket) do
-    search_query = socket.assigns.query
+    # `count: true` runs one COUNT for the active filter set so the live region
+    # can announce the exact total matching count (§1.9), not just the loaded
+    # page size.
+    page = read_overview_page(socket, limit: @page_limit, count: true)
 
-    query =
-      Mv.Membership.Member
-      |> Ash.Query.new()
-      |> Ash.Query.select(@overview_fields)
+    socket
+    |> assign(:members, index_by_id(page.results))
+    |> assign(:after_cursor, next_cursor(page))
+    |> assign(:more?, page.more?)
+    |> assign(:total_count, page.count || length(page.results))
+    |> AshPhoenix.LiveView.assign_page_and_stream_result(page,
+      results_key: :members,
+      page_key: :page,
+      stream_opts: [reset: true]
+    )
+  end
 
-    query = load_custom_field_values(query, compute_ids_to_load(socket))
+  # Returns the members scroll container to the top after a sort/filter reset.
+  # A reset re-streams from page 1, so a user who was scrolled down would be left
+  # past the (now shorter) content with infinite scroll not re-arming; scrolling
+  # back to the top shows the new ordering from #1 and re-arms the loader. Only
+  # used on genuine resets, never on load_more (which must preserve position).
+  # The client handler (app.js) is a no-op if the container is not found.
+  defp scroll_list_to_top(socket), do: push_event(socket, "members:scroll-top", %{})
 
-    query = MembershipFeeStatus.load_cycles_for_members(query, socket.assigns.show_current_cycle)
+  # Marks the table region busy (aria-busy, §1.10) for the reload triggered by a
+  # filter/sort/search patch, then hands off to the patch. `handle_params` clears
+  # the flag once the page has been (re)loaded.
+  defp push_reload(socket, path) do
+    socket
+    |> assign(:loading?, true)
+    |> push_patch(to: path, replace: true)
+  end
 
-    # Load groups for each member (id, name, slug only)
-    query =
-      Ash.Query.load(query, groups: [:id, :name, :slug])
+  # Fetches the next keyset page (if any) and appends it to the stream and the
+  # loaded window. Triggered by phx-viewport-bottom; a no-op once the last page
+  # has been reached so the bottom sentinel stops fetching.
+  defp load_more(%{assigns: %{more?: false}} = socket), do: socket
 
-    # Load membership_fee_type when the column is visible or when sorting by it
-    query =
-      if :membership_fee_type in socket.assigns.member_fields_visible or
-           socket.assigns.sort_field in [:membership_fee_type, "membership_fee_type"] do
-        Ash.Query.load(query, membership_fee_type: [:id, :name])
-      else
-        query
-      end
+  defp load_more(socket) do
+    page = read_overview_page(socket, limit: @page_limit, after: socket.assigns.after_cursor)
 
-    query = apply_search_filter(query, search_query)
+    socket =
+      Enum.reduce(page.results, socket, fn member, acc ->
+        stream_insert(acc, :members, member)
+      end)
 
-    query = apply_group_filters(query, socket.assigns[:group_filters], socket.assigns[:groups])
+    socket
+    |> assign(:members, Map.merge(socket.assigns.members, index_by_id(page.results)))
+    |> assign(:after_cursor, next_cursor(page))
+    |> assign(:more?, page.more?)
+    |> assign(:page, %{page | results: nil})
+  end
 
-    query =
-      apply_fee_type_filters(query, socket.assigns[:fee_type_filters], socket.assigns[:fee_types])
+  # Loaded members are held as a `%{id => member}` map (not a list): appends on
+  # load_more stay O(page) via Map.merge instead of copying an ever-growing list
+  # with `++`, and a per-row selection re-render is an O(1) lookup by id.
+  defp index_by_id(members), do: Map.new(members, &{&1.id, &1})
 
-    # Built-in date filters (join_date, exit_date) are pushed to the DB so
-    # excluded rows never reach the BEAM. The active_only default is part of
-    # this — fresh load returns only members without an exit_date or with an
-    # exit_date strictly in the future.
-    query =
-      DateFilter.apply_ash_filter(query, socket.assigns.date_filters)
+  # Re-inserts a single loaded member into the stream so its row re-renders with
+  # the current selection state (checkbox + selected highlight). Stream rows are
+  # not re-rendered on assign changes, so a selection toggle must re-stream the
+  # affected row.
+  defp restream_member(socket, id) do
+    case Map.get(socket.assigns[:members] || %{}, id) do
+      nil -> socket
+      member -> stream_insert(socket, :members, member)
+    end
+  end
 
-    # Use ALL custom fields for sorting (not just show_in_overview subset)
-    custom_fields_for_sort = socket.assigns.all_custom_fields
+  # Re-inserts every loaded member so all visible rows reflect a bulk selection
+  # change (select-all / deselect-all).
+  defp restream_all_members(socket) do
+    Enum.reduce(Map.values(socket.assigns[:members] || %{}), socket, fn member, acc ->
+      stream_insert(acc, :members, member)
+    end)
+  end
 
-    {query, sort_after_load} =
-      maybe_sort(
-        query,
-        socket.assigns.sort_field,
-        socket.assigns.sort_order,
-        custom_fields_for_sort
-      )
+  # Reads one keyset page of the overview with display loads applied. Reads run
+  # as the real user actor so Ash policies are enforced.
+  defp read_overview_page(socket, page_opts) do
+    socket
+    |> overview_query()
+    |> Ash.read!(actor: current_actor(socket), page: page_opts)
+  end
 
-    # Errors in handle_params are handled by Phoenix LiveView
-    actor = current_actor(socket)
-    members = Ash.read!(query, actor: actor)
+  # The cursor of the last loaded row, used as the `after` bound for the next
+  # page; nil once there are no further pages.
+  defp next_cursor(%{more?: true, results: results}) when results != [],
+    do: List.last(results).__metadata__.keyset
 
-    # Custom field values are already filtered at the database level in load_custom_field_values/2
-    # No need for in-memory filtering anymore
+  defp next_cursor(_page), do: nil
 
-    members = apply_in_memory_filters(members, socket)
+  # Builds the `:overview` query (filter/sort via OverviewQuery) and layers on
+  # the display-only loads (custom field values, cycles, groups, fee type).
+  defp overview_query(socket) do
+    socket
+    |> overview_query_opts()
+    |> OverviewQuery.build()
+    |> Ash.Query.select(@overview_fields)
+    |> load_custom_field_values(compute_ids_to_load(socket))
+    |> MembershipFeeStatus.load_cycles_for_members(socket.assigns.show_current_cycle)
+    |> Ash.Query.load(groups: [:id, :name, :slug])
+    |> maybe_load_fee_type(socket)
+  end
 
-    # Sort in memory if needed (custom fields, groups, group_count; computed fields are blocked)
-    # Note: :groups is in computed_member_fields() but can be sorted in-memory, so we only block :membership_fee_status
-    members =
-      if sort_after_load and
-           socket.assigns.sort_field != :membership_fee_status do
-        sort_members_in_memory(
-          members,
-          socket.assigns.sort_field,
-          socket.assigns.sort_order,
-          custom_fields_for_sort
-        )
-      else
-        members
-      end
+  defp maybe_load_fee_type(query, socket) do
+    if :membership_fee_type in socket.assigns.member_fields_visible or
+         socket.assigns.sort_field in [:membership_fee_type, "membership_fee_type"] do
+      Ash.Query.load(query, membership_fee_type: [:id, :name])
+    else
+      query
+    end
+  end
 
-    assign(socket, :members, members)
+  # Assembles the filter/sort options OverviewQuery understands from the current
+  # LiveView assigns.
+  defp overview_query_opts(socket) do
+    %{
+      search: socket.assigns.query,
+      group_filters: socket.assigns[:group_filters],
+      groups: socket.assigns[:groups],
+      fee_type_filters: socket.assigns[:fee_type_filters],
+      fee_types: socket.assigns[:fee_types],
+      boolean_custom_field_filters: socket.assigns.boolean_custom_field_filters,
+      boolean_custom_fields: socket.assigns.boolean_custom_fields,
+      date_filters: socket.assigns.date_filters,
+      date_custom_fields: socket.assigns[:date_custom_fields],
+      cycle_status_filter: socket.assigns.cycle_status_filter,
+      show_current_cycle: socket.assigns.show_current_cycle,
+      sort_field: socket.assigns.sort_field,
+      sort_order: socket.assigns.sort_order,
+      custom_fields: socket.assigns.all_custom_fields
+    }
   end
 
   # Collects every custom field UUID whose values must be loaded for a given
@@ -1083,24 +1201,6 @@ defmodule MvWeb.MemberLive.Index do
     |> Enum.uniq()
   end
 
-  # Post-DB filtering: cycle status, boolean custom fields, and custom date
-  # fields. Date custom fields are last so they see the already-narrowed list.
-  defp apply_in_memory_filters(members, socket) do
-    members
-    |> apply_cycle_status_filter(
-      socket.assigns.cycle_status_filter,
-      socket.assigns.show_current_cycle
-    )
-    |> apply_boolean_custom_field_filters(
-      socket.assigns.boolean_custom_field_filters,
-      socket.assigns.all_custom_fields
-    )
-    |> DateFilter.apply_in_memory(
-      socket.assigns.date_filters,
-      socket.assigns[:date_custom_fields] || []
-    )
-  end
-
   defp load_custom_field_values(query, []), do: query
 
   defp load_custom_field_values(query, custom_field_ids) do
@@ -1117,166 +1217,10 @@ defmodule MvWeb.MemberLive.Index do
   # Helper Functions
   # -------------------------------------------------------------
 
-  defp apply_search_filter(query, search_query) do
-    if search_query && String.trim(search_query) != "" do
-      query
-      |> MemberResource.fuzzy_search(%{query: search_query})
-    else
-      query
-    end
-  end
-
-  # Multiple group filters combine with AND: member must match all selected group conditions.
-  defp apply_group_filters(query, group_filters, _groups) when group_filters == %{}, do: query
-
-  defp apply_group_filters(query, group_filters, groups) do
-    valid_ids =
-      groups
-      |> Enum.map(&normalize_uuid_string(to_string(&1.id)))
-      |> Enum.reject(&is_nil/1)
-      |> MapSet.new()
-
-    Enum.reduce(group_filters, query, fn {group_id_str, value}, q ->
-      member? = MapSet.member?(valid_ids, group_id_str)
-
-      if member? do
-        apply_one_group_filter(q, group_id_str, value)
-      else
-        q
-      end
-    end)
-  end
-
-  defp apply_one_group_filter(query, _group_id_str, nil), do: query
-
-  defp apply_one_group_filter(query, group_id_str, :in) do
-    case Ecto.UUID.cast(group_id_str) do
-      {:ok, group_uuid} ->
-        Ash.Query.filter(query, expr(exists(member_groups, group_id == ^group_uuid)))
-
-      _ ->
-        query
-    end
-  end
-
-  defp apply_one_group_filter(query, group_id_str, :not_in) do
-    case Ecto.UUID.cast(group_id_str) do
-      {:ok, group_uuid} ->
-        Ash.Query.filter(query, expr(not exists(member_groups, group_id == ^group_uuid)))
-
-      _ ->
-        query
-    end
-  end
-
-  defp apply_one_group_filter(query, _, _), do: query
-
-  # Fee type filters: :in selections combine with OR (member has any of the selected types);
-  # :not_in selections combine with AND (member must not have type A and not have type B).
-  defp apply_fee_type_filters(query, fee_type_filters, _fee_types) when fee_type_filters == %{},
-    do: query
-
-  defp apply_fee_type_filters(query, fee_type_filters, fee_types) do
-    valid_ids =
-      fee_types
-      |> Enum.map(&normalize_uuid_string(to_string(&1.id)))
-      |> Enum.reject(&is_nil/1)
-      |> MapSet.new()
-
-    {in_id_strs, not_in_filters} =
-      fee_type_filters
-      |> Enum.filter(fn {id_str, _} -> MapSet.member?(valid_ids, id_str) end)
-      |> Enum.split_with(fn {_, value} -> value == :in end)
-
-    in_uuids =
-      in_id_strs
-      |> Enum.map(fn {id_str, _} -> id_str end)
-      |> Enum.map(&Ecto.UUID.cast/1)
-      |> Enum.filter(&match?({:ok, _}, &1))
-      |> Enum.map(fn {:ok, uuid} -> uuid end)
-
-    query =
-      if in_uuids == [] do
-        query
-      else
-        Ash.Query.filter(query, expr(membership_fee_type_id in ^in_uuids))
-      end
-
-    Enum.reduce(not_in_filters, query, fn {fee_type_id_str, _}, q ->
-      apply_one_fee_type_filter(q, fee_type_id_str, :not_in)
-    end)
-  end
-
-  defp apply_one_fee_type_filter(query, fee_type_id_str, :not_in) do
-    case Ecto.UUID.cast(fee_type_id_str) do
-      {:ok, fee_type_uuid} ->
-        Ash.Query.filter(
-          query,
-          expr(membership_fee_type_id != ^fee_type_uuid or is_nil(membership_fee_type_id))
-        )
-
-      _ ->
-        query
-    end
-  end
-
-  defp apply_cycle_status_filter(members, nil, _show_current), do: members
-
-  defp apply_cycle_status_filter(members, status, show_current)
-       when status in [:paid, :unpaid] do
-    MembershipFeeStatus.filter_members_by_cycle_status(members, status, show_current)
-  end
-
   defp toggle_order(:asc), do: :desc
   defp toggle_order(:desc), do: :asc
   defp toggle_order(nil), do: :asc
 
-  # Function to sort the column if needed.
-  # Only DB member fields and custom fields; computed fields (e.g. membership_fee_status) are never passed to Ash.
-  # Returns {query, sort_after_load} where sort_after_load is true if we need to sort in memory.
-  defp maybe_sort(query, nil, _order, _custom_fields), do: {query, false}
-  defp maybe_sort(query, _field, nil, _custom_fields), do: {query, false}
-
-  defp maybe_sort(query, field, order, _custom_fields) do
-    # :groups is in computed_member_fields() but can be sorted in-memory
-    # Only :membership_fee_status should be blocked from sorting
-    if field == :membership_fee_status or field == "membership_fee_status" do
-      {query, false}
-    else
-      apply_sort_to_query(query, field, order)
-    end
-  end
-
-  defp apply_sort_to_query(query, field, order) do
-    cond do
-      # Groups sort -> after load (in memory)
-      field in [:groups, "groups"] ->
-        {query, true}
-
-      # Membership fee type sort -> by related name at DB
-      field in [:membership_fee_type, "membership_fee_type"] ->
-        {Ash.Query.sort(query, [{"membership_fee_type.name", order}]), false}
-
-      # Custom field sort -> after load
-      custom_field_sort?(field) ->
-        {query, true}
-
-      # DB field sort (atom)
-      is_atom(field) ->
-        {Ash.Query.sort(query, [{field, order}]), false}
-
-      # DB field sort (string) -> convert only if allowed
-      is_binary(field) ->
-        case safe_member_field_atom_only(field) do
-          nil -> {query, false}
-          atom -> {Ash.Query.sort(query, [{atom, order}]), false}
-        end
-
-      true ->
-        {query, false}
-    end
-  end
-
   defp valid_sort_field?(field) when is_atom(field) do
     # :groups is in computed_member_fields() but can be sorted
     # Only :membership_fee_status should be blocked
@@ -1331,19 +1275,6 @@ defmodule MvWeb.MemberLive.Index do
 
   defp custom_field_sort?(_), do: false
 
-  defp extract_custom_field_id(field) when is_atom(field) do
-    field |> Atom.to_string() |> extract_custom_field_id()
-  end
-
-  defp extract_custom_field_id(field) when is_binary(field) do
-    case String.split(field, @custom_field_prefix) do
-      ["", id_str] -> id_str
-      _ -> nil
-    end
-  end
-
-  defp extract_custom_field_id(_), do: nil
-
   defp extract_custom_field_ids(visible_custom_fields) do
     Enum.map(visible_custom_fields, fn field_string ->
       case String.split(field_string, @custom_field_prefix) do
@@ -1354,91 +1285,6 @@ defmodule MvWeb.MemberLive.Index do
     |> Enum.filter(&(&1 != nil))
   end
 
-  defp sort_members_in_memory(members, field, order, custom_fields) do
-    if field in [:groups, "groups"] do
-      sort_members_by_groups(members, order)
-    else
-      custom_field_id_str = extract_custom_field_id(field)
-
-      case custom_field_id_str do
-        nil -> members
-        id_str -> sort_members_by_custom_field(members, id_str, order, custom_fields)
-      end
-    end
-  end
-
-  defp sort_members_by_groups(members, order) do
-    # Members with groups first, then by first group name alphabetically (min = first by sort order)
-    first_group_name = fn member ->
-      (member.groups || [])
-      |> Enum.map(& &1.name)
-      |> Enum.min(fn -> nil end)
-    end
-
-    members
-    |> Enum.sort_by(fn member ->
-      name = first_group_name.(member)
-      # Nil (no groups) sorts last in asc, first in desc
-      {name == nil, name || ""}
-    end)
-    |> then(fn list -> if order == :desc, do: Enum.reverse(list), else: list end)
-  end
-
-  defp sort_members_by_custom_field(members, id_str, order, custom_fields) do
-    custom_field = find_custom_field_by_id(custom_fields, id_str)
-
-    case custom_field do
-      nil -> members
-      cf -> sort_members_with_custom_field(members, cf, order)
-    end
-  end
-
-  defp find_custom_field_by_id(custom_fields, id_str) do
-    Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
-  end
-
-  defp sort_members_with_custom_field(members, custom_field, order) do
-    {members_with_values, members_without_values} =
-      split_members_by_value_presence(members, custom_field)
-
-    sorted_with_values = sort_members_with_values(members_with_values, custom_field, order)
-    sorted_with_values ++ members_without_values
-  end
-
-  defp split_members_by_value_presence(members, custom_field) do
-    Enum.split_with(members, fn member -> has_non_empty_value?(member, custom_field) end)
-  end
-
-  defp has_non_empty_value?(member, custom_field) do
-    case get_custom_field_value(member, custom_field) do
-      nil ->
-        false
-
-      cfv ->
-        not empty_value?(cfv.value, custom_field.value_type)
-    end
-  end
-
-  defp sort_members_with_values(members_with_values, custom_field, order) do
-    sorted =
-      Enum.sort_by(members_with_values, fn member ->
-        cfv = get_custom_field_value(member, custom_field)
-        CustomFieldSort.sort_key(cfv.value, custom_field.value_type)
-      end)
-
-    if order == :desc, do: Enum.reverse(sorted), else: sorted
-  end
-
-  defp empty_value?(%Ash.Union{value: value, type: type}, _expected_type),
-    do: empty_value?(value, type)
-
-  defp empty_value?(nil, _type), do: true
-
-  defp empty_value?(value, type) when type in [:string, :email] and is_binary(value),
-    do: String.trim(value) == ""
-
-  defp empty_value?(_value, _type), do: false
-
   defp maybe_update_sort(socket, %{"sort_field" => sf, "sort_order" => so}) do
     field = determine_field(socket.assigns.sort_field, sf)
     order = determine_order(socket.assigns.sort_order, so)
@@ -1800,11 +1646,11 @@ defmodule MvWeb.MemberLive.Index do
   def format_date(date), do: DateFormatter.format_date(date)
 
   defp update_selection_assigns(socket) do
-    members = socket.assigns[:members] || []
     selected_members = socket.assigns.selected_members
-
-    selected_count = Enum.count(members, &MapSet.member?(selected_members, &1.id))
-    any_selected? = Enum.any?(members, &MapSet.member?(selected_members, &1.id))
+    # The selection may span members beyond the loaded page (after select-all),
+    # so its size is the MapSet size, not a count over the loaded window.
+    selected_count = MapSet.size(selected_members)
+    any_selected? = selected_count > 0
 
     # Scope drives the trigger label: the selection when present, otherwise the
     # whole list (filtered, when a search term or any filter is active).
@@ -1815,13 +1661,31 @@ defmodule MvWeb.MemberLive.Index do
         true -> :all
       end
 
-    # Copy/Mailto recipients: the members in scope that have a usable email.
-    # With a selection that is the selected subset (existing behaviour); without
-    # a selection it is every member in scope (deliberate behaviour change). In
-    # both cases members without an email are excluded, exactly as today's
-    # format_selected_member_emails does for the selection case.
-    recipient_emails = scope_member_emails(members, selected_members, any_selected?)
-    recipient_count = length(recipient_emails)
+    # No DB work here: the mailto recipient list is computed lazily when the
+    # bulk-actions dropdown opens (assign_mailto_recipients/1), so a selection or
+    # filter change never reads members for a link the user may never open.
+    socket
+    |> assign(:selected_count, selected_count)
+    |> assign(:scope, scope)
+    |> assign_export_payload()
+  end
+
+  # Fetches the mailto BCC recipients for the current bulk scope. Called only when
+  # the bulk-actions dropdown opens (the mailto item, a native anchor, is rendered
+  # only then), keeping selection toggles free of DB reads.
+  defp assign_mailto_recipients(socket) do
+    selected_count = MapSet.size(socket.assigns.selected_members)
+
+    # Size of the whole bulk scope (§1.17): the selection, or the full filtered
+    # total — never just the loaded page.
+    scope_size = if selected_count > 0, do: selected_count, else: socket.assigns.total_count
+    cap = Mv.Constants.max_mailto_bulk_recipients()
+    mailto_disabled? = scope_size >= cap
+
+    # Mailto recipients are bounded by the cap; only re-query the (small) scope
+    # when it is within the cap, otherwise the link is disabled anyway.
+    recipient_emails = if mailto_disabled?, do: [], else: scope_emails(socket, limit: cap)
+    recipient_count = if mailto_disabled?, do: scope_size, else: length(recipient_emails)
 
     # RFC 6068: mailto URI params must use %20 for spaces, not + (encode_www_form uses +)
     mailto_bcc =
@@ -1830,29 +1694,60 @@ defmodule MvWeb.MemberLive.Index do
       |> URI.encode_www_form()
       |> String.replace("+", "%20")
 
-    mailto_disabled? = recipient_count >= Mv.Constants.max_mailto_bulk_recipients()
-
     socket
-    |> assign(:selected_count, selected_count)
-    |> assign(:scope, scope)
     |> assign(:recipient_count, recipient_count)
     |> assign(:mailto_disabled?, mailto_disabled?)
     |> assign(:mailto_bcc, mailto_bcc)
-    |> assign_export_payload()
   end
 
-  # Returns the formatted "Name <email>" recipient list for the current scope:
-  # the selected members when any are selected, otherwise every member in the
-  # (filtered) list. Members without an email are excluded in both cases.
-  defp scope_member_emails(members, selected_members, true = _any_selected?),
-    do: format_selected_member_emails(members, selected_members)
-
-  defp scope_member_emails(members, _selected_members, false = _any_selected?) do
-    members
+  # Formatted "Name <email>" recipients for the current bulk scope, re-queried
+  # from the DB so the set spans the whole selection / filtered total rather than
+  # only the loaded page (§1.17). Members without an email are excluded.
+  defp scope_emails(socket, opts \\ []) do
+    socket
+    |> scope_members(opts)
     |> Enum.filter(fn member -> member.email && member.email != "" end)
     |> Enum.map(&format_member_email/1)
   end
 
+  # MapSet of every member id matching the active filters (no pagination), used
+  # by select-all so the selection spans the full filtered set (§1.17).
+  defp all_filtered_member_ids(socket) do
+    socket
+    |> overview_query_opts()
+    |> Map.put(:sort_field, nil)
+    |> OverviewQuery.build()
+    |> Ash.Query.select([:id])
+    |> Ash.read!(actor: current_actor(socket))
+    |> MapSet.new(& &1.id)
+  end
+
+  # Members matching the current bulk scope: the selected members when any are
+  # selected, otherwise every member matching the active filters. Re-queried as
+  # the real user actor so policies are enforced.
+  defp scope_members(socket, opts) do
+    selected = socket.assigns.selected_members
+
+    query =
+      if MapSet.size(selected) > 0 do
+        ids = MapSet.to_list(selected)
+
+        Mv.Membership.Member
+        |> Ash.Query.for_read(:overview)
+        |> Ash.Query.filter(expr(id in ^ids))
+      else
+        socket
+        |> overview_query_opts()
+        |> Map.put(:sort_field, nil)
+        |> OverviewQuery.build()
+      end
+      |> Ash.Query.select([:id, :first_name, :last_name, :email])
+
+    query = if opts[:limit], do: Ash.Query.limit(query, opts[:limit]), else: query
+
+    Ash.read!(query, actor: current_actor(socket))
+  end
+
   @doc """
   Returns true when the member list is restricted by a non-empty search term or
   any active filter (cycle status, group, fee type, boolean custom field, or a
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index eb7085dc..d9049146 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -5,6 +5,7 @@
       <.live_component
         module={MvWeb.Components.BulkActionsDropdown}
         id="bulk-actions-dropdown"
+        open={@bulk_actions_open}
         export_payload_json={@export_payload_json}
         selected_count={@selected_count}
         scope={@scope}
@@ -39,7 +40,7 @@
       boolean_filters={@boolean_custom_field_filters}
       date_custom_fields={@date_custom_fields}
       date_filters={@date_filters}
-      member_count={length(@members)}
+      member_count={@total_count}
     />
     <.tooltip
       content={
@@ -80,6 +81,19 @@
     />
   </div>
 
+  <%!-- Polite live region: present on first render (before it is filled) so
+  screen readers announce the exact total matching count on every filter change
+  (WCAG 4.1.3). --%>
+  <div
+    id="members-result-count"
+    role="status"
+    aria-live="polite"
+    aria-atomic="true"
+    class="sr-only"
+  >
+    {ngettext("%{count} member", "%{count} members", @total_count, count: @total_count)}
+  </div>
+
   <%!-- On desktop (lg:), only the table area scrolls; header and filters stay visible. On mobile, normal flow. --%>
   <div
     id="members-table-guard"
@@ -88,15 +102,21 @@
     data-testid="members-table-scroll"
     role="region"
     aria-label={gettext("Members table")}
+    aria-busy={to_string(@loading?)}
   >
     <.table
       id="members"
-      rows={@members}
+      rows={@streams.members}
+      row_item={fn {_dom_id, member} -> member end}
       wrapper_overflow_class="overflow-visible"
       sticky_header={true}
       sticky_first_col={true}
-      row_id={fn member -> "row-#{member.id}" end}
-      row_click={fn member -> JS.push("select_row_and_navigate", value: %{id: member.id}) end}
+      viewport_bottom={@more? && "load_more"}
+      row_click={
+        fn {_dom_id, member} ->
+          JS.push("select_row_and_navigate", value: %{id: member.id})
+        end
+      }
       row_tooltip={gettext("Click for member details")}
       row_selected?={fn member -> MapSet.member?(@selected_members, member.id) end}
       dynamic_cols={@dynamic_cols}
@@ -114,7 +134,7 @@
             type="checkbox"
             name="select_all"
             phx-click="select_all"
-            checked={MapSet.equal?(@selected_members, @members |> Enum.map(& &1.id) |> MapSet.new())}
+            checked={@total_count > 0 and @selected_count == @total_count}
             aria-label={gettext("Select all members")}
             role="checkbox"
           />
@@ -405,6 +425,31 @@
           </.link>
         </div>
       </:action>
+      <:footer>
+        <%!-- Invisible sentinel: starts the next-page load as it approaches the
+        viewport (see the LoadMorePrefetch hook), so rows load ahead of reaching
+        the very bottom. Only rendered while more pages exist (with the footer). --%>
+        <div
+          id="members-load-more-sentinel"
+          phx-hook="LoadMorePrefetch"
+          data-scroll-container="members-table-guard"
+          data-event="load_more"
+          data-margin="600px"
+          aria-hidden="true"
+          class="h-0"
+        >
+        </div>
+        <div
+          id="members-loading-bar"
+          phx-hook="StickyViewportWidth"
+          data-scroll-container="members-table-guard"
+          class="sticky left-0 flex items-center justify-center gap-2 border-t border-base-300 bg-base-200 py-4 text-base-content/70"
+          data-testid="members-loading-row"
+        >
+          <span class="loading loading-spinner loading-sm" aria-hidden="true"></span>
+          {gettext("Loading more members …")}
+        </div>
+      </:footer>
     </.table>
   </div>
 </Layouts.app>
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 38ad3e54..db07d05f 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -126,7 +126,9 @@ msgstr "Feld hinzufügen"
 msgid "Add members"
 msgstr "Mitglieder hinzufügen"
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr "Adresse"
@@ -192,8 +194,7 @@ msgid "An account with this email already exists. Please verify your password to
 msgstr "Ein Konto mit dieser E-Mail existiert bereits. Bitte gib dein Passwort ein, um dein OIDC-Konto zu verknüpfen."
 
 #: lib/mv_web/helpers/ash_error_helpers.ex
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #: lib/mv_web/live/role_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "An error occurred"
@@ -2288,14 +2289,12 @@ msgstr "Beitragseinstellungen"
 msgid "Membership fee start"
 msgstr "Beitragsbeginn"
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format
 msgid "Membership fee type deleted"
 msgstr "Mitgliedsbeitragsart gelöscht"
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format
 msgid "Membership fee type not found"
 msgstr "Mitgliedsbeitragsart nicht gefunden"
@@ -2350,12 +2349,14 @@ msgstr "Monatliches Intervall – Beitrittszeitraum einbezogen"
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -2406,6 +2407,7 @@ msgstr "Neue*r Benutzer*in"
 msgid "New amount"
 msgstr "Neuer Betrag"
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -2693,10 +2695,10 @@ msgstr "Optionen"
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
@@ -3293,11 +3295,6 @@ msgstr "Buchungen/Belege aus Vereinfacht anzeigen"
 msgid "Show in overview"
 msgstr "In der Übersicht anzeigen"
 
-#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
-#, elixir-autogen, elixir-format
-msgid "Show/Hide Columns"
-msgstr "Spalten ein-/ausblenden"
-
 #: lib/mv_web/live/auth/sign_in_live.ex
 #, elixir-autogen, elixir-format
 msgid "Sign in"
@@ -3391,10 +3388,10 @@ msgid "Summary"
 msgstr "Zusammenfassung"
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr "Pausiert"
@@ -3700,10 +3697,10 @@ msgstr "Aufhebung der Verknüpfung geplant"
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr "Unbezahlt"
@@ -3904,6 +3901,7 @@ msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen"
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -3956,8 +3954,7 @@ msgstr "Du kannst Links einfügen: ganze Adressen (https://…) oder als [Linkte
 msgid "You do not have permission to %{action} members."
 msgstr "Du hast keine Berechtigung, Mitglieder zu %{action}."
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format
 msgid "You do not have permission to access this membership fee type"
 msgstr "Du hast keine Berechtigung, auf diese Mitgliedsbeitragsart zuzugreifen."
@@ -3973,8 +3970,7 @@ msgstr "Du hast keine Berechtigung, auf diese Seite zuzugreifen."
 msgid "You do not have permission to delete this member"
 msgstr "Du hast keine Berechtigung, dieses Mitglied zu löschen."
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format
 msgid "You do not have permission to delete this membership fee type"
 msgstr "Du hast keine Berechtigung, diese Mitgliedsbeitragsart zu löschen."
@@ -4145,3 +4141,75 @@ msgstr "Öffnen"
 msgctxt "status"
 msgid "Open"
 msgstr "Offen"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{count} member"
+msgid_plural "%{count} members"
+msgstr[0] "%{count} Mitglied"
+msgstr[1] "%{count} Mitglieder"
+
+#: lib/mv_web/live/components/search_bar_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear search"
+msgstr "Suche zurücksetzen"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact address field"
+msgstr "Kompaktes Adressfeld"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact mode"
+msgstr "Kompakter Modus"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View settings"
+msgstr "Ansichtseinstellungen"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "include email"
+msgstr "inklusive E-Mail"
+
+#: lib/mv_web/components/core_components.ex
+#, elixir-autogen, elixir-format
+msgid "Reset to default"
+msgstr "Auf Standard zurücksetzen"
+
+#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Columns"
+msgstr "Spalten"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Loading more members …"
+msgstr "Weitere Mitglieder werden geladen …"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View"
+msgstr "Ansicht"
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact Member field"
+msgstr "Kompaktes Mitglied-Feld"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by city"
+msgstr "Klicke, um nach Ort zu sortieren"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by last name"
+msgstr "Klicke, um nach Nachname zu sortieren"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "No address"
+msgstr "Keine Adresse"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 4c9a10a0..c3b21727 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -127,7 +127,9 @@ msgstr ""
 msgid "Add members"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -2348,12 +2350,14 @@ msgstr ""
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -2404,6 +2408,7 @@ msgstr ""
 msgid "New amount"
 msgstr ""
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -2691,10 +2696,10 @@ msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
@@ -3291,11 +3296,6 @@ msgstr ""
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
-#, elixir-autogen, elixir-format
-msgid "Show/Hide Columns"
-msgstr ""
-
 #: lib/mv_web/live/auth/sign_in_live.ex
 #, elixir-autogen, elixir-format
 msgid "Sign in"
@@ -3389,10 +3389,10 @@ msgid "Summary"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr ""
@@ -3698,10 +3698,10 @@ msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr ""
@@ -3901,6 +3901,7 @@ msgstr ""
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -4140,3 +4141,75 @@ msgstr ""
 msgctxt "status"
 msgid "Open"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{count} member"
+msgid_plural "%{count} members"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/components/search_bar_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear search"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact address field"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact mode"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View settings"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "include email"
+msgstr ""
+
+#: lib/mv_web/components/core_components.ex
+#, elixir-autogen, elixir-format
+msgid "Reset to default"
+msgstr ""
+
+#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Columns"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Loading more members …"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact Member field"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by city"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by last name"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "No address"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index cda87b5a..fe871774 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -127,7 +127,9 @@ msgstr ""
 msgid "Add members"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Address"
 msgstr ""
@@ -193,8 +195,7 @@ msgid "An account with this email already exists. Please verify your password to
 msgstr ""
 
 #: lib/mv_web/helpers/ash_error_helpers.ex
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #: lib/mv_web/live/role_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "An error occurred"
@@ -2289,14 +2290,12 @@ msgstr ""
 msgid "Membership fee start"
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership fee type deleted"
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership fee type not found"
 msgstr ""
@@ -2351,12 +2350,14 @@ msgstr ""
 #: lib/mv_web/live/group_live/show.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #: lib/mv_web/live/membership_fee_type_live/form.ex
 #: lib/mv_web/live/membership_fee_type_live/index.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/role_live/index.html.heex
 #: lib/mv_web/live/role_live/show.ex
+#: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -2407,6 +2408,7 @@ msgstr ""
 msgid "New amount"
 msgstr ""
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -2694,10 +2696,10 @@ msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr ""
@@ -3294,11 +3296,6 @@ msgstr ""
 msgid "Show in overview"
 msgstr ""
 
-#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
-#, elixir-autogen, elixir-format
-msgid "Show/Hide Columns"
-msgstr ""
-
 #: lib/mv_web/live/auth/sign_in_live.ex
 #, elixir-autogen, elixir-format
 msgid "Sign in"
@@ -3392,10 +3389,10 @@ msgid "Summary"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Suspended"
 msgstr ""
@@ -3701,10 +3698,10 @@ msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
-#: lib/mv_web/member_live/index/membership_fee_status.ex
 #, elixir-autogen, elixir-format
 msgid "Unpaid"
 msgstr ""
@@ -3904,6 +3901,7 @@ msgstr ""
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
 
+#: lib/mv_web/components/core_components.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
@@ -3956,8 +3954,7 @@ msgstr ""
 msgid "You do not have permission to %{action} members."
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "You do not have permission to access this membership fee type"
 msgstr ""
@@ -3973,8 +3970,7 @@ msgstr ""
 msgid "You do not have permission to delete this member"
 msgstr ""
 
-#: lib/mv_web/live/membership_fee_settings_live.ex
-#: lib/mv_web/live/membership_fee_type_live/index.ex
+#: lib/mv_web/helpers/membership_fee_helpers.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "You do not have permission to delete this membership fee type"
 msgstr ""
@@ -4145,3 +4141,75 @@ msgstr "Open"
 msgctxt "status"
 msgid "Open"
 msgstr "Open"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{count} member"
+msgid_plural "%{count} members"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/mv_web/live/components/search_bar_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear search"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact address field"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Compact mode"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View settings"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "include email"
+msgstr ""
+
+#: lib/mv_web/components/core_components.ex
+#, elixir-autogen, elixir-format
+msgid "Reset to default"
+msgstr ""
+
+#: lib/mv_web/live/components/field_visibility_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "Columns"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Loading more members …"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format
+msgid "View"
+msgstr ""
+
+#: lib/mv_web/live/components/view_settings_dropdown_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Compact Member field"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by city"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by last name"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "No address"
+msgstr ""
diff --git a/test/mv_web/member_live/index_bulk_scope_test.exs b/test/mv_web/member_live/index_bulk_scope_test.exs
new file mode 100644
index 00000000..66626539
--- /dev/null
+++ b/test/mv_web/member_live/index_bulk_scope_test.exs
@@ -0,0 +1,71 @@
+defmodule MvWeb.MemberLive.IndexBulkScopeTest do
+  @moduledoc """
+  §1.17 — Bulk "all" scope spans the whole filtered set (re-queried from the DB),
+  not only the loaded/visible page, and the count reflects the full filtered
+  total.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  # More than one keyset page so "loaded" and "all matching" differ.
+  @total 60
+
+  defp seed(n) do
+    actor = SystemActor.get_system_actor()
+
+    Enum.each(1..n, fn i ->
+      idx = String.pad_leading(Integer.to_string(i), 3, "0")
+
+      {:ok, _} =
+        Mv.Membership.create_member(
+          %{first_name: "Bulk#{idx}", last_name: "Scope", email: "bulk#{idx}@example.com"},
+          actor: actor
+        )
+    end)
+  end
+
+  defp scope_badge_text(view) do
+    view
+    |> render()
+    |> LazyHTML.from_fragment()
+    |> LazyHTML.query(~s([data-testid="bulk-actions-scope-badge"]))
+    |> LazyHTML.text()
+    |> String.trim()
+  end
+
+  test "select all selects the whole filtered set, not just the loaded page", %{conn: conn} do
+    seed(@total)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("[phx-click='select_all']") |> render_click()
+
+    # The selection count badge reflects all matching members, not the 50 loaded.
+    assert scope_badge_text(view) == "#{@total}"
+  end
+
+  test "copy-emails with no selection copies every matching member's email", %{conn: conn} do
+    seed(@total)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    result = render_hook(view, "copy_emails", %{})
+
+    # All 60 matching members are copied, not only the 50 loaded rows.
+    assert result =~ "#{@total}"
+  end
+
+  test "select-all then copy copies the whole filtered set", %{conn: conn} do
+    seed(@total)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("[phx-click='select_all']") |> render_click()
+    result = render_hook(view, "copy_emails", %{})
+
+    assert result =~ "#{@total}"
+  end
+end
diff --git a/test/mv_web/member_live/index_filter_panel_test.exs b/test/mv_web/member_live/index_filter_panel_test.exs
new file mode 100644
index 00000000..770c0944
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_panel_test.exs
@@ -0,0 +1,79 @@
+defmodule MvWeb.MemberLive.IndexFilterPanelTest do
+  @moduledoc """
+  §1.18 — The existing "Apply filters" panel is unchanged: same fieldset/legend
+  form structure and payment-status controls, no chip/add-filter-builder
+  paradigm (that is #548). Its filters now resolve DB-side via the `:overview`
+  read action.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Panel", last_name: "Member", email: "panel@example.com"},
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  defp open_filter(view) do
+    view
+    |> element(~s(button[phx-click="toggle_dropdown"][aria-label="Filter members"]))
+    |> render_click()
+  end
+
+  test "the filter panel keeps its fieldset form structure and payment controls", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+    open_filter(view)
+
+    # Semantic form structure (fieldset/legend, radio controls) is preserved.
+    assert has_element?(view, ~s(form[data-testid="member-filter-form"]))
+    assert has_element?(view, "#payment-filter-all")
+    assert has_element?(view, "#payment-filter-paid")
+    assert has_element?(view, "#payment-filter-unpaid")
+  end
+
+  test "no chip / add-filter-builder paradigm is present (#548 is out of scope)", %{conn: conn} do
+    {:ok, view, html} = live(conn, ~p"/members")
+    open_filter(view)
+    html = html <> render(view)
+
+    refute html =~ ~s(data-testid="add-filter")
+    refute html =~ ~s(data-testid="filter-chip")
+    refute html =~ "filter-builder"
+  end
+
+  test "the panel's payment filter resolves DB-side via :overview", %{conn: conn} do
+    system_actor = SystemActor.get_system_actor()
+    fee_type = Mv.Fixtures.create_fee_type(%{interval: :yearly}, system_actor)
+    last_year_start = Date.new!(Date.utc_today().year - 1, 1, 1)
+
+    {:ok, paid} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "PaidPanel",
+          last_name: "X",
+          email: "paidpanel@example.com",
+          membership_fee_type_id: fee_type.id
+        },
+        actor: system_actor
+      )
+
+    Mv.Fixtures.create_cycle(
+      paid,
+      fee_type,
+      %{cycle_start: last_year_start, status: :paid, replace_existing: true},
+      system_actor
+    )
+
+    {:ok, _view, html} = live(conn, ~p"/members?cycle_status_filter=paid")
+
+    assert html =~ "PaidPanel"
+    refute html =~ "Panel Member"
+  end
+end
diff --git a/test/mv_web/member_live/index_live_region_test.exs b/test/mv_web/member_live/index_live_region_test.exs
new file mode 100644
index 00000000..152e5eed
--- /dev/null
+++ b/test/mv_web/member_live/index_live_region_test.exs
@@ -0,0 +1,68 @@
+defmodule MvWeb.MemberLive.IndexLiveRegionTest do
+  @moduledoc """
+  §1.9 — The polite live region announces the exact total matching count,
+  computed via a count query for the active filter set.
+  §1.10 — The live region element exists in the DOM before it is filled, and the
+  table region carries `aria-busy`.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  defp seed(n) do
+    actor = SystemActor.get_system_actor()
+
+    Enum.each(1..n, fn i ->
+      idx = String.pad_leading(Integer.to_string(i), 3, "0")
+
+      {:ok, _} =
+        Mv.Membership.create_member(
+          %{first_name: "Lr#{idx}", last_name: "Region", email: "lr#{idx}@example.com"},
+          actor: actor
+        )
+    end)
+  end
+
+  test "polite live region exists on first render and announces the exact total", %{conn: conn} do
+    seed(60)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Present-before-fill: the live region element is in the initial DOM.
+    assert has_element?(view, "#members-result-count[aria-live='polite']")
+    # Exact total, not the loaded page size (60 matched, only 50 loaded).
+    region = view |> element("#members-result-count") |> render()
+    assert region =~ "60 members"
+  end
+
+  test "table region binds aria-busy to the loading flag (settled after load)", %{conn: conn} do
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # aria-busy is bound to @loading? (`to_string(@loading?)`), not hardcoded: once
+    # the page has loaded the region is not busy. It is set true across a
+    # filter/sort/search reload patch (push_reload/2, §1.10).
+    assert has_element?(view, "[data-testid='members-table-scroll'][aria-busy='false']")
+  end
+
+  test "count reflects the active filter set, not the whole table", %{conn: conn} do
+    actor = SystemActor.get_system_actor()
+
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Findme", last_name: "Unique", email: "findme@example.com"},
+        actor: actor
+      )
+
+    seed(5)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members?query=Findme")
+
+    # Only the single matching member is counted (1 of 6 total).
+    region = view |> element("#members-result-count") |> render()
+    assert region =~ "1 member"
+    refute region =~ "6 member"
+  end
+end
diff --git a/test/mv_web/member_live/index_pagination_test.exs b/test/mv_web/member_live/index_pagination_test.exs
new file mode 100644
index 00000000..e21a5531
--- /dev/null
+++ b/test/mv_web/member_live/index_pagination_test.exs
@@ -0,0 +1,96 @@
+defmodule MvWeb.MemberLive.IndexPaginationTest do
+  @moduledoc """
+  §1.7 — Mount loads only one keyset page, not the whole table.
+  §1.8 — phx-viewport-bottom fetches and appends the next page; once the last
+  page is reached no further fetch is issued.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  require Ash.Query
+
+  alias Mv.Helpers.SystemActor
+
+  # Matches the :overview default_limit / @page_limit in the LiveView.
+  @page_limit 50
+
+  defp seed_members(n) do
+    actor = SystemActor.get_system_actor()
+
+    Enum.each(1..n, fn i ->
+      # Zero-padded names keep first_name-ascending order deterministic.
+      idx = String.pad_leading(Integer.to_string(i), 4, "0")
+
+      {:ok, _} =
+        Mv.Membership.create_member(
+          %{first_name: "Page#{idx}", last_name: "Member", email: "page#{idx}@example.com"},
+          actor: actor
+        )
+    end)
+  end
+
+  defp row_count(html) do
+    ~r/<tr[^>]*id="row-/ |> Regex.scan(html) |> length()
+  end
+
+  test "mount loads exactly one page when more members exist", %{conn: conn} do
+    seed_members(@page_limit + 10)
+    conn = conn_with_oidc_user(conn)
+    {:ok, _view, html} = live(conn, ~p"/members")
+
+    assert row_count(html) == @page_limit
+    # More rows remain, so the infinite-scroll sentinel is armed.
+    assert html =~ ~s(phx-viewport-bottom="load_more")
+  end
+
+  test "viewport-bottom appends the next page and stops at the last page", %{conn: conn} do
+    seed_members(@page_limit + 10)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, html} = live(conn, ~p"/members")
+
+    assert row_count(html) == @page_limit
+
+    # Fetch the next page: the remaining rows are appended to the stream.
+    html_after = render_hook(view, "load_more", %{})
+    assert row_count(html_after) == @page_limit + 10
+
+    # Last page reached: the sentinel is disarmed and a further fetch is a no-op.
+    refute html_after =~ ~s(phx-viewport-bottom="load_more")
+    html_again = render_hook(view, "load_more", %{})
+    assert row_count(html_again) == @page_limit + 10
+  end
+
+  test "selecting a row from a later page re-renders it as checked", %{conn: conn} do
+    seed_members(@page_limit + 10)
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Load the second page so its rows are in the loaded window.
+    render_hook(view, "load_more", %{})
+
+    # The highest-index member sorts last and lives on the second page.
+    actor = SystemActor.get_system_actor()
+
+    last_member =
+      Mv.Membership.Member
+      |> Ash.Query.sort(first_name: :asc)
+      |> Ash.read!(actor: actor)
+      |> List.last()
+
+    html = render_click(view, "select_member", %{"id" => last_member.id})
+
+    # The re-streamed row for a later-page member reflects the selection.
+    assert html =~ ~s(id="row-#{last_member.id}")
+    assert has_element?(view, ~s(tr#row-#{last_member.id} input[type="checkbox"][checked]))
+  end
+
+  test "single page does not arm the infinite-scroll sentinel", %{conn: conn} do
+    seed_members(3)
+    conn = conn_with_oidc_user(conn)
+    {:ok, _view, html} = live(conn, ~p"/members")
+
+    assert row_count(html) == 3
+    refute html =~ ~s(phx-viewport-bottom="load_more")
+  end
+end
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index 19855349..8f31beb1 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -306,7 +306,8 @@ defmodule MvWeb.MemberLive.IndexTest do
     # asserted on internal state to preserve the original coverage of the callback.
     assigns = :sys.get_state(view.pid).socket.assigns
     assert assigns.query == "Friedrich"
-    assert is_list(assigns.members)
+    # Loaded members are held as a `%{id => member}` map (the restream lookup window).
+    assert is_map(assigns.members)
   end
 
   @tag :ui
@@ -1069,6 +1070,63 @@ defmodule MvWeb.MemberLive.IndexTest do
       assert bcc =~ "scope1%40example.com"
       refute bcc =~ "scope2%40example.com"
     end
+
+    test "selecting a member does not read the DB for mailto recipients (deferred to open)",
+         %{conn: conn, member1: member1} do
+      conn = conn_with_oidc_user(conn)
+      {:ok, view, _html} = live(conn, "/members")
+
+      # A checkbox toggle is a non-search interaction; it must not issue a member
+      # read just to precompute a mailto link the user may never open. The
+      # recipient list is fetched lazily when the bulk-actions dropdown opens.
+      member_reads =
+        capture_member_select_queries(fn ->
+          render_click(view, "select_member", %{"id" => member1.id})
+        end)
+
+      assert member_reads == [],
+             "select_member must not read members for the mailto recipients; got: #{inspect(member_reads)}"
+
+      # Opening the dropdown still surfaces the correct recipients for the selection.
+      bcc = mailto_bcc(view)
+      assert bcc =~ "scope1%40example.com"
+      refute bcc =~ "scope2%40example.com"
+    end
+
+    # Captures every SELECT against the members table emitted while `fun` runs.
+    defp capture_member_select_queries(fun) do
+      test_pid = self()
+      handler_id = "test-member-select-#{System.unique_integer([:positive])}"
+
+      :telemetry.attach(
+        handler_id,
+        [:mv, :repo, :query],
+        fn _event, _measurements, metadata, _config ->
+          sql = metadata[:query] || ""
+
+          if String.contains?(sql, "SELECT") and String.contains?(sql, "\"members\"") do
+            send(test_pid, {:member_query, sql})
+          end
+        end,
+        nil
+      )
+
+      try do
+        fun.()
+      after
+        :telemetry.detach(handler_id)
+      end
+
+      collect_member_queries([])
+    end
+
+    defp collect_member_queries(acc) do
+      receive do
+        {:member_query, sql} -> collect_member_queries([sql | acc])
+      after
+        0 -> Enum.reverse(acc)
+      end
+    end
   end
 
   describe "cycle status filter" do
@@ -2372,12 +2430,12 @@ defmodule MvWeb.MemberLive.IndexTest do
       # Should complete in less than 1 second (1000ms)
       assert duration < 1000, "Filter took #{duration}ms, expected < 1000ms"
 
-      # Verify filtering worked correctly - should show all true members
-      Enum.each(1..75, fn i ->
-        assert html =~ "TrueMember#{i}"
-      end)
+      # The overview now keyset-paginates: mount loads only the first page, not
+      # the whole filtered set (§1.7). The filter still resolves DB-side, so the
+      # loaded page contains only matching (true) members and never a non-matching
+      # (false) one.
+      assert html =~ "TrueMember"
 
-      # Should not show false members
       Enum.each(1..75, fn i ->
         refute html =~ "FalseMember#{i}"
       end)

From af2cc2e0d492447d3d9d81901cb1575cf552faf1 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 3 Jul 2026 11:35:46 +0200
Subject: [PATCH 06/30] feat(member): condense the overview into composite name
 and address cells

---
 assets/css/app.css                            | 184 ++++++++++++++++++
 lib/mv_web/components/core_components.ex      |  16 +-
 .../live/components/search_bar_component.ex   |  17 ++
 lib/mv_web/live/member_live/index.html.heex   |  78 ++++++--
 .../member_live/index/field_visibility.ex     |  27 ++-
 lib/mv_web/translations/member_fields.ex      |   2 +
 .../components/sort_header_component_test.exs |  75 ++++---
 .../index/field_visibility_test.exs           |  26 +--
 .../member_live/index_address_cell_test.exs   |  87 +++++++++
 .../index_custom_fields_sorting_test.exs      |  10 +-
 .../index_default_columns_test.exs            |  58 ++++++
 .../index_field_visibility_test.exs           |  20 +-
 .../index_groups_url_params_test.exs          |   5 +-
 .../index_member_fields_display_test.exs      |  15 +-
 .../member_live/index_search_clear_test.exs   |  56 ++++++
 .../member_live/index_sticky_pinned_test.exs  |  56 ++++++
 test/mv_web/member_live/index_test.exs        |  77 ++++++--
 17 files changed, 716 insertions(+), 93 deletions(-)
 create mode 100644 test/mv_web/member_live/index_address_cell_test.exs
 create mode 100644 test/mv_web/member_live/index_default_columns_test.exs
 create mode 100644 test/mv_web/member_live/index_search_clear_test.exs
 create mode 100644 test/mv_web/member_live/index_sticky_pinned_test.exs

diff --git a/assets/css/app.css b/assets/css/app.css
index 611e9ad1..37091909 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -678,6 +678,78 @@
 
 /* This file is for your main application CSS */
 
+/* ============================================
+   Table header density scaling
+   ============================================ */
+
+/*
+ * DaisyUI table size modifiers (table-xs, table-sm, etc.) scope their font-size
+ * rule to ":not(thead, tfoot) tr", so the header row stays at the base 0.875 rem
+ * regardless of the chosen density. We extend each modifier to thead so the
+ * header scales together with the body.
+ */
+.table.table-xs thead tr { font-size: 0.6875rem; }
+.table.table-sm thead tr { font-size: 0.75rem; }
+.table.table-lg thead tr { font-size: 1.125rem; }
+.table.table-xl thead tr { font-size: 1.375rem; }
+
+/*
+ * Density-tracking badges and sort icons in the member overview.
+ *
+ * The member table renders its rows via LiveView streams, so toggling density
+ * only swaps the <table> size class (table-xs <-> table-md); it does NOT
+ * re-render the streamed rows. A per-row `size=` conditional therefore bakes a
+ * stale badge size into the streamed DOM. To make badges (and, for visual
+ * consistency, the header sort glyphs) follow the density toggle without any
+ * row re-render, their size is driven purely from the table size class here.
+ *
+ * Badge values mirror daisyUI's own .badge-xs / .badge-md (font-size, --size
+ * which the base .badge uses for height, and padding-inline). Scoped to the
+ * member overview via #members-keyboard so unrelated badges are unaffected.
+ */
+#members-keyboard .table.table-xs .badge {
+  --size: calc(var(--size-selector, 0.25rem) * 4);
+  font-size: 0.625rem;
+  padding-inline: calc(0.25rem * 2 - var(--border));
+}
+#members-keyboard .table.table-md .badge {
+  --size: calc(var(--size-selector, 0.25rem) * 6);
+  font-size: 0.875rem;
+  padding-inline: calc(0.25rem * 3 - var(--border));
+}
+
+/* Sort glyphs scale with the header text (11px compact / 14px comfortable). */
+#members-keyboard .table.table-md thead .sort-icon {
+  width: 1.5rem;
+  height: 1.5rem;
+}
+#members-keyboard .table.table-xs thead .sort-icon {
+  width: 1.125rem;
+  height: 1.125rem;
+}
+
+/*
+ * Infinite-scroll loading row.
+ *
+ * The loading indicator must read like a full, accented data row rather than a
+ * narrow pinned bar. The accent (base-200 background + a top separator) and the
+ * padding live on the full-width footer cell, which spans every column via
+ * colspan, so the accent is visible edge-to-edge even while the table is scrolled
+ * horizontally. The spinner + label inside stay pinned to the visible viewport
+ * width (StickyViewportWidth hook) and transparent, so they remain centered on
+ * horizontal scroll while the cell accent shows through behind them.
+ *
+ * The row height tracks the active density (table-xs compact / table-md
+ * comfortable) so it matches a normal data row in each mode.
+ */
+#members-footer > tr > td {
+  background-color: var(--color-base-200);
+  border-top: 1px solid var(--color-base-300);
+  padding: 0;
+}
+.table.table-xs #members-loading-bar { min-height: 3.375rem; }
+.table.table-md #members-loading-bar { min-height: 4.1875rem; }
+
 /* ============================================
    SortableList: drag-and-drop table rows
    ============================================ */
@@ -773,3 +845,115 @@
 [data-sticky-first-col-rows="true"] .table.table-zebra tbody tr input.checkbox:focus:not(:focus-visible) {
   outline: none;
 }
+
+/*
+ * Sticky checkbox column: border-collapse: separate avoids the Chromium artifact
+ * where a collapsed row border is repainted (a spurious 1px line) under a
+ * position: sticky cell. The row separators are moved onto the cells so they
+ * still render in the separate model (matching DaisyUI's faint divider color).
+ */
+[data-sticky-first-col-rows="true"] .table.table-zebra {
+  border-collapse: separate;
+  border-spacing: 0;
+}
+[data-sticky-first-col-rows="true"]
+  .table.table-zebra
+  :where(thead tr, tbody tr:not(:last-child))
+  > :where(th, td) {
+  border-bottom: var(--border) solid color-mix(in oklch, var(--color-base-content) 5%, #0000);
+}
+
+/*
+ * Horizontal-scroll fade for the pinned checkbox column: instead of hiding the
+ * scrolled-away content behind a hard opaque block, a gradient on the right edge
+ * of the sticky cell fades the incoming content, signalling there is more behind
+ * it. overflow: visible lets the ::after gradient extend past the cell; the cell
+ * keeps its own (zebra) background so the checkbox stays legible.
+ */
+[data-sticky-first-col-rows="true"] .table.table-zebra td.sticky-first-col-cell {
+  overflow: visible;
+}
+[data-sticky-first-col-rows="true"] .table.table-zebra td.sticky-first-col-cell::after,
+[data-sticky-first-col-rows="true"] .table.table-zebra thead th.sticky-first-col-th::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 100%;
+  width: 1.25rem;
+  pointer-events: none;
+}
+[data-sticky-first-col-rows="true"]
+  .table.table-zebra
+  tbody
+  tr:nth-child(odd)
+  > td.sticky-first-col-cell::after {
+  background: linear-gradient(to right, var(--color-base-100), transparent);
+}
+[data-sticky-first-col-rows="true"]
+  .table.table-zebra
+  tbody
+  tr:nth-child(even)
+  > td.sticky-first-col-cell::after {
+  background: linear-gradient(to right, var(--color-base-200), transparent);
+}
+[data-sticky-first-col-rows="true"]
+  .table.table-zebra
+  tbody
+  tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible))
+  > td.sticky-first-col-cell::after {
+  background: linear-gradient(to right, var(--color-base-300), transparent);
+}
+[data-sticky-first-col-rows="true"] .table.table-zebra thead th.sticky-first-col-th::after {
+  background: linear-gradient(to right, var(--color-base-100), transparent);
+}
+/* Compact density: narrower fade so the gradient does not visually reach into the
+   checkbox column's own content area in the tighter table-xs cell. */
+[data-sticky-first-col-rows="true"] .table.table-zebra.table-xs td.sticky-first-col-cell::after,
+[data-sticky-first-col-rows="true"] .table.table-zebra.table-xs thead th.sticky-first-col-th::after {
+  width: 0.5rem;
+}
+
+/*
+ * Sort-header tooltip. Rendered via the native Popover API (see the SortTooltip
+ * JS hook), so it lives in the browser TOP LAYER: it is not clipped by the
+ * members table's overflow (overflow-x:auto forces overflow-y:auto, which used
+ * to clip a CSS pseudo-tooltip below the header) and paints above the sticky
+ * header, neighbor cells, and the pinned checkbox column's fade — without any
+ * z-index hacks. This block only resets the popover UA defaults and gives it a
+ * small daisyUI-flavoured tooltip look; the JS hook sets top/left each show.
+ */
+.sort-tooltip {
+  position: fixed;
+  inset: auto;
+  margin: 0;
+  border: 0;
+  padding: 0.25rem 0.5rem;
+  width: max-content;
+  max-width: 16rem;
+  overflow: visible;
+  background: var(--color-neutral, oklch(0.2 0 0));
+  color: var(--color-neutral-content, oklch(0.98 0 0));
+  font-size: 0.75rem;
+  line-height: 1rem;
+  border-radius: 0.25rem;
+  box-shadow: 0 1px 3px rgb(0 0 0 / 0.3);
+  pointer-events: none;
+}
+
+/*
+ * Vertically center the row checkbox in the sticky first column using the
+ * table-native vertical-align: middle. This keeps display: table-cell intact so
+ * the cell background fills the full row height (no white gap at the bottom).
+ * The fieldset margin-bottom reset removes the mb-2 from the shared input
+ * component so no residual margin shifts the checkbox off-center.
+ */
+[data-sticky-first-col-rows="true"] .table.table-zebra td.sticky-first-col-cell,
+[data-sticky-first-col-rows="true"] .table.table-zebra thead th.sticky-first-col-th {
+  vertical-align: middle;
+}
+[data-sticky-first-col-rows="true"] .table.table-zebra td.sticky-first-col-cell fieldset,
+[data-sticky-first-col-rows="true"] .table.table-zebra thead th.sticky-first-col-th fieldset {
+  margin-bottom: 0;
+}
+
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index d01b3d63..7af829a8 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -953,6 +953,11 @@ defmodule MvWeb.CoreComponents do
     doc:
       "when true, first header/body column gets sticky left positioning to keep selection controls visible"
 
+  attr :sticky_second_col, :boolean,
+    default: false,
+    doc:
+      "when true, the second column is also pinned left (e.g. an identifier column kept visible while scrolling horizontally)"
+
   attr :viewport_bottom, :any,
     default: nil,
     doc:
@@ -1018,7 +1023,9 @@ defmodule MvWeb.CoreComponents do
               :for={{col, col_idx} <- Enum.with_index(@col)}
               class={[
                 table_th_class(col, @sticky_header),
-                @sticky_first_col && col_idx == 0 && "sticky left-0 z-30 bg-base-100"
+                @sticky_first_col && col_idx == 0 &&
+                  "sticky-first-col-th sticky left-0 z-30 bg-base-100",
+                @sticky_second_col && col_idx == 1 && "sticky left-12 z-30 bg-base-100"
               ]}
               aria-sort={table_th_aria_sort(col, @sort_field, @sort_order)}
             >
@@ -1079,6 +1086,13 @@ defmodule MvWeb.CoreComponents do
                     classes
                   end
 
+                classes =
+                  if @sticky_second_col && col_idx == 1 do
+                    ["sticky left-12 z-20 bg-base-100" | classes]
+                  else
+                    classes
+                  end
+
                 classes =
                   if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do
                     ["truncate" | classes]
diff --git a/lib/mv_web/live/components/search_bar_component.ex b/lib/mv_web/live/components/search_bar_component.ex
index ac03a637..d31c563e 100644
--- a/lib/mv_web/live/components/search_bar_component.ex
+++ b/lib/mv_web/live/components/search_bar_component.ex
@@ -49,6 +49,17 @@ defmodule MvWeb.Components.SearchBarComponent do
           phx-target={@myself}
           phx-debounce="300"
         />
+        <button
+          :if={@query not in [nil, ""]}
+          type="button"
+          phx-click="clear_search"
+          phx-target={@myself}
+          data-testid="search-clear"
+          aria-label={gettext("Clear search")}
+          class="opacity-50 hover:opacity-100 cursor-pointer"
+        >
+          <.icon name="hero-x-mark" class="h-[1em]" />
+        </button>
       </label>
     </form>
     """
@@ -61,4 +72,10 @@ defmodule MvWeb.Components.SearchBarComponent do
     send(self(), {:search_changed, q})
     {:noreply, assign(socket, :query, q)}
   end
+
+  # Clears the query and resets the result set to the unfiltered list (§1.3).
+  def handle_event("clear_search", _params, socket) do
+    send(self(), {:search_changed, ""})
+    {:noreply, assign(socket, :query, "")}
+  end
 end
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index d9049146..55bf93f5 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -149,6 +149,48 @@
           role="checkbox"
         />
       </:col>
+      <:col
+        :let={member}
+        :if={:name in @member_fields_visible}
+        label={gettext("Name")}
+      >
+        <% full_name =
+          [member.first_name, member.last_name]
+          |> Enum.reject(&(&1 in [nil, ""]))
+          |> Enum.join(" ") %>
+        <div data-testid="member-name">
+          <div class="font-medium truncate" title={full_name}>
+            {full_name}
+          </div>
+          <div
+            :if={member.email not in [nil, ""]}
+            class="opacity-70 truncate"
+            title={member.email}
+          >
+            {member.email}
+          </div>
+        </div>
+      </:col>
+      <:col
+        :let={member}
+        :if={:address in @member_fields_visible}
+        label={gettext("Address")}
+      >
+        <% line1 =
+          [member.street, member.house_number]
+          |> Enum.reject(&(&1 in [nil, ""]))
+          |> Enum.join(" ") %>
+        <% line2 =
+          [member.postal_code, member.city]
+          |> Enum.reject(&(&1 in [nil, ""]))
+          |> Enum.join(" ") %>
+        <.maybe_value value={line1 <> line2} empty_sr_text={gettext("No address")}>
+          <div data-testid="member-address">
+            <div class="truncate" title={line1}>{line1}</div>
+            <div class="opacity-70 truncate" title={line2}>{line2}</div>
+          </div>
+        </.maybe_value>
+      </:col>
       <:col
         :let={member}
         :if={:first_name in @member_fields_visible}
@@ -280,7 +322,9 @@
           """
         }
       >
-        {member.city}
+        <.maybe_value value={member.city} empty_sr_text={gettext("Not specified")}>
+          {member.city}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -298,7 +342,9 @@
           """
         }
       >
-        {member.street}
+        <.maybe_value value={member.street} empty_sr_text={gettext("Not specified")}>
+          {member.street}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -316,7 +362,9 @@
           """
         }
       >
-        {member.house_number}
+        <.maybe_value value={member.house_number} empty_sr_text={gettext("Not specified")}>
+          {member.house_number}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -334,7 +382,9 @@
           """
         }
       >
-        {member.postal_code}
+        <.maybe_value value={member.postal_code} empty_sr_text={gettext("Not specified")}>
+          {member.postal_code}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -407,15 +457,17 @@
         }
       >
         <.maybe_value value={member.groups} empty_sr_text={gettext("No group assignment")}>
-          <%= for group <- (member.groups || []) do %>
-            <.badge
-              variant="primary"
-              style="outline"
-              aria-label={gettext("Member of group %{name}", name: group.name)}
-            >
-              {group.name}
-            </.badge>
-          <% end %>
+          <div class="flex flex-wrap gap-1 w-max">
+            <%= for group <- (member.groups || []) do %>
+              <.badge
+                variant="primary"
+                style="outline"
+                aria-label={gettext("Member of group %{name}", name: group.name)}
+              >
+                {group.name}
+              </.badge>
+            <% end %>
+          </div>
         </.maybe_value>
       </:col>
       <:action :let={member}>
diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex
index 52ebe86f..8db026d5 100644
--- a/lib/mv_web/live/member_live/index/field_visibility.ex
+++ b/lib/mv_web/live/member_live/index/field_visibility.ex
@@ -29,7 +29,28 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
 
   # Single UI key for "Membership Fee Status"; only this appears in the dropdown.
   # Groups and membership_fee_type are also pseudo fields (not in member_fields(), displayed in the table).
-  @pseudo_member_fields [:membership_fee_status, :membership_fee_type, :groups]
+  # :name and :address are composite display-only columns (Name = name + email,
+  # Address = street/house number over postal code/city).
+  @pseudo_member_fields [:membership_fee_status, :membership_fee_type, :groups, :name, :address]
+
+  # Curated default-visible column set (§1.2): the columns shown on first visit
+  # when there is no persisted selection and no global override. Everything else
+  # (the individual name/address sub-fields, notes, dates other than join date)
+  # defaults to hidden so the table fits common desktop widths.
+  @default_visible_fields MapSet.new([
+                            :name,
+                            :address,
+                            :membership_fee_type,
+                            :membership_fee_status,
+                            :groups,
+                            :join_date
+                          ])
+
+  @doc """
+  The curated default-visible columns (member-field atoms) for a first visit.
+  """
+  @spec default_visible_fields() :: [atom()]
+  def default_visible_fields, do: MapSet.to_list(@default_visible_fields)
 
   # Export/API may accept this as alias; must not appear in the UI options list.
   @export_only_alias :payment_status
@@ -276,13 +297,13 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
     domain_map =
       Enum.reduce(domain_fields, %{}, fn field, acc ->
         field_string = Atom.to_string(field)
-        default_visibility = if field == :exit_date, do: false, else: true
+        default_visibility = MapSet.member?(@default_visible_fields, field)
         show_in_overview = Map.get(visibility_config, field, default_visibility)
         Map.put(acc, field_string, show_in_overview)
       end)
 
     Enum.reduce(@pseudo_member_fields, domain_map, fn field, acc ->
-      Map.put(acc, Atom.to_string(field), true)
+      Map.put(acc, Atom.to_string(field), MapSet.member?(@default_visible_fields, field))
     end)
   end
 
diff --git a/lib/mv_web/translations/member_fields.ex b/lib/mv_web/translations/member_fields.ex
index fa7abff8..9fd620c3 100644
--- a/lib/mv_web/translations/member_fields.ex
+++ b/lib/mv_web/translations/member_fields.ex
@@ -32,6 +32,8 @@ defmodule MvWeb.Translations.MemberFields do
   def label(:membership_fee_status), do: gettext("Membership Fee Status")
   def label(:membership_fee_type), do: gettext("Fee Type")
   def label(:groups), do: gettext("Groups")
+  def label(:name), do: gettext("Name")
+  def label(:address), do: gettext("Address")
 
   # Fallback for unknown fields
   def label(field) do
diff --git a/test/mv_web/components/sort_header_component_test.exs b/test/mv_web/components/sort_header_component_test.exs
index 0a7bf806..955c3c3f 100644
--- a/test/mv_web/components/sort_header_component_test.exs
+++ b/test/mv_web/components/sort_header_component_test.exs
@@ -2,10 +2,14 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   use MvWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
 
+  # The curated default columns hide the individual name/address sort headers,
+  # so these component tests make every sortable field visible via ?fields=.
+  @cols "first_name,email,street,house_number,postal_code,city,country,join_date"
+
   describe "rendering" do
     test "renders with correct attributes", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test that the component renders with correct attributes
       assert has_element?(view, "[data-testid='first_name']")
@@ -15,7 +19,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "renders all sortable headers", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       sortable_fields = [
         :first_name,
@@ -35,7 +39,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "renders correct labels", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test specific labels
       assert has_element?(view, "button[phx-value-field='first_name']", "First name")
@@ -47,7 +51,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   describe "sort icons" do
     test "shows neutral icon for specific field when not sorted", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # The neutral icon has the opcity class we can test for
       # Test that EMAIL field specifically shows neutral icon
@@ -59,7 +63,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "shows ascending icon for specific field when sorted ascending", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members?query=&sort_field=city&sort_order=asc")
+
+      {:ok, view, html} =
+        live(conn, "/members?fields=#{@cols}&query=&sort_field=city&sort_order=asc")
 
       # Test that FIRST_NAME field specifically shows ascending icon
       # Test CSS classes - no opacity for active state
@@ -80,7 +86,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "shows descending icon for specific field when sorted descending", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, _view, html} = live(conn, "/members?query=&sort_field=email&sort_order=desc")
+
+      {:ok, _view, html} =
+        live(conn, "/members?fields=#{@cols}&query=&sort_field=email&sort_order=desc")
 
       # Count occurrences to ensure only one descending sort icon. Dropdown
       # triggers carry their own trailing "hero-chevron-down size-4" chevron, so
@@ -92,7 +100,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "multiple fields can have different icon states", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=&sort_field=city&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=#{@cols}&query=&sort_field=city&sort_order=asc")
 
       # CITY field should be active (ascending)
       refute has_element?(view, "[data-testid='city'] .opacity-40")
@@ -109,7 +119,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "icon state changes correctly when clicking different fields", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Start: all fields neutral except first name as default
       assert has_element?(view, "[data-testid='city'] .opacity-40")
@@ -139,15 +149,19 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
       conn = conn_with_oidc_user(conn)
 
       # Test EMAIL field specifically
-      {:ok, view, html_asc} = live(conn, "/members?sort_field=email&sort_order=asc")
+      {:ok, view, html_asc} =
+        live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=asc")
+
       assert html_asc =~ "hero-chevron-up"
       refute has_element?(view, "[data-testid='email'] .opacity-40")
 
-      {:ok, view, html_desc} = live(conn, "/members?sort_field=email&sort_order=desc")
+      {:ok, view, html_desc} =
+        live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=desc")
+
       assert html_desc =~ "hero-chevron-down"
       refute has_element?(view, "[data-testid='email'] .opacity-40")
 
-      {:ok, view, html_neutral} = live(conn, "/members")
+      {:ok, view, html_neutral} = live(conn, "/members?fields=#{@cols}")
       assert html_neutral =~ "hero-chevron-up-down"
       assert has_element?(view, "[data-testid='email'] .opacity-40")
     end
@@ -156,7 +170,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
       conn = conn_with_oidc_user(conn)
 
       # Test neutral state - only one field should have active sort icon
-      {:ok, _view, html_neutral} = live(conn, "/members")
+      {:ok, _view, html_neutral} = live(conn, "/members?fields=#{@cols}")
 
       # Count active icons (should be exactly 1 - ascending for default sort field)
       up_count = html_neutral |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1)
@@ -166,7 +180,8 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
       assert down_count == 0, "Expected 0 descending icons, got #{down_count}"
 
       # Test descending state
-      {:ok, _view, html_desc} = live(conn, "/members?sort_field=first_name&sort_order=desc")
+      {:ok, _view, html_desc} =
+        live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=desc")
 
       up_count = html_desc |> String.split("hero-chevron-up ") |> length() |> Kernel.-(1)
       down_count = active_sort_down_count(html_desc)
@@ -190,7 +205,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   describe "accessibility" do
     test "sets aria-label correctly for unsorted state", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Check aria-label for unsorted state
       assert has_element?(view, "button[phx-value-field='city'][aria-label='Click to sort']")
@@ -198,7 +213,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "sets aria-label correctly for ascending sort", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?sort_field=first_name&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=asc")
 
       # Check aria-label for ascending sort
       assert has_element?(view, "button[phx-value-field='first_name'][aria-label='ascending']")
@@ -206,7 +223,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "sets aria-label correctly for descending sort", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?sort_field=first_name&sort_order=desc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=desc")
 
       # Check aria-label for descending sort
       assert has_element?(view, "button[phx-value-field='first_name'][aria-label='descending']")
@@ -214,7 +233,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "includes tooltip with correct aria-label", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?sort_field=first_name&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=asc")
 
       # Check that tooltip div exists with correct data-tip
       assert has_element?(view, "[data-testid='first_name']")
@@ -223,7 +244,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "aria-labels work for all sortable fields", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?sort_field=email&sort_order=desc")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=desc")
 
       # Test aria-labels for different fields
       assert has_element?(view, "button[phx-value-field='email'][aria-label='descending']")
@@ -240,7 +261,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   describe "component behavior" do
     test "clicking triggers sort event on parent LiveView", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Click on the first name sort header
       view
@@ -253,7 +274,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "component handles different field types correctly", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test that different field types render correctly
       assert has_element?(view, "button[phx-value-field='first_name']")
@@ -265,7 +286,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   describe "edge cases" do
     test "handles invalid sort field gracefully", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members?sort_field=invalid_field&sort_order=asc")
+
+      {:ok, view, html} =
+        live(conn, "/members?fields=#{@cols}&sort_field=invalid_field&sort_order=asc")
 
       # Should not crash and should default sorting for first name
       assert html =~ "hero-chevron-up-down"
@@ -274,7 +297,9 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "handles invalid sort order gracefully", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members?sort_field=first_name&sort_order=invalid")
+
+      {:ok, view, html} =
+        live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=invalid")
 
       # Should default to ascending
       assert html =~ "hero-chevron-up"
@@ -283,7 +308,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "handles empty sort parameters", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members?sort_field=&sort_order=")
+      {:ok, view, html} = live(conn, "/members?fields=#{@cols}&sort_field=&sort_order=")
 
       # Should show neutral icons
       assert html =~ "hero-chevron-up-down"
@@ -294,7 +319,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
   describe "icon state transitions" do
     test "icon changes when sorting state changes", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Start with neutral state
       assert has_element?(view, "[data-testid='city'] .opacity-40")
@@ -310,7 +335,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
     test "multiple fields can be tested for icon states", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members?sort_field=email&sort_order=desc")
+      {:ok, view, html} = live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=desc")
 
       # Email should be active (descending)
       assert html =~ "hero-chevron-down"
diff --git a/test/mv_web/live/member_live/index/field_visibility_test.exs b/test/mv_web/live/member_live/index/field_visibility_test.exs
index d86893d9..427cbead 100644
--- a/test/mv_web/live/member_live/index/field_visibility_test.exs
+++ b/test/mv_web/live/member_live/index/field_visibility_test.exs
@@ -89,17 +89,19 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
       assert result["email"] == true
     end
 
-    test "defaults to true when field not in settings" do
+    test "defaults to the curated set when field not in settings" do
       user_selection = %{}
-      settings = %{member_field_visibility: %{first_name: false}}
+      settings = %{member_field_visibility: %{join_date: false}}
       custom_fields = []
 
       result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
 
-      # first_name from settings
-      assert result["first_name"] == false
-      # email defaults to true (not in settings)
-      assert result["email"] == true
+      # join_date from settings overrides its curated default
+      assert result["join_date"] == false
+      # name is in the curated default set -> visible
+      assert result["name"] == true
+      # email is not in the curated default set -> hidden
+      assert result["email"] == false
     end
 
     test "handles custom fields visibility" do
@@ -160,9 +162,9 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
 
       result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
 
-      # Should default all fields to true
-      assert result["first_name"] == true
-      assert result["email"] == true
+      # Falls back to the curated default set (no crash on nil)
+      assert result["join_date"] == true
+      assert result["email"] == false
     end
 
     test "handles missing member_field_visibility key" do
@@ -172,9 +174,9 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
 
       result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
 
-      # Should default all fields to true
-      assert result["first_name"] == true
-      assert result["email"] == true
+      # Falls back to the curated default set
+      assert result["join_date"] == true
+      assert result["email"] == false
     end
 
     test "includes all fields in result" do
diff --git a/test/mv_web/member_live/index_address_cell_test.exs b/test/mv_web/member_live/index_address_cell_test.exs
new file mode 100644
index 00000000..53d8dc04
--- /dev/null
+++ b/test/mv_web/member_live/index_address_cell_test.exs
@@ -0,0 +1,87 @@
+defmodule MvWeb.MemberLive.IndexAddressCellTest do
+  @moduledoc """
+  §1.1 — The address renders as one composite cell: line 1 = street + house
+  number, line 2 = postal code + city.
+  §1.12 — City and postal code stay findable via search despite the composite
+  cell.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  defp create_member(attrs) do
+    {:ok, member} =
+      Mv.Membership.create_member(
+        Map.merge(
+          %{first_name: "Addr", last_name: "Tester", email: "addr@example.com"},
+          attrs
+        ),
+        actor: SystemActor.get_system_actor()
+      )
+
+    member
+  end
+
+  test "address shows as one cell with street/house on line 1 and postal/city on line 2", %{
+    conn: conn
+  } do
+    member =
+      create_member(%{
+        street: "Hauptstraße",
+        house_number: "12a",
+        postal_code: "10115",
+        city: "Berlin"
+      })
+
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    cell =
+      view
+      |> element("#row-#{member.id} [data-testid='member-address']")
+      |> render()
+
+    assert cell =~ "Hauptstraße"
+    assert cell =~ "12a"
+    assert cell =~ "10115"
+    assert cell =~ "Berlin"
+
+    # Composite, not four separate sortable address columns.
+    refute has_element?(view, "[data-testid='street']")
+    refute has_element?(view, "[data-testid='city']")
+  end
+
+  test "member with no address parts renders a screen-reader label, not a blank cell", %{
+    conn: conn
+  } do
+    member = create_member(%{email: "no-address@example.com"})
+
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    row = view |> element("#row-#{member.id}") |> render()
+
+    assert row =~ "No address"
+    refute has_element?(view, "#row-#{member.id} [data-testid='member-address']")
+  end
+
+  test "members stay findable by city via search", %{conn: conn} do
+    member = create_member(%{city: "Hamburg", email: "city-search@example.com"})
+
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members?query=Hamburg")
+
+    assert has_element?(view, "#row-#{member.id}")
+  end
+
+  test "members stay findable by postal code via search", %{conn: conn} do
+    member = create_member(%{postal_code: "99999", email: "postal-search@example.com"})
+
+    conn = conn_with_oidc_user(conn)
+    {:ok, view, _html} = live(conn, ~p"/members?query=99999")
+
+    assert has_element?(view, "#row-#{member.id}")
+  end
+end
diff --git a/test/mv_web/member_live/index_custom_fields_sorting_test.exs b/test/mv_web/member_live/index_custom_fields_sorting_test.exs
index 4119205c..0355766b 100644
--- a/test/mv_web/member_live/index_custom_fields_sorting_test.exs
+++ b/test/mv_web/member_live/index_custom_fields_sorting_test.exs
@@ -206,14 +206,20 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do
     conn = conn_with_oidc_user(conn)
 
     {:ok, view, _html} =
-      live(conn, "/members?query=&sort_field=custom_field_#{field.id}&sort_order=desc")
+      live(
+        conn,
+        "/members?fields=email&query=&sort_field=custom_field_#{field.id}&sort_order=desc"
+      )
 
     # Click on email column
     view
     |> element("[data-testid='email']")
     |> render_click()
 
-    assert_patch(view, "/members?query=&sort_field=email&sort_order=asc")
+    # The fields param rides along on the patch, so assert the sort outcome.
+    path = assert_patch(view)
+    assert path =~ "sort_field=email"
+    assert path =~ "sort_order=asc"
   end
 
   test "clicking custom field column after regular column works", %{
diff --git a/test/mv_web/member_live/index_default_columns_test.exs b/test/mv_web/member_live/index_default_columns_test.exs
new file mode 100644
index 00000000..04d3c993
--- /dev/null
+++ b/test/mv_web/member_live/index_default_columns_test.exs
@@ -0,0 +1,58 @@
+defmodule MvWeb.MemberLive.IndexDefaultColumnsTest do
+  @moduledoc """
+  §1.2 — With no persisted column selection, exactly the curated default columns
+  are visible: selection checkbox, Name (name + email), Address (composite),
+  fee type, fee status, groups, join date.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "Col",
+          last_name: "Default",
+          email: "col@example.com",
+          street: "Musterweg",
+          house_number: "1",
+          postal_code: "10115",
+          city: "Berlin"
+        },
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "curated columns are visible by default", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Composite Name + Address cells.
+    assert has_element?(view, "[data-testid='member-name']")
+    assert has_element?(view, "[data-testid='member-address']")
+    # Fee type, fee status, groups, join date headers.
+    assert has_element?(view, "[data-testid='membership_fee_type']")
+    assert has_element?(view, "[data-testid='join_date']")
+    assert has_element?(view, "th", "Membership Fee Status")
+    assert has_element?(view, "[data-testid='groups']")
+  end
+
+  test "the individual name/address sub-fields are hidden by default", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    for field <- ~w(first_name last_name email city street house_number postal_code country) do
+      refute has_element?(view, "[data-testid='#{field}']")
+    end
+  end
+
+  test "an explicit field selection still overrides the curated default", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members?fields=email")
+
+    assert has_element?(view, "[data-testid='email']")
+    refute has_element?(view, "[data-testid='member-name']")
+  end
+end
diff --git a/test/mv_web/member_live/index_field_visibility_test.exs b/test/mv_web/member_live/index_field_visibility_test.exs
index 63dff1c4..71744f83 100644
--- a/test/mv_web/member_live/index_field_visibility_test.exs
+++ b/test/mv_web/member_live/index_field_visibility_test.exs
@@ -148,20 +148,20 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Verify email is visible initially
+      # The curated Name column carries the email, so it is visible initially.
       html = render(view)
       assert html =~ "alice@example.com"
 
-      # Open dropdown and hide email
+      # Open dropdown and hide the Name column
       view
       |> element("button[aria-controls='field-visibility-menu']")
       |> render_click()
 
       view
-      |> element("button[phx-click='select_item'][phx-value-item='email']")
+      |> element("button[phx-click='select_item'][phx-value-item='name']")
       |> render_click()
 
-      # Email should no longer be visible
+      # The Name column (and the email it carries) is no longer visible
       html = render(view)
       refute html =~ "alice@example.com"
       refute html =~ "bob@example.com"
@@ -309,13 +309,13 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Hide a field via dropdown
+      # Hide the curated Name column (which carries the email) via dropdown
       view
       |> element("button[aria-controls='field-visibility-menu']")
       |> render_click()
 
       view
-      |> element("button[phx-click='select_item'][phx-value-item='email']")
+      |> element("button[phx-click='select_item'][phx-value-item='name']")
       |> render_click()
 
       html = render(view)
@@ -429,7 +429,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Verify email is visible initially
+      # The curated Name column carries the email, so it is visible initially.
       html = render(view)
       assert html =~ "alice@example.com"
 
@@ -438,12 +438,12 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       |> element("button[aria-controls='field-visibility-menu']")
       |> render_click()
 
-      # Simulate Enter key press on email field button
+      # Simulate Enter key press on the Name field button
       view
-      |> element("button[phx-click='select_item'][phx-value-item='email']")
+      |> element("button[phx-click='select_item'][phx-value-item='name']")
       |> render_keydown(%{key: "Enter"})
 
-      # Email should no longer be visible
+      # The Name column (and the email it carries) is no longer visible
       html = render(view)
       refute html =~ "alice@example.com"
     end
diff --git a/test/mv_web/member_live/index_groups_url_params_test.exs b/test/mv_web/member_live/index_groups_url_params_test.exs
index 8ce82aaa..8b92cb90 100644
--- a/test/mv_web/member_live/index_groups_url_params_test.exs
+++ b/test/mv_web/member_live/index_groups_url_params_test.exs
@@ -125,7 +125,10 @@ defmodule MvWeb.MemberLive.IndexGroupsUrlParamsTest do
     conn = conn_with_oidc_user(conn)
 
     {:ok, view, html} =
-      live(conn, "/members?sort_field=first_name&sort_order=desc&group_#{group1.id}=in")
+      live(
+        conn,
+        "/members?fields=first_name&sort_field=first_name&sort_order=desc&group_#{group1.id}=in"
+      )
 
     assert html =~ member1.first_name
     assert has_element?(view, "[data-testid='first_name'][aria-label*='descending']")
diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs
index f3dadac5..6c222276 100644
--- a/test/mv_web/member_live/index_member_fields_display_test.exs
+++ b/test/mv_web/member_live/index_member_fields_display_test.exs
@@ -43,22 +43,23 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
     end
   end
 
-  test "respects show_in_overview config", %{conn: conn, member1: m} do
+  test "respects show_in_overview config", %{conn: conn} do
+    # Global settings still drive column visibility: hiding a curated default
+    # column via settings removes it, while unaffected columns stay visible.
     {:ok, settings} = Mv.Membership.get_settings()
-    fields_to_hide = [:street, :house_number]
 
     {:ok, _} =
       Mv.Membership.update_settings(settings, %{
-        member_field_visibility: Map.new(fields_to_hide, &{Atom.to_string(&1), false})
+        member_field_visibility: %{"join_date" => false}
       })
 
     conn = conn_with_oidc_user(conn)
     # Use search query to filter to only the expected member (Alice)
     # This significantly improves test performance by avoiding loading all members from other tests
-    {:ok, _view, html} = live(conn, "/members?query=Alice")
+    {:ok, view, _html} = live(conn, "/members?query=Alice")
 
-    assert html =~ "Email"
-    assert html =~ m.email
-    refute html =~ m.street
+    refute has_element?(view, "[data-testid='join_date']")
+    # The composite Name column (and its email content) is unaffected.
+    assert has_element?(view, "[data-testid='member-name']")
   end
 end
diff --git a/test/mv_web/member_live/index_search_clear_test.exs b/test/mv_web/member_live/index_search_clear_test.exs
new file mode 100644
index 00000000..14a8aa25
--- /dev/null
+++ b/test/mv_web/member_live/index_search_clear_test.exs
@@ -0,0 +1,56 @@
+defmodule MvWeb.MemberLive.IndexSearchClearTest do
+  @moduledoc """
+  §1.3 — Activating the search clear (×) control clears the query, removes the
+  URL search param, and resets the result set to the unfiltered list.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    actor = SystemActor.get_system_actor()
+
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Findable", last_name: "One", email: "findable@example.com"},
+        actor: actor
+      )
+
+    {:ok, other} =
+      Mv.Membership.create_member(
+        %{first_name: "Other", last_name: "Two", email: "other@example.com"},
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn), other: other}
+  end
+
+  test "clear control only appears when a query is present", %{conn: conn} do
+    {:ok, no_query, _} = live(conn, ~p"/members")
+    refute has_element?(no_query, "[data-testid='search-clear']")
+
+    {:ok, with_query, _} = live(conn, ~p"/members?query=Findable")
+    assert has_element?(with_query, "[data-testid='search-clear']")
+  end
+
+  test "clear resets query, URL param and the result set", %{conn: conn, other: other} do
+    {:ok, view, _html} = live(conn, ~p"/members?query=Findable")
+
+    # The filtered list excludes the non-matching member.
+    refute has_element?(view, "#row-#{other.id}")
+
+    view |> element("[data-testid='search-clear']") |> render_click()
+
+    # Query cleared in the URL (search param reset to empty).
+    path = assert_patch(view)
+    assert path =~ "query="
+    refute path =~ "query=Findable"
+
+    # Result set resets to the unfiltered list (the previously excluded member returns).
+    assert has_element?(view, "#row-#{other.id}")
+    # The input no longer carries the query.
+    refute has_element?(view, "[data-testid='search-input'][value='Findable']")
+  end
+end
diff --git a/test/mv_web/member_live/index_sticky_pinned_test.exs b/test/mv_web/member_live/index_sticky_pinned_test.exs
new file mode 100644
index 00000000..95eac861
--- /dev/null
+++ b/test/mv_web/member_live/index_sticky_pinned_test.exs
@@ -0,0 +1,56 @@
+defmodule MvWeb.MemberLive.IndexStickyPinnedTest do
+  @moduledoc """
+  §1.19 — When the table scrolls vertically and horizontally, the header stays
+  sticky and the identifier (Name) column stays pinned; overflowing cell content
+  truncates with ellipsis and exposes a hover/focus tooltip.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  @moduletag :ui
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "Reginald",
+          last_name: "Worthington-Smythe",
+          email: "reginald@example.com",
+          street: "A Very Long Street Name That Overflows",
+          house_number: "123",
+          postal_code: "10115",
+          city: "Berlin"
+        },
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "header is sticky and the identifier column is pinned", %{conn: conn} do
+    {:ok, _view, html} = live(conn, ~p"/members")
+
+    # Sticky header (desktop).
+    assert html =~ "lg:sticky"
+    assert html =~ "lg:top-0"
+
+    # Checkbox column pinned at left-0, identifier (Name) column pinned beside it.
+    assert html =~ "left-0"
+    assert html =~ "left-12"
+  end
+
+  test "composite cells truncate and expose a tooltip via title", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    name_cell = view |> element("[data-testid='member-name']") |> render()
+    assert name_cell =~ "truncate"
+    assert name_cell =~ ~s(title="Reginald Worthington-Smythe")
+
+    address_cell = view |> element("[data-testid='member-address']") |> render()
+    assert address_cell =~ "truncate"
+    assert address_cell =~ ~s(title="A Very Long Street Name That Overflows 123")
+  end
+end
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index 8f31beb1..e1de77a8 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -154,9 +154,13 @@ defmodule MvWeb.MemberLive.IndexTest do
 
   describe "sorting integration" do
     @describetag :ui
+    # The curated default columns no longer expose the individual name/address
+    # sort headers, so these tests make the relevant column visible via ?fields=.
+    # That puts a `fields` param on every push_patch, hence the relaxed
+    # substring assertions instead of exact patch strings.
     test "clicking a column header toggles sort order and updates the URL", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+      {:ok, view, _html} = live(conn, "/members?fields=email")
 
       # The component data test ids are built with the name of the field
       # First click – should sort ASC
@@ -164,32 +168,44 @@ defmodule MvWeb.MemberLive.IndexTest do
       |> element("[data-testid='email']")
       |> render_click()
 
-      # The LiveView pushes a patch with the new query params
-      assert_patch(view, "/members?query=&sort_field=email&sort_order=asc")
+      path_asc = assert_patch(view)
+      assert path_asc =~ "sort_field=email"
+      assert path_asc =~ "sort_order=asc"
 
       # Second click – toggles to DESC
       view
       |> element("[data-testid='email']")
       |> render_click()
 
-      assert_patch(view, "/members?query=&sort_field=email&sort_order=desc")
+      path_desc = assert_patch(view)
+      assert path_desc =~ "sort_field=email"
+      assert path_desc =~ "sort_order=desc"
     end
 
     test "clicking different column header resets order to ascending", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?sort_field=email&sort_order=desc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=first_name,email&sort_field=email&sort_order=desc")
 
       # Click on a different column
       view
       |> element("[data-testid='first_name']")
       |> render_click()
 
-      assert_patch(view, "/members?query=&sort_field=first_name&sort_order=asc")
+      path = assert_patch(view)
+      assert path =~ "sort_field=first_name"
+      assert path =~ "sort_order=asc"
     end
 
     test "all sortable columns work correctly", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
+
+      {:ok, view, _html} =
+        live(
+          conn,
+          "/members?fields=first_name,email,street,house_number,postal_code,city,country,join_date"
+        )
 
       # default ascending sorting with first name
       assert has_element?(view, "[data-testid='first_name'][aria-label='ascending']")
@@ -209,30 +225,40 @@ defmodule MvWeb.MemberLive.IndexTest do
         |> element("[data-testid='#{field}']")
         |> render_click()
 
-        assert_patch(view, "/members?query=&sort_field=#{field}&sort_order=asc")
+        path = assert_patch(view)
+        assert path =~ "sort_field=#{field}"
+        assert path =~ "sort_order=asc"
       end
     end
 
     test "sorting works with search query", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=test")
+      {:ok, view, _html} = live(conn, "/members?fields=email&query=test")
 
       view
       |> element("[data-testid='email']")
       |> render_click()
 
-      assert_patch(view, "/members?query=test&sort_field=email&sort_order=asc")
+      path = assert_patch(view)
+      assert path =~ "query=test"
+      assert path =~ "sort_field=email"
+      assert path =~ "sort_order=asc"
     end
 
     test "sorting maintains search query when toggling order", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=test&sort_field=email&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=email&query=test&sort_field=email&sort_order=asc")
 
       view
       |> element("[data-testid='email']")
       |> render_click()
 
-      assert_patch(view, "/members?query=test&sort_field=email&sort_order=desc")
+      path = assert_patch(view)
+      assert path =~ "query=test"
+      assert path =~ "sort_field=email"
+      assert path =~ "sort_order=desc"
     end
   end
 
@@ -240,7 +266,9 @@ defmodule MvWeb.MemberLive.IndexTest do
     @describetag :ui
     test "handle_params reads sort query and applies it", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=&sort_field=email&sort_order=desc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=email&query=&sort_field=email&sort_order=desc")
 
       # Check that the sort state is correctly applied
       assert has_element?(view, "[data-testid='email'][aria-label='descending']")
@@ -248,7 +276,9 @@ defmodule MvWeb.MemberLive.IndexTest do
 
     test "handle_params handles invalid sort field gracefully", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=&sort_field=invalid_field&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=first_name&query=&sort_field=invalid_field&sort_order=asc")
 
       # Should not crash and should show default first name order
       assert has_element?(view, "[data-testid='first_name'][aria-label='ascending']")
@@ -256,7 +286,9 @@ defmodule MvWeb.MemberLive.IndexTest do
 
     test "handle_params preserves search query with sort params", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=test&sort_field=email&sort_order=desc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=email&query=test&sort_field=email&sort_order=desc")
 
       # Both search and sort should be preserved
       assert has_element?(view, "[data-testid='email'][aria-label='descending']")
@@ -267,7 +299,9 @@ defmodule MvWeb.MemberLive.IndexTest do
     @describetag :ui
     test "search maintains sort state", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=&sort_field=email&sort_order=desc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=email&query=&sort_field=email&sort_order=desc")
 
       # Perform search
       view
@@ -280,7 +314,9 @@ defmodule MvWeb.MemberLive.IndexTest do
 
     test "sort maintains search state", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?query=test&sort_field=email&sort_order=asc")
+
+      {:ok, view, _html} =
+        live(conn, "/members?fields=email&query=test&sort_field=email&sort_order=asc")
 
       # Perform sort
       view
@@ -288,7 +324,10 @@ defmodule MvWeb.MemberLive.IndexTest do
       |> render_click()
 
       # Search state should be maintained
-      assert_patch(view, "/members?query=test&sort_field=email&sort_order=desc")
+      path = assert_patch(view)
+      assert path =~ "query=test"
+      assert path =~ "sort_field=email"
+      assert path =~ "sort_order=desc"
     end
   end
 
@@ -1578,7 +1617,7 @@ defmodule MvWeb.MemberLive.IndexTest do
       boolean_field = create_boolean_custom_field()
 
       {:ok, view, _html} =
-        live(conn, "/members?bf_#{boolean_field.id}=true")
+        live(conn, "/members?fields=email&bf_#{boolean_field.id}=true")
 
       # Test sort toggle preserves filter
       view

From dfc616257d453428fe0f872c697b90714aa437d9 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 10:45:53 +0200
Subject: [PATCH 07/30] feat(member): let members tailor overview density and
 visible columns

The View dropdown drives row density and whether the Member and Address
fields render as composite cells or split into their underlying columns;
the column manager toggles visibility and resets to the curated default.
All choices persist per browser through the URL/session/cookie/global
chain, so a saved layout survives reloads without a per-account store.
---
 assets/js/app.js                              |  42 ++-
 lib/mv_web/components/core_components.ex      |  38 +-
 .../field_visibility_dropdown_component.ex    |  10 +-
 .../live/components/sort_header_component.ex  |   7 +-
 .../view_settings_dropdown_component.ex       | 129 +++++++
 lib/mv_web/live/member_live/index.ex          | 348 ++++++++++++++----
 lib/mv_web/live/member_live/index.html.heex   | 281 ++++++++------
 .../member_live/index/field_visibility.ex     | 217 ++++++++++-
 .../live/member_live/index/view_settings.ex   | 186 ++++++++++
 .../components/sort_header_component_test.exs |  58 +--
 .../index/field_visibility_test.exs           |  50 +++
 .../member_live/index/view_settings_test.exs  | 109 ++++++
 .../member_live/index_a11y_hardening_test.exs |  78 ++++
 .../member_live/index_column_manager_test.exs |  76 ++++
 .../index_default_columns_test.exs            |  11 +-
 .../mv_web/member_live/index_density_test.exs |  73 ++++
 .../index_field_visibility_test.exs           |  49 ++-
 .../index_groups_url_params_test.exs          |  12 +-
 .../index_member_fields_display_test.exs      |   3 +
 test/mv_web/member_live/index_test.exs        |  27 +-
 .../member_live/index_view_settings_test.exs  | 102 +++++
 21 files changed, 1643 insertions(+), 263 deletions(-)
 create mode 100644 lib/mv_web/live/components/view_settings_dropdown_component.ex
 create mode 100644 lib/mv_web/live/member_live/index/view_settings.ex
 create mode 100644 test/mv_web/live/member_live/index/view_settings_test.exs
 create mode 100644 test/mv_web/member_live/index_a11y_hardening_test.exs
 create mode 100644 test/mv_web/member_live/index_column_manager_test.exs
 create mode 100644 test/mv_web/member_live/index_density_test.exs
 create mode 100644 test/mv_web/member_live/index_view_settings_test.exs

diff --git a/assets/js/app.js b/assets/js/app.js
index a6a7d694..85bbc6ba 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -414,15 +414,46 @@ Hooks.LoadMorePrefetch = {
   }
 }
 
+// Reads a browser cookie value by name (used to echo the persisted member
+// view-settings to the server on connect, since the live socket's connect-info
+// does not expose cookies).
+function getCookie(name) {
+  const match = document.cookie.match(new RegExp("(?:^|; )" + name + "=([^;]*)"))
+  return match ? decodeURIComponent(match[1]) : null
+}
+
 let liveSocket = new LiveSocket("/live", Socket, {
   longPollFallbackMs: 2500,
   params: {
     _csrf_token: csrfToken,
-    timezone: getBrowserTimezone()
+    timezone: getBrowserTimezone(),
+    view_settings: getCookie("member_view_settings")
   },
   hooks: Hooks
 })
 
+// Persist the member-overview view settings per browser/device (§1.5/§1.20). The
+// LiveView pushes "store-view-settings" (density + compact field toggles) on
+// change; we write a long-lived cookie that the LiveView reads back on the next
+// full page load (via the request cookie on the dead render and via connect
+// params on the connected mount).
+// Return the members list to the top after a sort or filter change. The server
+// resets the keyset stream to page 1 on those changes and pushes this event; a
+// user scrolled down would otherwise be stranded past the shorter content with
+// infinite scroll not re-arming. No-op if the scroll container is absent.
+window.addEventListener("phx:members:scroll-top", () => {
+  const el = document.getElementById("members-table-guard")
+  if (el) el.scrollTop = 0
+})
+
+window.addEventListener("phx:store-view-settings", (e) => {
+  const json = e.detail && e.detail.view_settings
+  if (typeof json === "string" && json.length > 0) {
+    const maxAge = 365 * 24 * 60 * 60
+    document.cookie = `member_view_settings=${encodeURIComponent(json)};path=/;max-age=${maxAge};samesite=lax`
+  }
+})
+
 // Listen for custom events from LiveView
 window.addEventListener("phx:set-input-value", (e) => {
   const {id, value} = e.detail
@@ -432,15 +463,6 @@ window.addEventListener("phx:set-input-value", (e) => {
   }
 })
 
-// Return the members list to the top after a sort or filter change. The server
-// resets the keyset stream to page 1 on those changes and pushes this event; a
-// user scrolled down would otherwise be stranded past the shorter content with
-// infinite scroll not re-arming. No-op if the scroll container is absent.
-window.addEventListener("phx:members:scroll-top", () => {
-  const el = document.getElementById("members-table-guard")
-  if (el) el.scrollTop = 0
-})
-
 // Show progress bar on live navigation and form submits
 topbar.config({barColors: {0: "#29d"}, shadowColor: "rgba(0, 0, 0, .3)"})
 window.addEventListener("phx:page-loading-start", _info => topbar.show(300))
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 7af829a8..2b4dcde5 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -250,7 +250,7 @@ defmodule MvWeb.CoreComponents do
 
   attr :size, :any,
     default: "md",
-    doc: "Badge size: sm | md"
+    doc: "Badge size: xs | sm | md"
 
   attr :sr_label, :string,
     default: nil,
@@ -269,7 +269,7 @@ defmodule MvWeb.CoreComponents do
 
     variant_class = "badge-#{variant}"
     style_class = badge_style_class(style)
-    size_class = "badge-#{size}"
+    size_class = badge_size_class(size)
     # Outline has transparent bg in DaisyUI; add bg so it stays visible on base-200/base-300
     outline_bg = if style == "outline", do: "bg-base-100", else: nil
 
@@ -309,6 +309,13 @@ defmodule MvWeb.CoreComponents do
   defp badge_style_class("outline"), do: "badge-outline"
   defp badge_style_class(_), do: nil
 
+  # Literal strings so Tailwind's content scanner sees badge-xs / badge-sm / badge-md / badge-lg
+  # and does not purge them from the CSS bundle (string interpolation "badge-#{size}" would be invisible).
+  defp badge_size_class("xs"), do: "badge-xs"
+  defp badge_size_class("sm"), do: "badge-sm"
+  defp badge_size_class("lg"), do: "badge-lg"
+  defp badge_size_class(_), do: "badge-md"
+
   @doc """
   Renders a visually empty table cell with screen-reader-only text (WCAG).
 
@@ -443,6 +450,11 @@ defmodule MvWeb.CoreComponents do
   attr :selected, :map, default: %{}
   attr :open, :boolean, default: false, doc: "Whether the dropdown is open"
   attr :show_select_buttons, :boolean, default: false, doc: "Show select all/none buttons"
+
+  attr :show_reset_button, :boolean,
+    default: false,
+    doc: "Show a reset-to-default icon button next to All/None (emits reset_fields)"
+
   attr :phx_target, :any, required: true, doc: "The LiveView/LiveComponent target for events"
   attr :menu_class, :string, default: nil, doc: "Additional CSS classes for the menu"
   attr :menu_width, :string, default: "w-64", doc: "Width class for the menu (default: w-64)"
@@ -546,6 +558,19 @@ defmodule MvWeb.CoreComponents do
                 >
                   {gettext("None")}
                 </button>
+                <button
+                  :if={@show_reset_button}
+                  type="button"
+                  role="menuitem"
+                  aria-label={gettext("Reset to default")}
+                  title={gettext("Reset to default")}
+                  phx-click="reset_fields"
+                  phx-target={@phx_target}
+                  class="btn btn-xs btn-ghost"
+                  data-testid="dropdown-reset"
+                >
+                  <.icon name="hero-arrow-uturn-left" class="size-4" />
+                </button>
               </div>
             </div>
           </li>
@@ -938,6 +963,11 @@ defmodule MvWeb.CoreComponents do
   attr :sort_field, :any, default: nil, doc: "current sort field"
   attr :sort_order, :atom, default: nil, doc: "current sort order"
 
+  attr :size_class, :string,
+    default: "",
+    doc:
+      "optional DaisyUI table-size class controlling row density (e.g. table-xs, table-md); driven by the view-settings density value"
+
   attr :sticky_header, :boolean,
     default: false,
     doc:
@@ -1016,7 +1046,7 @@ defmodule MvWeb.CoreComponents do
       data-sticky-first-col-rows={@sticky_first_col && "true"}
       phx-hook={@row_click && "TableRowKeydown"}
     >
-      <table class="table table-zebra">
+      <table class={["table table-zebra", @size_class]}>
         <thead>
           <tr>
             <th
@@ -1223,7 +1253,7 @@ defmodule MvWeb.CoreComponents do
   defp table_th_sticky_class(_), do: nil
 
   defp sticky_th_classes,
-    do: "lg:sticky lg:top-0 bg-base-100 z-10 hover:z-20 focus-within:z-20"
+    do: "lg:sticky lg:top-0 bg-base-100 hover:bg-base-100 z-10 hover:z-20 focus-within:z-20"
 
   @doc """
   Renders a reorderable table (sortable list) with drag handle and keyboard support.
diff --git a/lib/mv_web/live/components/field_visibility_dropdown_component.ex b/lib/mv_web/live/components/field_visibility_dropdown_component.ex
index 58777da3..6b073620 100644
--- a/lib/mv_web/live/components/field_visibility_dropdown_component.ex
+++ b/lib/mv_web/live/components/field_visibility_dropdown_component.ex
@@ -69,12 +69,13 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do
       <.dropdown_menu
         id="field-visibility-menu"
         icon="hero-adjustments-horizontal"
-        button_label={gettext("Show/Hide Columns")}
+        button_label={gettext("Columns")}
         items={@all_items}
         checkboxes={true}
         selected={@selected_fields}
         open={@open}
         show_select_buttons={true}
+        show_reset_button={true}
         phx_target={@myself}
       />
     </div>
@@ -115,6 +116,13 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do
     {:noreply, assign(socket, :selected_fields, all)}
   end
 
+  # reset to the curated default column set (the parent owns the settings needed
+  # to compute the default, so it recomputes and re-applies the selection)
+  def handle_event("reset_fields", _params, socket) do
+    send(self(), {:fields_reset})
+    {:noreply, socket}
+  end
+
   # select none
   def handle_event("select_none", _params, socket) do
     none =
diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex
index c4850c41..d3ab1e94 100644
--- a/lib/mv_web/live/components/sort_header_component.ex
+++ b/lib/mv_web/live/components/sort_header_component.ex
@@ -32,11 +32,14 @@ defmodule MvWeb.Components.SortHeaderComponent do
         >
           {@label}
           <%= if @sort_field == @field do %>
-            <.icon name={if @sort_order == :asc, do: "hero-chevron-up", else: "hero-chevron-down"} />
+            <.icon
+              name={if @sort_order == :asc, do: "hero-chevron-up", else: "hero-chevron-down"}
+              class="sort-icon"
+            />
           <% else %>
             <.icon
               name="hero-chevron-up-down"
-              class="opacity-40"
+              class="sort-icon opacity-40"
             />
           <% end %>
         </.button>
diff --git a/lib/mv_web/live/components/view_settings_dropdown_component.ex b/lib/mv_web/live/components/view_settings_dropdown_component.ex
new file mode 100644
index 00000000..b6cbec7a
--- /dev/null
+++ b/lib/mv_web/live/components/view_settings_dropdown_component.ex
@@ -0,0 +1,129 @@
+defmodule MvWeb.Components.ViewSettingsDropdownComponent do
+  @moduledoc """
+  LiveComponent for the member-overview view settings (§1.20).
+
+  Renders an icon button with a tooltip that opens a dropdown of toggles:
+
+    * Compact mode — table row density (compact ↔ comfortable)
+    * Compact Member field — composite last+first name cell, with a sub-toggle
+      "include email"
+    * Compact address field — composite street / postal+city cell
+
+  Turning a composite field off surfaces the underlying separate columns in the
+  table. The component is display-only: it emits `{:view_setting_toggled, key}`
+  to the parent LiveView, which owns and persists the settings.
+
+  ## Props
+    - `:density` — `:compact` or `:comfortable`
+    - `:compact_member` — boolean
+    - `:member_include_email` — boolean
+    - `:compact_address` — boolean
+    - `:id` — component id
+  """
+
+  use MvWeb, :live_component
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_new(:open, fn -> false end)}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div>
+      <.dropdown_menu
+        id="view-settings-menu"
+        icon="hero-cog-6-tooth"
+        button_label={gettext("View")}
+        open={@open}
+        phx_target={@myself}
+        menu_width="w-72"
+        testid="view-settings"
+        button_testid="view-settings-button"
+      >
+        <li role="none" class="mb-1 px-2">
+          <span class="font-semibold">{gettext("View settings")}</span>
+        </li>
+
+        <.toggle_item
+          setting="density"
+          label={gettext("Compact mode")}
+          checked={@density == :compact}
+          target={@myself}
+        />
+
+        <.toggle_item
+          setting="compact_member"
+          label={gettext("Compact Member field")}
+          checked={@compact_member}
+          target={@myself}
+        />
+
+        <%!-- The email line lives inside the composite Member cell, so this
+        sub-toggle is only meaningful while that cell is compact. When the
+        composite is off, email is its own column and this toggle is omitted. --%>
+        <li :if={@compact_member} role="none" class="pl-6">
+          <.toggle_item
+            setting="member_include_email"
+            label={gettext("include email")}
+            checked={@member_include_email}
+            target={@myself}
+          />
+        </li>
+
+        <.toggle_item
+          setting="compact_address"
+          label={gettext("Compact address field")}
+          checked={@compact_address}
+          target={@myself}
+        />
+      </.dropdown_menu>
+    </div>
+    """
+  end
+
+  attr :setting, :string, required: true
+  attr :label, :string, required: true
+  attr :checked, :boolean, required: true
+  attr :target, :any, required: true
+
+  defp toggle_item(assigns) do
+    ~H"""
+    <button
+      type="button"
+      role="menuitemcheckbox"
+      aria-checked={to_string(@checked)}
+      aria-label={@label}
+      tabindex="0"
+      class="flex items-center gap-2 px-2 py-1 rounded w-full text-left cursor-pointer hover:bg-base-200"
+      phx-click="toggle"
+      phx-value-setting={@setting}
+      phx-target={@target}
+      data-testid={"view-setting-#{String.replace(@setting, "_", "-")}"}
+    >
+      <span class={if @checked, do: "text-primary", else: "text-base-300"} aria-hidden="true">
+        <.icon name="hero-check" class="size-4 shrink-0" />
+      </span>
+      <span>{@label}</span>
+    </button>
+    """
+  end
+
+  @impl true
+  def handle_event("toggle_dropdown", _params, socket) do
+    {:noreply, assign(socket, :open, !socket.assigns.open)}
+  end
+
+  def handle_event("close_dropdown", _params, socket) do
+    {:noreply, assign(socket, :open, false)}
+  end
+
+  def handle_event("toggle", %{"setting" => setting}, socket) do
+    send(self(), {:view_setting_toggled, String.to_existing_atom(setting)})
+    {:noreply, socket}
+  end
+end
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index f246f5ee..714efe9a 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -41,6 +41,7 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.MemberLive.Index.Formatter
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
   alias MvWeb.MemberLive.Index.OverviewQuery
+  alias MvWeb.MemberLive.Index.ViewSettings
 
   require Ash.Query
   require Logger
@@ -123,16 +124,31 @@ defmodule MvWeb.MemberLive.Index do
     # Load user field selection from session
     session_selection = FieldSelection.get_from_session(session)
 
-    # FIX: ensure dropdown doesn’t show duplicate fields (e.g. membership fee status twice)
+    # Resolve the per-browser view settings first: the columns the manager offers
+    # (composite vs. constituent Name/Address columns) follow these settings (§7b).
+    view_settings = ViewSettings.resolve(session, connect_conn(socket), connect_params(socket))
+    compact_member = view_settings.compact_member
+    member_include_email = view_settings.member_include_email
+    compact_address = view_settings.compact_address
+
+    # The dropdown offers exactly the columns applicable to the current view
+    # settings, so composite and constituent columns are never both listed.
     all_available_fields =
-      all_custom_fields
-      |> FieldVisibility.get_all_available_fields()
+      FieldVisibility.get_offered_fields(
+        all_custom_fields,
+        compact_member,
+        member_include_email,
+        compact_address
+      )
 
     initial_selection =
       FieldVisibility.merge_with_global_settings(
         session_selection,
         settings,
-        all_custom_fields
+        all_custom_fields,
+        compact_member: compact_member,
+        member_include_email: member_include_email,
+        compact_address: compact_address
       )
 
     socket =
@@ -183,6 +199,7 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:mailto_bcc, "")
       |> assign(:recipient_count, 0)
       |> assign(:mailto_disabled?, false)
+      |> assign_view_settings(view_settings)
       |> stream_configure(:members, dom_id: &"row-#{&1.id}")
       |> stream(:members, [])
       |> assign_export_payload()
@@ -385,6 +402,11 @@ defmodule MvWeb.MemberLive.Index do
   - `{:fields_selected, selection}` - Select all/deselect all event from FieldVisibilityDropdownComponent
   """
 
+  @impl true
+  def handle_info({:view_setting_toggled, key}, socket) do
+    {:noreply, toggle_view_setting(socket, key)}
+  end
+
   @impl true
   def handle_info({:search_changed, q}, socket) do
     socket =
@@ -604,34 +626,10 @@ defmodule MvWeb.MemberLive.Index do
   @impl true
   def handle_info({:field_toggled, field_string, visible}, socket) do
     new_selection = Map.put(socket.assigns.user_field_selection, field_string, visible)
-    socket = update_session_field_selection(socket, new_selection)
-
-    final_selection =
-      FieldVisibility.merge_with_global_settings(
-        new_selection,
-        socket.assigns.settings,
-        socket.assigns.all_custom_fields
-      )
-
-    visible_member_fields =
-      final_selection
-      |> FieldVisibility.get_visible_member_fields()
-      |> Enum.uniq()
-
-    visible_member_fields_db = FieldVisibility.get_visible_member_fields_db(final_selection)
-
-    visible_member_fields_computed =
-      FieldVisibility.get_visible_member_fields_computed(final_selection)
-
-    visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection)
 
     socket =
       socket
-      |> assign(:user_field_selection, final_selection)
-      |> assign(:member_fields_visible, visible_member_fields)
-      |> assign(:member_fields_visible_db, visible_member_fields_db)
-      |> assign(:member_fields_visible_computed, visible_member_fields_computed)
-      |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields))
+      |> assign_field_visibility(new_selection)
       |> load_members()
       |> prepare_dynamic_cols()
       |> update_selection_assigns()
@@ -641,35 +639,29 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   @impl true
-  def handle_info({:fields_selected, selection}, socket) do
-    socket = update_session_field_selection(socket, selection)
+  def handle_info({:fields_reset}, socket) do
+    # Reset restores the curated default column set (§1.6): recompute the default
+    # visibility from the global settings and re-apply it as the selection.
+    {cm, ie, ca} = view_flags(socket)
 
-    final_selection =
+    default_selection =
       FieldVisibility.merge_with_global_settings(
-        selection,
+        %{},
         socket.assigns.settings,
-        socket.assigns.all_custom_fields
+        socket.assigns.all_custom_fields,
+        compact_member: cm,
+        member_include_email: ie,
+        compact_address: ca
       )
 
-    visible_member_fields =
-      final_selection
-      |> FieldVisibility.get_visible_member_fields()
-      |> Enum.uniq()
-
-    visible_member_fields_db = FieldVisibility.get_visible_member_fields_db(final_selection)
-
-    visible_member_fields_computed =
-      FieldVisibility.get_visible_member_fields_computed(final_selection)
-
-    visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection)
+    handle_info({:fields_selected, default_selection}, socket)
+  end
 
+  @impl true
+  def handle_info({:fields_selected, selection}, socket) do
     socket =
       socket
-      |> assign(:user_field_selection, final_selection)
-      |> assign(:member_fields_visible, visible_member_fields)
-      |> assign(:member_fields_visible_db, visible_member_fields_db)
-      |> assign(:member_fields_visible_computed, visible_member_fields_computed)
-      |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields))
+      |> assign_field_visibility(selection)
       |> load_members()
       |> prepare_dynamic_cols()
       |> update_selection_assigns()
@@ -697,18 +689,6 @@ defmodule MvWeb.MemberLive.Index do
     url_selection = FieldSelection.parse_from_url(params)
     final_selection = compute_final_field_selection(fields_in_url?, url_selection, socket)
 
-    visible_member_fields =
-      final_selection
-      |> FieldVisibility.get_visible_member_fields()
-      |> Enum.uniq()
-
-    visible_member_fields_db = FieldVisibility.get_visible_member_fields_db(final_selection)
-
-    visible_member_fields_computed =
-      FieldVisibility.get_visible_member_fields_computed(final_selection)
-
-    visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection)
-
     socket =
       socket
       |> maybe_update_search(params)
@@ -721,11 +701,7 @@ defmodule MvWeb.MemberLive.Index do
       |> maybe_update_show_current_cycle(params)
       |> assign(:fields_in_url?, fields_in_url?)
       |> assign(:query, params["query"])
-      |> assign(:user_field_selection, final_selection)
-      |> assign(:member_fields_visible, visible_member_fields)
-      |> assign(:member_fields_visible_db, visible_member_fields_db)
-      |> assign(:member_fields_visible_computed, visible_member_fields_computed)
-      |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields))
+      |> assign_visibility_derivations(final_selection)
       |> assign(:selected_member_id, parse_highlight_param(params["highlight"]))
 
     next_sig = build_signature(socket)
@@ -863,8 +839,52 @@ defmodule MvWeb.MemberLive.Index do
     push_reload(socket, new_path)
   end
 
-  defp update_session_field_selection(socket, selection) do
-    assign(socket, :user_field_selection, selection)
+  # The current composite view flags; the offered column set is scoped to these.
+  defp view_flags(socket) do
+    {socket.assigns.compact_member, socket.assigns.member_include_email,
+     socket.assigns.compact_address}
+  end
+
+  # Merges a raw selection with the global settings scoped to the current view
+  # settings, then assigns it together with the visibility-derived assigns.
+  defp assign_field_visibility(socket, selection) do
+    {cm, ie, ca} = view_flags(socket)
+
+    final =
+      FieldVisibility.merge_with_global_settings(
+        selection,
+        socket.assigns.settings,
+        socket.assigns.all_custom_fields,
+        compact_member: cm,
+        member_include_email: ie,
+        compact_address: ca
+      )
+
+    assign_visibility_derivations(socket, final)
+  end
+
+  # Assigns user_field_selection and every visibility-derived assign the table and
+  # export payload read from an already merged (offered-scoped) selection.
+  defp assign_visibility_derivations(socket, final_selection) do
+    visible_member_fields =
+      final_selection
+      |> FieldVisibility.get_visible_member_fields()
+      |> Enum.uniq()
+
+    visible_custom_fields = FieldVisibility.get_visible_custom_fields(final_selection)
+
+    socket
+    |> assign(:user_field_selection, final_selection)
+    |> assign(:member_fields_visible, visible_member_fields)
+    |> assign(
+      :member_fields_visible_db,
+      FieldVisibility.get_visible_member_fields_db(final_selection)
+    )
+    |> assign(
+      :member_fields_visible_computed,
+      FieldVisibility.get_visible_member_fields_computed(final_selection)
+    )
+    |> assign(:visible_custom_field_ids, extract_custom_field_ids(visible_custom_fields))
   end
 
   defp build_query_params(opts) when is_map(opts) do
@@ -904,8 +924,14 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   defp compute_final_field_selection(true, url_selection, socket) do
+    {cm, ie, ca} = view_flags(socket)
+
     only_url =
-      FieldVisibility.selection_from_url_only(url_selection, socket.assigns.all_custom_fields)
+      FieldVisibility.selection_from_url_only(url_selection, socket.assigns.all_custom_fields,
+        compact_member: cm,
+        member_include_email: ie,
+        compact_address: ca
+      )
 
     visible_members = FieldVisibility.get_visible_member_fields(only_url)
     visible_custom = FieldVisibility.get_visible_custom_fields(only_url)
@@ -919,6 +945,8 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   defp compute_final_field_selection(false, url_selection, socket) do
+    {cm, ie, ca} = view_flags(socket)
+
     merged =
       FieldSelection.merge_sources(
         url_selection,
@@ -929,7 +957,10 @@ defmodule MvWeb.MemberLive.Index do
     FieldVisibility.merge_with_global_settings(
       merged,
       socket.assigns.settings,
-      socket.assigns.all_custom_fields
+      socket.assigns.all_custom_fields,
+      compact_member: cm,
+      member_include_email: ie,
+      compact_address: ca
     )
   end
 
@@ -941,6 +972,181 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
+  # The connect-info Plug.Conn (present on the initial dead render), used to read
+  # per-browser cookies such as the persisted view settings.
+  defp connect_conn(socket) do
+    case socket.private[:connect_info] do
+      %Plug.Conn{} = conn -> conn
+      _ -> nil
+    end
+  end
+
+  # The LiveView connect params (present only on the connected mount). The client
+  # echoes the persisted view-settings cookie here because the connect-info map
+  # of a live socket does not expose cookies.
+  defp connect_params(socket) do
+    if connected?(socket), do: get_connect_params(socket), else: nil
+  end
+
+  # Assigns the full view-settings map plus the derived per-setting assigns the
+  # template renders from.
+  defp assign_view_settings(socket, settings) do
+    socket
+    |> assign(:view_settings, settings)
+    |> assign(:density, settings.density)
+    |> assign(:compact_member, settings.compact_member)
+    |> assign(:member_include_email, settings.member_include_email)
+    |> assign(:compact_address, settings.compact_address)
+  end
+
+  # Updates a single view setting, re-derives the template assigns and persists
+  # the whole settings map per browser (client writes the cookie; the connected
+  # mount reads it back via connect params).
+  defp update_view_setting(socket, key, value) do
+    settings = Map.put(socket.assigns.view_settings, key, value)
+
+    socket
+    |> assign_view_settings(settings)
+    |> push_event("store-view-settings", %{view_settings: ViewSettings.to_json(settings)})
+  end
+
+  # Flips the density setting. This only re-renders the table wrapper attribute
+  # (row spacing token), so the streamed rows do not need to be re-rendered.
+  defp toggle_view_setting(socket, :density) do
+    new = if socket.assigns.density == :compact, do: :comfortable, else: :compact
+    update_view_setting(socket, :density, new)
+  end
+
+  # Flips the "include email" sub-toggle. Only meaningful while the composite
+  # Member cell is on: it moves the email between an in-cell line (on) and a
+  # separate E-Mail column (off), so besides re-rendering the rows it recomputes
+  # which columns the manager offers and their visibility.
+  defp toggle_view_setting(socket, :member_include_email) do
+    new_value = not socket.assigns.view_settings.member_include_email
+
+    socket
+    |> update_view_setting(:member_include_email, new_value)
+    |> apply_include_email_toggle(new_value)
+    |> load_members()
+    |> prepare_dynamic_cols()
+    |> update_selection_assigns()
+    |> push_field_selection_url()
+  end
+
+  # Flips the compact Member field. Besides re-rendering the rows, this changes
+  # which columns the manager offers (composite "Name" vs. Vorname/Nachname/E-Mail,
+  # §7b). The email visibility carries over between the two representations,
+  # analogously to the "include email" sub-toggle: composite + include-email ⇄ the
+  # E-Mail column being visible.
+  defp toggle_view_setting(socket, :compact_member) do
+    new_value = not socket.assigns.view_settings.compact_member
+    email_visible? = email_currently_visible?(socket)
+
+    socket
+    |> update_view_setting(:compact_member, new_value)
+    |> sync_include_email(new_value, email_visible?)
+    |> apply_member_toggle(new_value, email_visible?)
+    |> load_members()
+    |> prepare_dynamic_cols()
+    |> update_selection_assigns()
+    |> push_field_selection_url()
+  end
+
+  # Flips the compact Address field: offers the composite "Adresse" vs. the
+  # separate Straße/Hausnummer/PLZ/Ort columns, making the newly relevant columns
+  # visible and recomputing the offered set + visibility for the new mode.
+  defp toggle_view_setting(socket, :compact_address) do
+    new_value = not socket.assigns.view_settings.compact_address
+
+    fields = if new_value, do: [:address], else: [:street, :house_number, :postal_code, :city]
+
+    socket
+    |> update_view_setting(:compact_address, new_value)
+    |> apply_composite_toggle(fields)
+    |> load_members()
+    |> prepare_dynamic_cols()
+    |> update_selection_assigns()
+    |> push_field_selection_url()
+  end
+
+  # Whether the member email is currently surfaced: while the composite is on,
+  # either folded into the cell (include_email) or as a separate E-Mail column;
+  # while it is off, as its own column. Read before the flip, so `compact_member`
+  # still holds the previous mode.
+  defp email_currently_visible?(socket) do
+    if socket.assigns.compact_member do
+      socket.assigns.member_include_email or :email in socket.assigns.member_fields_visible
+    else
+      :email in socket.assigns.member_fields_visible
+    end
+  end
+
+  # Turning include_email OFF surfaces the email as a separate column; make it
+  # visible. Turning it ON folds the email into the cell, so the column is no
+  # longer offered (the recompute drops it).
+  defp apply_include_email_toggle(socket, false = _include_email) do
+    selection = Map.put(socket.assigns.user_field_selection, "email", true)
+    recompute_offered(socket, selection)
+  end
+
+  defp apply_include_email_toggle(socket, true = _include_email),
+    do: recompute_offered(socket, socket.assigns.user_field_selection)
+
+  # When switching to the composite, mirror the email state onto the include-email
+  # sub-toggle so the email keeps being surfaced; when switching away, the
+  # sub-toggle is not applicable.
+  defp sync_include_email(socket, true = _new_compact, email_visible?),
+    do: update_view_setting(socket, :member_include_email, email_visible?)
+
+  defp sync_include_email(socket, false = _new_compact, _email_visible?), do: socket
+
+  # Makes the now-relevant Member columns visible for the new mode. Turning the
+  # composite on surfaces "Name" (with the email either folded via include_email
+  # or kept as a separate column); turning it off surfaces Vorname/Nachname and
+  # carries the prior email visibility onto the E-Mail column.
+  defp apply_member_toggle(socket, true = _new_compact, email_visible?) do
+    selection =
+      socket.assigns.user_field_selection
+      |> Map.put("name", true)
+      |> Map.put("email", email_visible?)
+
+    recompute_offered(socket, selection)
+  end
+
+  defp apply_member_toggle(socket, false = _new_compact, email_visible?) do
+    selection =
+      socket.assigns.user_field_selection
+      |> Map.put("first_name", true)
+      |> Map.put("last_name", true)
+      |> Map.put("email", email_visible?)
+
+    recompute_offered(socket, selection)
+  end
+
+  # Sets the given columns visible, then recomputes the offered set + visibility.
+  defp apply_composite_toggle(socket, fields) do
+    selection =
+      Enum.reduce(fields, socket.assigns.user_field_selection, fn field, acc ->
+        Map.put(acc, Atom.to_string(field), true)
+      end)
+
+    recompute_offered(socket, selection)
+  end
+
+  # Recomputes the offered column list and the derived visibility for the current
+  # mode. `update_view_setting` has already updated the compact_* assigns, so
+  # `view_flags/1` reflects the new mode here.
+  defp recompute_offered(socket, selection) do
+    {cm, ie, ca} = view_flags(socket)
+
+    socket
+    |> assign(
+      :all_available_fields,
+      FieldVisibility.get_offered_fields(socket.assigns.all_custom_fields, cm, ie, ca)
+    )
+    |> assign_field_visibility(selection)
+  end
+
   # Parses optional "highlight" URL param (member id for selected row styling). Returns nil if missing or invalid.
   defp parse_highlight_param(nil), do: nil
   defp parse_highlight_param(""), do: nil
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 55bf93f5..9c0db729 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -5,7 +5,6 @@
       <.live_component
         module={MvWeb.Components.BulkActionsDropdown}
         id="bulk-actions-dropdown"
-        open={@bulk_actions_open}
         export_payload_json={@export_payload_json}
         selected_count={@selected_count}
         scope={@scope}
@@ -72,13 +71,23 @@
         </span>
       </.button>
     </.tooltip>
-    <.live_component
-      module={MvWeb.Components.FieldVisibilityDropdownComponent}
-      id="field-visibility-dropdown"
-      all_fields={@all_available_fields}
-      custom_fields={@all_custom_fields}
-      selected_fields={@user_field_selection}
-    />
+    <div class="ml-auto flex items-center gap-4">
+      <.live_component
+        module={MvWeb.Components.FieldVisibilityDropdownComponent}
+        id="field-visibility-dropdown"
+        all_fields={@all_available_fields}
+        custom_fields={@all_custom_fields}
+        selected_fields={@user_field_selection}
+      />
+      <.live_component
+        module={MvWeb.Components.ViewSettingsDropdownComponent}
+        id="view-settings-dropdown"
+        density={@density}
+        compact_member={@compact_member}
+        member_include_email={@member_include_email}
+        compact_address={@compact_address}
+      />
+    </div>
   </div>
 
   <%!-- Polite live region: present on first render (before it is filled) so
@@ -103,6 +112,8 @@
     role="region"
     aria-label={gettext("Members table")}
     aria-busy={to_string(@loading?)}
+    data-density={@density}
+    tabindex="0"
   >
     <.table
       id="members"
@@ -122,6 +133,7 @@
       dynamic_cols={@dynamic_cols}
       sort_field={@sort_field}
       sort_order={@sort_order}
+      size_class={if @density == :compact, do: "table-xs", else: "table-md"}
     >
       
 <!-- <:col :let={member} label="Id">{member.id}</:col> -->
@@ -130,10 +142,14 @@
         col_click={&MvWeb.MemberLive.Index.checkbox_column_click/1}
         label={
           ~H"""
-          <.input
+          <input
             type="checkbox"
+            id="select-all-checkbox"
             name="select_all"
+            class="checkbox checkbox-sm"
             phx-click="select_all"
+            phx-hook="IndeterminateCheckbox"
+            data-indeterminate={to_string(@selected_count > 0 and @selected_count < @total_count)}
             checked={@total_count > 0 and @selected_count == @total_count}
             aria-label={gettext("Select all members")}
             role="checkbox"
@@ -141,9 +157,10 @@
           """
         }
       >
-        <.input
+        <input
           type="checkbox"
           name={member.id}
+          class="checkbox checkbox-sm"
           checked={MapSet.member?(@selected_members, member.id)}
           aria-label={gettext("Select member")}
           role="checkbox"
@@ -151,8 +168,21 @@
       </:col>
       <:col
         :let={member}
-        :if={:name in @member_fields_visible}
-        label={gettext("Name")}
+        :if={:name in @member_fields_visible and @compact_member}
+        sort_field={:name}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_name}
+            field={:name}
+            label={gettext("Name")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+            sort_hint={gettext("Click to sort by last name")}
+          />
+          """
+        }
       >
         <% full_name =
           [member.first_name, member.last_name]
@@ -163,7 +193,8 @@
             {full_name}
           </div>
           <div
-            :if={member.email not in [nil, ""]}
+            :if={@member_include_email and member.email not in [nil, ""]}
+            data-testid="member-name-email"
             class="opacity-70 truncate"
             title={member.email}
           >
@@ -171,29 +202,10 @@
           </div>
         </div>
       </:col>
-      <:col
-        :let={member}
-        :if={:address in @member_fields_visible}
-        label={gettext("Address")}
-      >
-        <% line1 =
-          [member.street, member.house_number]
-          |> Enum.reject(&(&1 in [nil, ""]))
-          |> Enum.join(" ") %>
-        <% line2 =
-          [member.postal_code, member.city]
-          |> Enum.reject(&(&1 in [nil, ""]))
-          |> Enum.join(" ") %>
-        <.maybe_value value={line1 <> line2} empty_sr_text={gettext("No address")}>
-          <div data-testid="member-address">
-            <div class="truncate" title={line1}>{line1}</div>
-            <div class="opacity-70 truncate" title={line2}>{line2}</div>
-          </div>
-        </.maybe_value>
-      </:col>
       <:col
         :let={member}
         :if={:first_name in @member_fields_visible}
+        sort_field={:first_name}
         label={
           ~H"""
           <.live_component
@@ -212,6 +224,7 @@
       <:col
         :let={member}
         :if={:last_name in @member_fields_visible}
+        sort_field={:last_name}
         label={
           ~H"""
           <.live_component
@@ -230,6 +243,7 @@
       <:col
         :let={member}
         :if={:email in @member_fields_visible}
+        sort_field={:email}
         label={
           ~H"""
           <.live_component
@@ -245,9 +259,117 @@
       >
         {member.email}
       </:col>
+      <:col
+        :let={member}
+        :if={:address in @member_fields_visible and @compact_address}
+        sort_field={:address}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_address}
+            field={:address}
+            label={gettext("Address")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+            sort_hint={gettext("Click to sort by city")}
+          />
+          """
+        }
+      >
+        <% line1 =
+          [member.street, member.house_number]
+          |> Enum.reject(&(&1 in [nil, ""]))
+          |> Enum.join(" ") %>
+        <% line2 =
+          [member.postal_code, member.city]
+          |> Enum.reject(&(&1 in [nil, ""]))
+          |> Enum.join(" ") %>
+        <div data-testid="member-address">
+          <div class="truncate" title={line1}>{line1}</div>
+          <div class="opacity-70 truncate" title={line2}>{line2}</div>
+        </div>
+      </:col>
+      <:col
+        :let={member}
+        :if={:street in @member_fields_visible}
+        sort_field={:street}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_street}
+            field={:street}
+            label={gettext("Street")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+          />
+          """
+        }
+      >
+        {member.street}
+      </:col>
+      <:col
+        :let={member}
+        :if={:house_number in @member_fields_visible}
+        sort_field={:house_number}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_house_number}
+            field={:house_number}
+            label={gettext("House Number")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+          />
+          """
+        }
+      >
+        {member.house_number}
+      </:col>
+      <:col
+        :let={member}
+        :if={:postal_code in @member_fields_visible}
+        sort_field={:postal_code}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_postal_code}
+            field={:postal_code}
+            label={gettext("Postal Code")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+          />
+          """
+        }
+      >
+        {member.postal_code}
+      </:col>
+      <:col
+        :let={member}
+        :if={:city in @member_fields_visible}
+        sort_field={:city}
+        label={
+          ~H"""
+          <.live_component
+            module={MvWeb.Components.SortHeaderComponent}
+            id={:sort_city}
+            field={:city}
+            label={gettext("City")}
+            sort_field={@sort_field}
+            sort_order={@sort_order}
+          />
+          """
+        }
+      >
+        {member.city}
+      </:col>
       <:col
         :let={member}
         :if={:join_date in @member_fields_visible}
+        sort_field={:join_date}
         label={
           ~H"""
           <.live_component
@@ -266,6 +388,7 @@
       <:col
         :let={member}
         :if={:exit_date in @member_fields_visible}
+        sort_field={:exit_date}
         label={
           ~H"""
           <.live_component
@@ -291,6 +414,7 @@
       <:col
         :let={member}
         :if={:country in @member_fields_visible}
+        sort_field={:country}
         label={
           ~H"""
           <.live_component
@@ -306,89 +430,10 @@
       >
         {member.country}
       </:col>
-      <:col
-        :let={member}
-        :if={:city in @member_fields_visible}
-        label={
-          ~H"""
-          <.live_component
-            module={MvWeb.Components.SortHeaderComponent}
-            id={:sort_city}
-            field={:city}
-            label={gettext("City")}
-            sort_field={@sort_field}
-            sort_order={@sort_order}
-          />
-          """
-        }
-      >
-        <.maybe_value value={member.city} empty_sr_text={gettext("Not specified")}>
-          {member.city}
-        </.maybe_value>
-      </:col>
-      <:col
-        :let={member}
-        :if={:street in @member_fields_visible}
-        label={
-          ~H"""
-          <.live_component
-            module={MvWeb.Components.SortHeaderComponent}
-            id={:sort_street}
-            field={:street}
-            label={gettext("Street")}
-            sort_field={@sort_field}
-            sort_order={@sort_order}
-          />
-          """
-        }
-      >
-        <.maybe_value value={member.street} empty_sr_text={gettext("Not specified")}>
-          {member.street}
-        </.maybe_value>
-      </:col>
-      <:col
-        :let={member}
-        :if={:house_number in @member_fields_visible}
-        label={
-          ~H"""
-          <.live_component
-            module={MvWeb.Components.SortHeaderComponent}
-            id={:sort_house_number}
-            field={:house_number}
-            label={gettext("House Number")}
-            sort_field={@sort_field}
-            sort_order={@sort_order}
-          />
-          """
-        }
-      >
-        <.maybe_value value={member.house_number} empty_sr_text={gettext("Not specified")}>
-          {member.house_number}
-        </.maybe_value>
-      </:col>
-      <:col
-        :let={member}
-        :if={:postal_code in @member_fields_visible}
-        label={
-          ~H"""
-          <.live_component
-            module={MvWeb.Components.SortHeaderComponent}
-            id={:sort_postal_code}
-            field={:postal_code}
-            label={gettext("Postal Code")}
-            sort_field={@sort_field}
-            sort_order={@sort_order}
-          />
-          """
-        }
-      >
-        <.maybe_value value={member.postal_code} empty_sr_text={gettext("Not specified")}>
-          {member.postal_code}
-        </.maybe_value>
-      </:col>
       <:col
         :let={member}
         :if={:membership_fee_start_date in @member_fields_visible}
+        sort_field={:membership_fee_start_date}
         label={
           ~H"""
           <.live_component
@@ -407,6 +452,7 @@
       <:col
         :let={member}
         :if={:membership_fee_type in @member_fields_visible}
+        sort_field={:membership_fee_type}
         label={
           ~H"""
           <.live_component
@@ -443,6 +489,7 @@
       <:col
         :let={member}
         :if={:groups in @member_fields_visible}
+        sort_field={:groups}
         label={
           ~H"""
           <.live_component
@@ -491,11 +538,17 @@
           class="h-0"
         >
         </div>
+        <%!-- The accent (background + top separator) and row height live on the
+        full-width footer cell (see #members-footer in app.css) so they span the
+        whole table edge-to-edge and match the active density. This inner element
+        stays pinned to the visible viewport width via StickyViewportWidth and is
+        transparent, so the cell accent shows through while the spinner/label stay
+        centered during horizontal scroll. --%>
         <div
           id="members-loading-bar"
           phx-hook="StickyViewportWidth"
           data-scroll-container="members-table-guard"
-          class="sticky left-0 flex items-center justify-center gap-2 border-t border-base-300 bg-base-200 py-4 text-base-content/70"
+          class="sticky left-0 flex items-center justify-center gap-2 text-base-content/70"
           data-testid="members-loading-row"
         >
           <span class="loading loading-spinner loading-sm" aria-hidden="true"></span>
diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex
index 8db026d5..682b7b9f 100644
--- a/lib/mv_web/live/member_live/index/field_visibility.ex
+++ b/lib/mv_web/live/member_live/index/field_visibility.ex
@@ -31,7 +31,21 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   # Groups and membership_fee_type are also pseudo fields (not in member_fields(), displayed in the table).
   # :name and :address are composite display-only columns (Name = name + email,
   # Address = street/house number over postal code/city).
-  @pseudo_member_fields [:membership_fee_status, :membership_fee_type, :groups, :name, :address]
+  # Order mirrors the overview table / export column order (fee type before fee
+  # status), so the Columns dropdown and the table agree.
+  @pseudo_member_fields [:membership_fee_type, :membership_fee_status, :groups, :name, :address]
+
+  # The composite display columns and the constituent columns they replace. The
+  # column manager offers exactly one variant per group, selected by the view
+  # settings: the composite when the matching "compact" setting is on, otherwise
+  # the constituents (see `offered_member_fields/2`).
+  @name_composite :name
+  @name_constituents [:first_name, :last_name, :email]
+  @address_composite :address
+  @address_constituents [:street, :house_number, :postal_code, :city]
+
+  # Export/API may accept this as alias; must not appear in the UI options list.
+  @export_only_alias :payment_status
 
   # Curated default-visible column set (§1.2): the columns shown on first visit
   # when there is no persisted selection and no global override. Everything else
@@ -52,8 +66,139 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   @spec default_visible_fields() :: [atom()]
   def default_visible_fields, do: MapSet.to_list(@default_visible_fields)
 
-  # Export/API may accept this as alias; must not appear in the UI options list.
-  @export_only_alias :payment_status
+  @doc """
+  The curated default-visible columns for the given view settings.
+
+  In compact mode the composite `:name` / `:address` columns are visible by
+  default; when a composite is switched off, its constituent columns take over
+  as the defaults instead (§7b).
+
+  While the Member composite is compact, `include_email` decides where the email
+  lives: folded into the Member cell (`true`, no separate column), or as a
+  default-visible `:email` column (`false`).
+  """
+  @spec default_visible_fields(boolean(), boolean(), boolean()) :: [atom()]
+  def default_visible_fields(compact_member, include_email, compact_address) do
+    compact_member
+    |> default_visible_set(include_email, compact_address)
+    |> MapSet.to_list()
+  end
+
+  defp default_visible_set(compact_member, include_email, compact_address) do
+    @default_visible_fields
+    |> apply_name_default(compact_member, include_email)
+    |> apply_group_default(compact_address, @address_composite, @address_constituents)
+  end
+
+  # Compact Member cell with email folded in: only the composite is default.
+  defp apply_name_default(set, true = _compact, true = _include_email), do: set
+
+  # Compact Member cell without folded email: the composite plus a separate
+  # default-visible E-Mail column.
+  defp apply_name_default(set, true = _compact, false = _include_email),
+    do: MapSet.put(set, :email)
+
+  # Non-compact: drop the composite and make first/last name and email default.
+  defp apply_name_default(set, false = _compact, _include_email) do
+    set
+    |> MapSet.delete(@name_composite)
+    |> MapSet.union(MapSet.new(@name_constituents))
+  end
+
+  # Compact: the composite stays the default. Non-compact: drop the composite and
+  # make the constituents default-visible.
+  defp apply_group_default(set, true, _composite, _constituents), do: set
+
+  defp apply_group_default(set, false, composite, constituents) do
+    set
+    |> MapSet.delete(composite)
+    |> MapSet.union(MapSet.new(constituents))
+  end
+
+  @doc """
+  Member-field atoms the column manager offers for the given view settings, in
+  dropdown/table order.
+
+  The identity block always leads, regardless of whether each group is compact:
+
+  1. the name group — the composite `:name` when compact, otherwise its
+     constituents `:first_name`, `:last_name`;
+  2. the `:email` column, when offered as a separate column (it is folded into
+     the Member cell only while the composite is compact and `include_email` is
+     on);
+  3. the address group — the composite `:address` when compact, otherwise its
+     constituents `:street`, `:house_number`, `:postal_code`, `:city`.
+
+  Everything else follows in the configured Datenfelder order. This keeps the
+  name group ahead of the address group even when the name group is expanded
+  into `:first_name`/`:last_name` while the address stays compact.
+  """
+  @spec offered_member_fields(boolean(), boolean(), boolean()) :: [atom()]
+  def offered_member_fields(compact_member, include_email, compact_address) do
+    name_group = if compact_member, do: [@name_composite], else: [:first_name, :last_name]
+    email_group = if email_offered?(compact_member, include_email), do: [:email], else: []
+
+    address_group =
+      if compact_address, do: [@address_composite], else: @address_constituents
+
+    leading = name_group ++ email_group ++ address_group
+
+    rest =
+      Enum.reject(overview_member_fields(), fn field ->
+        field == @export_only_alias or
+          hidden_variant?(field, compact_member, include_email, compact_address) or
+          field in leading
+      end)
+
+    leading ++ rest
+  end
+
+  # The email is a separate offered column except when it is folded into the
+  # compact Member cell (compact + include_email).
+  defp email_offered?(compact_member, include_email), do: not (compact_member and include_email)
+
+  # The variant of a composite group that is not offered in the current mode.
+  defp hidden_variant?(field, compact_member, include_email, compact_address) do
+    name_variant_hidden?(field, compact_member, include_email) or
+      address_variant_hidden?(field, compact_address)
+  end
+
+  # Compact hides Vorname/Nachname (folded into the composite). The email is
+  # hidden only when it is folded into the cell (compact + include_email); with
+  # include_email off it stays offered as a separate column. Non-compact hides the
+  # composite in favour of the constituents.
+  defp name_variant_hidden?(@name_composite, compact_member, _include_email),
+    do: not compact_member
+
+  defp name_variant_hidden?(:email, compact_member, include_email),
+    do: compact_member and include_email
+
+  defp name_variant_hidden?(field, compact_member, _include_email)
+       when field in [:first_name, :last_name],
+       do: compact_member
+
+  defp name_variant_hidden?(_field, _compact_member, _include_email), do: false
+
+  defp address_variant_hidden?(@address_composite, compact_address),
+    do: not compact_address
+
+  defp address_variant_hidden?(field, compact_address)
+       when field in [:street, :house_number, :postal_code, :city],
+       do: compact_address
+
+  defp address_variant_hidden?(_field, _compact_address), do: false
+
+  @doc """
+  All fields the column manager offers for the given view settings: the offered
+  member fields (see `offered_member_fields/3`) followed by the custom fields.
+  """
+  @spec get_offered_fields([struct()], boolean(), boolean(), boolean()) :: [
+          atom() | String.t()
+        ]
+  def get_offered_fields(custom_fields, compact_member, include_email, compact_address) do
+    custom_field_names = Enum.map(custom_fields, &"custom_field_#{&1.id}")
+    offered_member_fields(compact_member, include_email, compact_address) ++ custom_field_names
+  end
 
   defp overview_member_fields do
     Mv.Constants.member_fields() ++ @pseudo_member_fields
@@ -93,8 +238,28 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
           String.t() => boolean()
         }
   def selection_from_url_only(url_selection, custom_fields) when is_map(url_selection) do
-    all_fields = get_all_available_fields(custom_fields)
+    do_selection_from_url_only(url_selection, get_all_available_fields(custom_fields))
+  end
 
+  def selection_from_url_only(_, _), do: %{}
+
+  @doc """
+  Like `selection_from_url_only/2`, but scoped to the columns offered for the
+  given view settings (`:compact_member` / `:member_include_email` /
+  `:compact_address` in `opts`).
+  """
+  @spec selection_from_url_only(%{String.t() => boolean()}, [struct()], keyword()) :: %{
+          String.t() => boolean()
+        }
+  def selection_from_url_only(url_selection, custom_fields, opts)
+      when is_map(url_selection) and is_list(opts) do
+    {cm, ie, ca} = view_opts(opts)
+    do_selection_from_url_only(url_selection, get_offered_fields(custom_fields, cm, ie, ca))
+  end
+
+  def selection_from_url_only(_, _, _), do: %{}
+
+  defp do_selection_from_url_only(url_selection, all_fields) do
     Enum.reduce(all_fields, %{}, fn field, acc ->
       field_string = field_to_string(field)
       visible = Map.get(url_selection, field_string, false)
@@ -102,7 +267,13 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
     end)
   end
 
-  def selection_from_url_only(_, _), do: %{}
+  defp view_opts(opts) do
+    {
+      Keyword.get(opts, :compact_member, true),
+      Keyword.get(opts, :member_include_email, false),
+      Keyword.get(opts, :compact_address, true)
+    }
+  end
 
   @doc """
   Merges user field selection with global settings.
@@ -135,7 +306,31 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
         ) :: %{String.t() => boolean()}
   def merge_with_global_settings(user_selection, global_settings, custom_fields) do
     all_fields = get_all_available_fields(custom_fields)
-    global_visibility = get_global_visibility_map(global_settings, custom_fields)
+    do_merge(user_selection, global_settings, custom_fields, all_fields, @default_visible_fields)
+  end
+
+  @doc """
+  Like `merge_with_global_settings/3`, but scoped to the columns offered for the
+  given view settings (`:compact_member` / `:member_include_email` /
+  `:compact_address` in `opts`).
+
+  Only offered columns appear in the result, so a column that is not applicable
+  in the current mode (e.g. `:first_name` while the composite "Name" is on) never
+  leaks into the visible set. Defaults follow the mode via
+  `default_visible_fields/2`.
+  """
+  @spec merge_with_global_settings(%{String.t() => boolean()}, map(), [struct()], keyword()) ::
+          %{String.t() => boolean()}
+  def merge_with_global_settings(user_selection, global_settings, custom_fields, opts)
+      when is_list(opts) do
+    {cm, ie, ca} = view_opts(opts)
+    all_fields = get_offered_fields(custom_fields, cm, ie, ca)
+    default_set = default_visible_set(cm, ie, ca)
+    do_merge(user_selection, global_settings, custom_fields, all_fields, default_set)
+  end
+
+  defp do_merge(user_selection, global_settings, custom_fields, all_fields, default_set) do
+    global_visibility = get_global_visibility_map(global_settings, custom_fields, default_set)
 
     Enum.reduce(all_fields, %{}, fn field, acc ->
       field_string = field_to_string(field)
@@ -280,15 +475,15 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   def get_visible_custom_fields(_), do: []
 
   # Gets global visibility map from settings
-  defp get_global_visibility_map(settings, custom_fields) do
-    member_visibility = get_member_field_visibility_from_settings(settings)
+  defp get_global_visibility_map(settings, custom_fields, default_set) do
+    member_visibility = get_member_field_visibility_from_settings(settings, default_set)
     custom_field_visibility = get_custom_field_visibility(custom_fields)
 
     Map.merge(member_visibility, custom_field_visibility)
   end
 
   # Gets member field visibility from settings (domain fields from settings, pseudo fields default true)
-  defp get_member_field_visibility_from_settings(settings) do
+  defp get_member_field_visibility_from_settings(settings, default_set) do
     visibility_config =
       VisibilityConfig.normalize(Map.get(settings, :member_field_visibility, %{}))
 
@@ -297,13 +492,13 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
     domain_map =
       Enum.reduce(domain_fields, %{}, fn field, acc ->
         field_string = Atom.to_string(field)
-        default_visibility = MapSet.member?(@default_visible_fields, field)
+        default_visibility = MapSet.member?(default_set, field)
         show_in_overview = Map.get(visibility_config, field, default_visibility)
         Map.put(acc, field_string, show_in_overview)
       end)
 
     Enum.reduce(@pseudo_member_fields, domain_map, fn field, acc ->
-      Map.put(acc, Atom.to_string(field), MapSet.member?(@default_visible_fields, field))
+      Map.put(acc, Atom.to_string(field), MapSet.member?(default_set, field))
     end)
   end
 
diff --git a/lib/mv_web/live/member_live/index/view_settings.ex b/lib/mv_web/live/member_live/index/view_settings.ex
new file mode 100644
index 00000000..d80a076e
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/view_settings.ex
@@ -0,0 +1,186 @@
+defmodule MvWeb.MemberLive.Index.ViewSettings do
+  @moduledoc """
+  Resolves and persists the member-overview view settings per browser/device.
+
+  A view-settings value is a map of four keys:
+
+    * `:density` — `:compact` or `:comfortable` (the row-spacing / compact mode)
+    * `:compact_member` — composite "Member" cell (last+first name) vs separate
+      Vorname/Nachname columns
+    * `:member_include_email` — whether the email is surfaced (email line in the
+      composite cell, or a separate Email column when the member field is split)
+    * `:compact_address` — composite Address cell (street / postal+city) vs
+      separate Straße/PLZ/Ort columns
+
+  Persistence is per browser (not per account), resolved in priority order from
+  the LiveView connect params, the session, the request cookie, and finally the
+  global defaults (`defaults/0`). The chosen value is written to a long-lived
+  cookie by a small client-side listener; on the next connected mount the client
+  echoes the cookie back through the socket connect params (the connect-info map
+  on a live socket does not expose cookies), and on the disconnected render the
+  cookie is read directly from the request conn.
+  """
+
+  @cookie_name "member_view_settings"
+  @session_key "member_view_settings"
+  @connect_param "view_settings"
+  @cookie_max_age 365 * 24 * 60 * 60
+
+  @defaults %{
+    density: :compact,
+    compact_member: true,
+    member_include_email: false,
+    compact_address: true
+  }
+
+  @densities [:compact, :comfortable]
+  @bool_keys [:compact_member, :member_include_email, :compact_address]
+
+  @type t :: %{
+          density: :compact | :comfortable,
+          compact_member: boolean(),
+          member_include_email: boolean(),
+          compact_address: boolean()
+        }
+
+  @doc "The global default view settings used when nothing is stored."
+  @spec defaults() :: %{
+          density: :compact,
+          compact_member: true,
+          member_include_email: false,
+          compact_address: true
+        }
+  def defaults, do: @defaults
+
+  @doc "The cookie name the settings are persisted under (used by the client listener)."
+  @spec cookie_name() :: String.t()
+  def cookie_name, do: @cookie_name
+
+  @doc "The cookie max-age in seconds (365 days)."
+  @spec cookie_max_age() :: 31_536_000
+  def cookie_max_age, do: @cookie_max_age
+
+  @doc """
+  Parses a raw map (string or atom keys, string/boolean values) into a validated
+  partial settings map with atom keys. Unknown keys and invalid values are
+  dropped, so a caller can safely `Map.merge/2` the result over another source.
+  """
+  @spec parse(term()) :: %{optional(atom()) => term()}
+  def parse(raw) when is_map(raw) do
+    Enum.reduce(raw, %{}, fn {key, value}, acc ->
+      case parse_pair(to_string(key), value) do
+        {k, v} -> Map.put(acc, k, v)
+        :error -> acc
+      end
+    end)
+  end
+
+  def parse(_), do: %{}
+
+  defp parse_pair("density", value) do
+    case parse_density(value) do
+      nil -> :error
+      density -> {:density, density}
+    end
+  end
+
+  defp parse_pair(key, value)
+       when key in ~w(compact_member member_include_email compact_address) do
+    case parse_bool(value) do
+      nil -> :error
+      bool -> {String.to_existing_atom(key), bool}
+    end
+  end
+
+  defp parse_pair(_key, _value), do: :error
+
+  defp parse_density(value) when value in @densities, do: value
+  defp parse_density("compact"), do: :compact
+  defp parse_density("comfortable"), do: :comfortable
+  defp parse_density(_), do: nil
+
+  defp parse_bool(value) when is_boolean(value), do: value
+  defp parse_bool("true"), do: true
+  defp parse_bool("false"), do: false
+  defp parse_bool(_), do: nil
+
+  @doc "Reads partial settings from the LiveView session map."
+  @spec get_from_session(map()) :: %{optional(atom()) => term()}
+  def get_from_session(session) when is_map(session),
+    do: parse_json(Map.get(session, @session_key))
+
+  def get_from_session(_), do: %{}
+
+  @doc "Reads partial settings from the request cookie header of a connect-info conn."
+  @spec get_from_cookie(Plug.Conn.t() | nil) :: %{optional(atom()) => term()}
+  def get_from_cookie(%Plug.Conn{} = conn) do
+    case Plug.Conn.get_req_header(conn, "cookie") do
+      [cookie_header | _rest] ->
+        cookie_header
+        |> parse_cookie_header()
+        |> Map.get(@cookie_name)
+        |> parse_json()
+
+      _ ->
+        %{}
+    end
+  end
+
+  def get_from_cookie(_), do: %{}
+
+  @doc "Reads partial settings from the LiveView connect params (raw JSON string)."
+  @spec get_from_connect_params(map() | nil) :: %{optional(atom()) => term()}
+  def get_from_connect_params(params) when is_map(params),
+    do: parse_json(Map.get(params, @connect_param))
+
+  def get_from_connect_params(_), do: %{}
+
+  @doc """
+  Resolves the effective view settings for a mount, merging the sources by
+  priority (connect params > session > cookie), falling back per key to the
+  global defaults.
+  """
+  @spec resolve(map(), Plug.Conn.t() | nil, map() | nil) :: t()
+  def resolve(session, conn, connect_params \\ nil) do
+    @defaults
+    |> Map.merge(get_from_cookie(conn))
+    |> Map.merge(get_from_session(session))
+    |> Map.merge(get_from_connect_params(connect_params))
+  end
+
+  @doc "Serializes settings to a JSON string for the client-side cookie writer."
+  @spec to_json(map()) :: String.t()
+  def to_json(settings) when is_map(settings) do
+    settings
+    |> Map.take([:density | @bool_keys])
+    |> Map.new(fn
+      {:density, density} -> {:density, to_string(density)}
+      {key, value} -> {key, value}
+    end)
+    |> Jason.encode!()
+  end
+
+  defp parse_json(nil), do: %{}
+
+  defp parse_json(json) when is_binary(json) do
+    case Jason.decode(json) do
+      {:ok, decoded} -> parse(decoded)
+      _ -> %{}
+    end
+  end
+
+  defp parse_json(_), do: %{}
+
+  # Parses a cookie header string into a name => value map.
+  defp parse_cookie_header(cookie_header) when is_binary(cookie_header) do
+    cookie_header
+    |> String.split(";")
+    |> Enum.map(&String.trim/1)
+    |> Enum.map(&String.split(&1, "=", parts: 2))
+    |> Enum.reduce(%{}, fn
+      [key, value], acc -> Map.put(acc, key, URI.decode(value))
+      [key], acc -> Map.put(acc, key, "")
+      _, acc -> acc
+    end)
+  end
+end
diff --git a/test/mv_web/components/sort_header_component_test.exs b/test/mv_web/components/sort_header_component_test.exs
index 955c3c3f..2ae3ce01 100644
--- a/test/mv_web/components/sort_header_component_test.exs
+++ b/test/mv_web/components/sort_header_component_test.exs
@@ -4,11 +4,25 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   # The curated default columns hide the individual name/address sort headers,
   # so these component tests make every sortable field visible via ?fields=.
+  # The individual name/address constituents are only *offered* when the compact
+  # Member / Address view settings are off, so the session opts them out of the
+  # composite columns before selecting the fields via ?fields=.
   @cols "first_name,email,street,house_number,postal_code,city,country,join_date"
 
+  # Disables the compact Member/Address composites so first_name/last_name/email
+  # and street/house_number/postal_code/city are offered as individual sortable
+  # columns (persisted per browser via the view-settings session key).
+  defp non_compact(conn) do
+    Plug.Conn.put_session(
+      conn,
+      "member_view_settings",
+      ~s({"compact_member":false,"compact_address":false})
+    )
+  end
+
   describe "rendering" do
     test "renders with correct attributes", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test that the component renders with correct attributes
@@ -18,7 +32,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "renders all sortable headers", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       sortable_fields = [
@@ -38,7 +52,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "renders correct labels", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test specific labels
@@ -50,7 +64,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   describe "sort icons" do
     test "shows neutral icon for specific field when not sorted", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # The neutral icon has the opcity class we can test for
@@ -62,7 +76,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "shows ascending icon for specific field when sorted ascending", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, html} =
         live(conn, "/members?fields=#{@cols}&query=&sort_field=city&sort_order=asc")
@@ -85,7 +99,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "shows descending icon for specific field when sorted descending", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, _view, html} =
         live(conn, "/members?fields=#{@cols}&query=&sort_field=email&sort_order=desc")
@@ -99,7 +113,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "multiple fields can have different icon states", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=#{@cols}&query=&sort_field=city&sort_order=asc")
@@ -118,7 +132,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "icon state changes correctly when clicking different fields", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Start: all fields neutral except first name as default
@@ -146,7 +160,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "specific field shows correct icon for each sort state", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       # Test EMAIL field specifically
       {:ok, view, html_asc} =
@@ -167,7 +181,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "icon distribution shows exactly one active sort icon", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       # Test neutral state - only one field should have active sort icon
       {:ok, _view, html_neutral} = live(conn, "/members?fields=#{@cols}")
@@ -204,7 +218,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   describe "accessibility" do
     test "sets aria-label correctly for unsorted state", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Check aria-label for unsorted state
@@ -212,7 +226,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "sets aria-label correctly for ascending sort", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=asc")
@@ -222,7 +236,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "sets aria-label correctly for descending sort", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=desc")
@@ -232,7 +246,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "includes tooltip with correct aria-label", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=asc")
@@ -243,7 +257,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "aria-labels work for all sortable fields", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=desc")
 
       # Test aria-labels for different fields
@@ -260,7 +274,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   describe "component behavior" do
     test "clicking triggers sort event on parent LiveView", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Click on the first name sort header
@@ -273,7 +287,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "component handles different field types correctly", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Test that different field types render correctly
@@ -285,7 +299,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   describe "edge cases" do
     test "handles invalid sort field gracefully", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, html} =
         live(conn, "/members?fields=#{@cols}&sort_field=invalid_field&sort_order=asc")
@@ -296,7 +310,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "handles invalid sort order gracefully", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, html} =
         live(conn, "/members?fields=#{@cols}&sort_field=first_name&sort_order=invalid")
@@ -307,7 +321,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "handles empty sort parameters", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, html} = live(conn, "/members?fields=#{@cols}&sort_field=&sort_order=")
 
       # Should show neutral icons
@@ -318,7 +332,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
 
   describe "icon state transitions" do
     test "icon changes when sorting state changes", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members?fields=#{@cols}")
 
       # Start with neutral state
@@ -334,7 +348,7 @@ defmodule MvWeb.Components.SortHeaderComponentTest do
     end
 
     test "multiple fields can be tested for icon states", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, html} = live(conn, "/members?fields=#{@cols}&sort_field=email&sort_order=desc")
 
       # Email should be active (descending)
diff --git a/test/mv_web/live/member_live/index/field_visibility_test.exs b/test/mv_web/live/member_live/index/field_visibility_test.exs
index 427cbead..728c6cf5 100644
--- a/test/mv_web/live/member_live/index/field_visibility_test.exs
+++ b/test/mv_web/live/member_live/index/field_visibility_test.exs
@@ -201,6 +201,56 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
     end
   end
 
+  describe "offered_member_fields/3 ordering (name group, then email, then address group, then rest)" do
+    test "compact member + compact address: Name, E-Mail, Adresse lead" do
+      result = FieldVisibility.offered_member_fields(true, false, true)
+
+      assert Enum.take(result, 3) == [:name, :email, :address]
+      # the composite constituents are not offered while their composite is on
+      refute :first_name in result
+      refute :street in result
+      # the Datenfelder-ordered rest trails the identity block
+      assert index_of(result, :address) < index_of(result, :join_date)
+    end
+
+    test "compact member with email folded in: no separate E-Mail column" do
+      result = FieldVisibility.offered_member_fields(true, true, true)
+
+      assert Enum.take(result, 2) == [:name, :address]
+      refute :email in result
+    end
+
+    test "non-compact member + compact address: Vorname/Nachname/E-Mail before Adresse" do
+      result = FieldVisibility.offered_member_fields(false, false, true)
+
+      # the reported bug: the composite address must not jump ahead of the
+      # expanded name constituents
+      assert Enum.take(result, 4) == [:first_name, :last_name, :email, :address]
+      assert index_of(result, :address) < index_of(result, :join_date)
+    end
+
+    test "non-compact member + non-compact address: name, email, then the address block, then rest" do
+      result = FieldVisibility.offered_member_fields(false, false, false)
+
+      assert Enum.take(result, 7) == [
+               :first_name,
+               :last_name,
+               :email,
+               :street,
+               :house_number,
+               :postal_code,
+               :city
+             ]
+
+      # join_date and later Datenfelder columns never precede the address block
+      assert index_of(result, :city) < index_of(result, :join_date)
+      refute :name in result
+      refute :address in result
+    end
+  end
+
+  defp index_of(list, elem), do: Enum.find_index(list, &(&1 == elem))
+
   describe "get_visible_fields/1" do
     test "returns only fields with true visibility" do
       selection = %{
diff --git a/test/mv_web/live/member_live/index/view_settings_test.exs b/test/mv_web/live/member_live/index/view_settings_test.exs
new file mode 100644
index 00000000..44a86f96
--- /dev/null
+++ b/test/mv_web/live/member_live/index/view_settings_test.exs
@@ -0,0 +1,109 @@
+defmodule MvWeb.MemberLive.Index.ViewSettingsTest do
+  @moduledoc """
+  §1.20 / §1.5 — the member-overview view settings (density + the compact
+  member/address field toggles) and their per-browser persistence chain
+  (connect params > session > cookie > global default).
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.ViewSettings
+
+  test "defaults are all-compact with the email line off" do
+    assert ViewSettings.defaults() == %{
+             density: :compact,
+             compact_member: true,
+             member_include_email: false,
+             compact_address: true
+           }
+  end
+
+  describe "parse/1" do
+    test "reads a partial map with string keys and string/bool values" do
+      assert ViewSettings.parse(%{
+               "density" => "comfortable",
+               "compact_member" => false,
+               "member_include_email" => true
+             }) == %{
+               density: :comfortable,
+               compact_member: false,
+               member_include_email: true
+             }
+    end
+
+    test "ignores unknown keys and invalid values" do
+      assert ViewSettings.parse(%{"density" => "huge", "bogus" => true}) == %{}
+    end
+
+    test "returns empty map for non-maps" do
+      assert ViewSettings.parse(nil) == %{}
+      assert ViewSettings.parse("x") == %{}
+    end
+  end
+
+  describe "get_from_* sources" do
+    test "session JSON string" do
+      session = %{"member_view_settings" => ~s({"density":"comfortable"})}
+      assert ViewSettings.get_from_session(session) == %{density: :comfortable}
+      assert ViewSettings.get_from_session(%{}) == %{}
+    end
+
+    test "cookie header" do
+      json = ~s({"compact_address":false})
+      conn = %Plug.Conn{req_headers: [{"cookie", "member_view_settings=#{URI.encode(json)}"}]}
+      assert ViewSettings.get_from_cookie(conn) == %{compact_address: false}
+      assert ViewSettings.get_from_cookie(%Plug.Conn{req_headers: []}) == %{}
+      assert ViewSettings.get_from_cookie(nil) == %{}
+    end
+
+    test "connect params (raw JSON string under view_settings)" do
+      params = %{"view_settings" => ~s({"density":"comfortable","compact_member":false})}
+
+      assert ViewSettings.get_from_connect_params(params) == %{
+               density: :comfortable,
+               compact_member: false
+             }
+
+      assert ViewSettings.get_from_connect_params(nil) == %{}
+    end
+  end
+
+  describe "resolve/3 priority connect_params > session > cookie > default" do
+    test "falls back to defaults when nothing is stored" do
+      assert ViewSettings.resolve(%{}, nil, nil) == ViewSettings.defaults()
+    end
+
+    test "cookie overrides default, session overrides cookie, connect params win" do
+      cookie_json = ~s({"density":"comfortable","compact_member":false,"compact_address":false})
+
+      conn = %Plug.Conn{
+        req_headers: [{"cookie", "member_view_settings=#{URI.encode(cookie_json)}"}]
+      }
+
+      session = %{"member_view_settings" => ~s({"compact_member":true})}
+      connect_params = %{"view_settings" => ~s({"density":"compact"})}
+
+      assert ViewSettings.resolve(session, conn, connect_params) == %{
+               # from connect params (highest)
+               density: :compact,
+               # from session (overrides cookie)
+               compact_member: true,
+               # from cookie
+               compact_address: false,
+               # default
+               member_include_email: false
+             }
+    end
+  end
+
+  test "to_json/1 round-trips through parse/1" do
+    settings = %{
+      density: :comfortable,
+      compact_member: false,
+      member_include_email: true,
+      compact_address: false
+    }
+
+    assert settings |> ViewSettings.to_json() |> Jason.decode!() |> ViewSettings.parse() ==
+             settings
+  end
+end
diff --git a/test/mv_web/member_live/index_a11y_hardening_test.exs b/test/mv_web/member_live/index_a11y_hardening_test.exs
new file mode 100644
index 00000000..4b6434fc
--- /dev/null
+++ b/test/mv_web/member_live/index_a11y_hardening_test.exs
@@ -0,0 +1,78 @@
+defmodule MvWeb.MemberLive.IndexA11yHardeningTest do
+  @moduledoc """
+  §3.5 — WCAG 2.2 AA posture: ≥24px interactive targets in both densities,
+  scroll-margin on rows so a focused row is not obscured by the sticky header,
+  select-all `indeterminate` for partial selection, and reflow markup keeping the
+  table in its own focusable scroll region.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  @moduletag :ui
+
+  setup %{conn: conn} do
+    actor = SystemActor.get_system_actor()
+
+    members =
+      for i <- 1..3 do
+        {:ok, m} =
+          Mv.Membership.create_member(
+            %{first_name: "Wcag#{i}", last_name: "Row", email: "wcag#{i}@example.com"},
+            actor: actor
+          )
+
+        m
+      end
+
+    %{conn: conn_with_oidc_user(conn), members: members}
+  end
+
+  test "rows reserve scroll-margin under the sticky header", %{conn: conn} do
+    {:ok, _view, html} = live(conn, ~p"/members")
+    assert html =~ "scroll-mt-16"
+  end
+
+  test "the table lives in its own focusable scroll region that reflows", %{conn: conn} do
+    {:ok, _view, html} = live(conn, ~p"/members")
+
+    # Focusable region (1.4.10: table scrolls within its own focusable region).
+    assert html =~ ~r/data-testid="members-table-scroll"[^>]*tabindex="0"/
+    # The toolbar reflows to one column on narrow viewports.
+    assert html =~ "flex-wrap"
+  end
+
+  test "interactive row targets meet the >=24px minimum in both densities", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Compact (default) and comfortable both keep the >=24px checkbox target.
+    assert has_element?(view, "input[type='checkbox'].min-h-6.min-w-6")
+
+    # Switch to comfortable via the view-settings dropdown.
+    view |> element("[data-testid='view-settings-button']") |> render_click()
+    view |> element("[data-testid='view-setting-density']") |> render_click()
+    assert has_element?(view, "input[type='checkbox'].min-h-6.min-w-6")
+  end
+
+  test "select-all reflects indeterminate for a partial selection", %{
+    conn: conn,
+    members: members
+  } do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # No selection: not indeterminate.
+    assert has_element?(view, "#select-all-checkbox[data-indeterminate='false']")
+
+    # Select one of several -> partial -> indeterminate.
+    [m | _] = members
+    render_click(view, "select_member", %{"id" => m.id})
+    assert has_element?(view, "#select-all-checkbox[data-indeterminate='true']")
+
+    # Select all -> fully checked, not indeterminate.
+    view |> element("[phx-click='select_all']") |> render_click()
+    assert has_element?(view, "#select-all-checkbox[data-indeterminate='false']")
+    assert has_element?(view, "#select-all-checkbox[checked]")
+  end
+end
diff --git a/test/mv_web/member_live/index_column_manager_test.exs b/test/mv_web/member_live/index_column_manager_test.exs
new file mode 100644
index 00000000..723b8f2d
--- /dev/null
+++ b/test/mv_web/member_live/index_column_manager_test.exs
@@ -0,0 +1,76 @@
+defmodule MvWeb.MemberLive.IndexColumnManagerTest do
+  @moduledoc """
+  §1.6 — The column manager sits in the filter toolbar, offers a per-column
+  visibility toggle plus All and None controls styled as buttons (not links),
+  and applies changes while preserving the existing persistence chain.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Manager", last_name: "Columns", email: "manager@example.com"},
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "column manager trigger sits alongside the filter controls", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Both the filter panel trigger and the column-manager trigger render in the
+    # same toolbar.
+    assert has_element?(view, ~s(button[aria-label="Filter members"]))
+    assert has_element?(view, "button[aria-controls='field-visibility-menu']")
+  end
+
+  test "All and None are buttons, not links, and per-column toggles are checkboxes", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("button[aria-controls='field-visibility-menu']") |> render_click()
+
+    # All / None render as buttons with button styling.
+    assert has_element?(view, "button.btn[phx-click='select_all']", "All")
+    assert has_element?(view, "button.btn[phx-click='select_none']", "None")
+    refute has_element?(view, "a[phx-click='select_all']")
+    refute has_element?(view, "a[phx-click='select_none']")
+
+    # Per-column visibility toggles are accessible checkbox menu items.
+    assert has_element?(view, "button[role='menuitemcheckbox'][phx-value-item='name']")
+  end
+
+  test "toggling a column applies and is reflected in the URL (persistence)", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("button[aria-controls='field-visibility-menu']") |> render_click()
+    view |> element("button[phx-value-item='join_date']") |> render_click()
+
+    # The selection is pushed to the URL fields param so it survives reloads.
+    path = assert_patch(view)
+    assert path =~ "fields="
+    refute has_element?(view, "[data-testid='join_date']")
+  end
+
+  test "a reset button restores the curated default column set", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("button[aria-controls='field-visibility-menu']") |> render_click()
+
+    # Reset is a button styled like All/None, sitting next to them, with a tooltip.
+    assert has_element?(view, "button.btn[phx-click='reset_fields']")
+
+    # Hide a curated-default column, then reset restores it.
+    view |> element("button[phx-value-item='join_date']") |> render_click()
+    assert_patch(view)
+    refute has_element?(view, "[data-testid='join_date']")
+
+    view |> element("button[phx-click='reset_fields']") |> render_click()
+    assert_patch(view)
+    assert has_element?(view, "[data-testid='join_date']")
+  end
+end
diff --git a/test/mv_web/member_live/index_default_columns_test.exs b/test/mv_web/member_live/index_default_columns_test.exs
index 04d3c993..5f5545d6 100644
--- a/test/mv_web/member_live/index_default_columns_test.exs
+++ b/test/mv_web/member_live/index_default_columns_test.exs
@@ -1,8 +1,9 @@
 defmodule MvWeb.MemberLive.IndexDefaultColumnsTest do
   @moduledoc """
   §1.2 — With no persisted column selection, exactly the curated default columns
-  are visible: selection checkbox, Name (name + email), Address (composite),
-  fee type, fee status, groups, join date.
+  are visible: selection checkbox, Name (composite, no in-cell email line),
+  E-Mail (its own column while the compact Member field keeps the email line off),
+  Address (composite), fee type, fee status, groups, join date.
   """
   use MvWeb.ConnCase, async: false
 
@@ -34,6 +35,8 @@ defmodule MvWeb.MemberLive.IndexDefaultColumnsTest do
     # Composite Name + Address cells.
     assert has_element?(view, "[data-testid='member-name']")
     assert has_element?(view, "[data-testid='member-address']")
+    # E-Mail is its own column by default (compact Member field, email line off).
+    assert has_element?(view, "[data-testid='email']")
     # Fee type, fee status, groups, join date headers.
     assert has_element?(view, "[data-testid='membership_fee_type']")
     assert has_element?(view, "[data-testid='join_date']")
@@ -44,7 +47,9 @@ defmodule MvWeb.MemberLive.IndexDefaultColumnsTest do
   test "the individual name/address sub-fields are hidden by default", %{conn: conn} do
     {:ok, view, _html} = live(conn, ~p"/members")
 
-    for field <- ~w(first_name last_name email city street house_number postal_code country) do
+    # The composite Name/Address cells replace their constituents by default.
+    # E-Mail is excluded here: it is a default-visible column of its own.
+    for field <- ~w(first_name last_name city street house_number postal_code country) do
       refute has_element?(view, "[data-testid='#{field}']")
     end
   end
diff --git a/test/mv_web/member_live/index_density_test.exs b/test/mv_web/member_live/index_density_test.exs
new file mode 100644
index 00000000..dac7c3a6
--- /dev/null
+++ b/test/mv_web/member_live/index_density_test.exs
@@ -0,0 +1,73 @@
+defmodule MvWeb.MemberLive.IndexDensityTest do
+  @moduledoc """
+  §1.4 — The density toggle switches the table row-spacing token and reflects the
+  active density in the control state.
+  §1.5 — Density persists across reload per browser (session/cookie), with the
+  global default applying when nothing is stored.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Dense", last_name: "Row", email: "dense@example.com"},
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  defp open_view_settings(view) do
+    view |> element("[data-testid='view-settings-button']") |> render_click()
+    view
+  end
+
+  test "defaults to compact when nothing is stored", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='members-table-scroll'][data-density='compact']")
+    # The compact-mode toggle reflects the active (compact) state.
+    open_view_settings(view)
+    assert has_element?(view, "[data-testid='view-setting-density'][aria-checked='true']")
+  end
+
+  test "toggle switches the density token and the control state", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_view_settings(view)
+    view |> element("[data-testid='view-setting-density']") |> render_click()
+
+    assert has_element?(view, "[data-testid='members-table-scroll'][data-density='comfortable']")
+    assert has_element?(view, "[data-testid='view-setting-density'][aria-checked='false']")
+
+    # Toggling again returns to compact.
+    view |> element("[data-testid='view-setting-density']") |> render_click()
+    assert has_element?(view, "[data-testid='members-table-scroll'][data-density='compact']")
+  end
+
+  test "restores a persisted density from the session on reload", %{conn: conn} do
+    conn =
+      Plug.Test.init_test_session(conn, %{
+        "member_view_settings" => ~s({"density":"comfortable"})
+      })
+
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='members-table-scroll'][data-density='comfortable']")
+  end
+
+  test "restores a persisted density on the connected mount via connect params", %{conn: conn} do
+    # Faithful reload round-trip: the connected mount cannot read the cookie
+    # (the live socket's connect-info map has no cookies), so the client echoes
+    # the persisted value through connect params. This is the path that was
+    # broken in the R1 accept (cookie written but not restored on mount).
+    conn = put_connect_params(conn, %{"view_settings" => ~s({"density":"comfortable"})})
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='members-table-scroll'][data-density='comfortable']")
+  end
+end
diff --git a/test/mv_web/member_live/index_field_visibility_test.exs b/test/mv_web/member_live/index_field_visibility_test.exs
index 71744f83..fc1e6fa4 100644
--- a/test/mv_web/member_live/index_field_visibility_test.exs
+++ b/test/mv_web/member_live/index_field_visibility_test.exs
@@ -22,6 +22,17 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
 
   require Ash.Query
 
+  # Disables the compact Member/Address composites (per-browser view setting) so
+  # the individual constituent columns (first_name/last_name/email, street/…) are
+  # offered by the column manager and available via ?fields=.
+  defp non_compact(conn) do
+    Plug.Conn.put_session(
+      conn,
+      "member_view_settings",
+      ~s({"compact_member":false,"compact_address":false})
+    )
+  end
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
@@ -112,7 +123,9 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
     end
 
     test "displays all member fields in dropdown", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      # The individual name/address constituents are only offered when the
+      # compact Member/Address composites are off, so opt out of them first.
+      conn = conn |> conn_with_oidc_user() |> non_compact()
       {:ok, view, _html} = live(conn, "/members")
 
       # Open dropdown
@@ -148,9 +161,9 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # The curated Name column carries the email, so it is visible initially.
+      # The curated Name column carries the member names, so they are visible.
       html = render(view)
-      assert html =~ "alice@example.com"
+      assert html =~ "Anderson"
 
       # Open dropdown and hide the Name column
       view
@@ -161,10 +174,10 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       |> element("button[phx-click='select_item'][phx-value-item='name']")
       |> render_click()
 
-      # The Name column (and the email it carries) is no longer visible
+      # The Name column (and the names it carries) is no longer visible
       html = render(view)
-      refute html =~ "alice@example.com"
-      refute html =~ "bob@example.com"
+      refute html =~ "Anderson"
+      refute html =~ "Brown"
     end
 
     test "hiding custom field removes it from display", %{conn: conn, custom_field: custom_field} do
@@ -298,8 +311,8 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, _view, html} = live(conn, "/members")
 
-      # All fields should be visible by default
-      assert html =~ "alice@example.com"
+      # The curated Name and Address columns are visible by default.
+      assert html =~ "Anderson"
       assert html =~ "Main St"
     end
 
@@ -309,7 +322,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Hide the curated Name column (which carries the email) via dropdown
+      # Hide the curated Name column (which carries the names) via dropdown
       view
       |> element("button[aria-controls='field-visibility-menu']")
       |> render_click()
@@ -319,7 +332,7 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       |> render_click()
 
       html = render(view)
-      refute html =~ "alice@example.com"
+      refute html =~ "Anderson"
     end
   end
 
@@ -328,16 +341,16 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, _view, html} = live(conn, "/members?fields=")
 
-      # Should fall back to global settings
-      assert html =~ "alice@example.com"
+      # Should fall back to global settings (curated Name column visible)
+      assert html =~ "Anderson"
     end
 
     test "handles invalid field names in URL", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
       {:ok, _view, html} = live(conn, "/members?fields=invalid_field,another_invalid")
 
-      # Should ignore invalid fields and use defaults
-      assert html =~ "alice@example.com"
+      # Should ignore invalid fields and use defaults (curated Name column visible)
+      assert html =~ "Anderson"
     end
 
     test "handles custom field that doesn't exist", %{conn: conn} do
@@ -429,9 +442,9 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # The curated Name column carries the email, so it is visible initially.
+      # The curated Name column carries the names, so they are visible initially.
       html = render(view)
-      assert html =~ "alice@example.com"
+      assert html =~ "Anderson"
 
       # Open dropdown
       view
@@ -443,9 +456,9 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
       |> element("button[phx-click='select_item'][phx-value-item='name']")
       |> render_keydown(%{key: "Enter"})
 
-      # The Name column (and the email it carries) is no longer visible
+      # The Name column (and the names it carries) is no longer visible
       html = render(view)
-      refute html =~ "alice@example.com"
+      refute html =~ "Anderson"
     end
   end
 end
diff --git a/test/mv_web/member_live/index_groups_url_params_test.exs b/test/mv_web/member_live/index_groups_url_params_test.exs
index 8b92cb90..3de60923 100644
--- a/test/mv_web/member_live/index_groups_url_params_test.exs
+++ b/test/mv_web/member_live/index_groups_url_params_test.exs
@@ -20,6 +20,16 @@ defmodule MvWeb.MemberLive.IndexGroupsUrlParamsTest do
 
   require Ash.Query
 
+  # Disables the compact Member composite (per-browser view setting) so the
+  # individual first_name column is offered and selectable via ?fields=.
+  defp non_compact(conn) do
+    Plug.Conn.put_session(
+      conn,
+      "member_view_settings",
+      ~s({"compact_member":false,"compact_address":false})
+    )
+  end
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
@@ -122,7 +132,7 @@ defmodule MvWeb.MemberLive.IndexGroupsUrlParamsTest do
     member1: member1,
     group1: group1
   } do
-    conn = conn_with_oidc_user(conn)
+    conn = conn |> conn_with_oidc_user() |> non_compact()
 
     {:ok, view, html} =
       live(
diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs
index 6c222276..7b1785bf 100644
--- a/test/mv_web/member_live/index_member_fields_display_test.exs
+++ b/test/mv_web/member_live/index_member_fields_display_test.exs
@@ -38,6 +38,9 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
     conn = conn_with_oidc_user(conn)
     {:ok, _view, html} = live(conn, "/members")
 
+    # The composite Member cell carries first + last name; the in-cell email
+    # line stays off by default, but the email is surfaced in its own column
+    # (compact Member field, include-email off).
     for m <- [m1, m2], field <- [m.first_name, m.last_name, m.email] do
       assert html =~ field
     end
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index e1de77a8..14d76a82 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -13,6 +13,19 @@ defmodule MvWeb.MemberLive.IndexTest do
   alias Mv.Membership.CustomFieldValue
   alias MvWeb.MemberLive.Index, as: MemberIndex
 
+  # Disables the compact Member/Address composites (per-browser view setting) so
+  # the individual constituent columns (first_name/last_name, street/…) are
+  # offered by the column manager and selectable via ?fields=. The composite
+  # E-Mail column is offered even in compact mode, so email-only tests do not
+  # need this.
+  defp non_compact(conn) do
+    Plug.Conn.put_session(
+      conn,
+      "member_view_settings",
+      ~s({"compact_member":false,"compact_address":false})
+    )
+  end
+
   describe "desktop layout: scroll container and sticky table header" do
     @describetag :ui
 
@@ -155,9 +168,11 @@ defmodule MvWeb.MemberLive.IndexTest do
   describe "sorting integration" do
     @describetag :ui
     # The curated default columns no longer expose the individual name/address
-    # sort headers, so these tests make the relevant column visible via ?fields=.
-    # That puts a `fields` param on every push_patch, hence the relaxed
-    # substring assertions instead of exact patch strings.
+    # sort headers. The composite E-Mail column is offered even in compact mode
+    # (so email-only tests just add it via ?fields=), but the name/address
+    # constituents are only offered once their composite view setting is off —
+    # those tests additionally opt out via `non_compact/1`. Either way a `fields`
+    # param rides on every push_patch, hence the relaxed substring assertions.
     test "clicking a column header toggles sort order and updates the URL", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members?fields=email")
@@ -183,7 +198,7 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
 
     test "clicking different column header resets order to ascending", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=first_name,email&sort_field=email&sort_order=desc")
@@ -199,7 +214,7 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
 
     test "all sortable columns work correctly", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(
@@ -275,7 +290,7 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
 
     test "handle_params handles invalid sort field gracefully", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
+      conn = conn |> conn_with_oidc_user() |> non_compact()
 
       {:ok, view, _html} =
         live(conn, "/members?fields=first_name&query=&sort_field=invalid_field&sort_order=asc")
diff --git a/test/mv_web/member_live/index_view_settings_test.exs b/test/mv_web/member_live/index_view_settings_test.exs
new file mode 100644
index 00000000..483a8214
--- /dev/null
+++ b/test/mv_web/member_live/index_view_settings_test.exs
@@ -0,0 +1,102 @@
+defmodule MvWeb.MemberLive.IndexViewSettingsTest do
+  @moduledoc """
+  §1.20 — the view-settings dropdown toggles: the composite "Member" and address
+  fields, the "include email" sub-toggle and their effect on the rendered
+  columns. Turning a composite off surfaces the underlying separate columns.
+  §1.2 — email is not in the Member cell by default.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "Ada",
+          last_name: "Lovelace",
+          email: "ada@example.com",
+          street: "Baker Street",
+          house_number: "221",
+          postal_code: "10115",
+          city: "Berlin"
+        },
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  defp open_view_settings(view) do
+    view |> element("[data-testid='view-settings-button']") |> render_click()
+    view
+  end
+
+  test "member cell hides the email line by default", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='member-name']")
+    refute has_element?(view, "[data-testid='member-name-email']")
+  end
+
+  test "the include-email sub-toggle surfaces the email line in the member cell", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_view_settings(view)
+    view |> element("[data-testid='view-setting-member-include-email']") |> render_click()
+
+    assert has_element?(view, "[data-testid='member-name-email']", "ada@example.com")
+  end
+
+  test "turning off the compact member field shows separate name columns", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_view_settings(view)
+    view |> element("[data-testid='view-setting-compact-member']") |> render_click()
+
+    refute has_element?(view, "[data-testid='member-name']")
+    assert has_element?(view, "[data-testid='first_name']")
+    assert has_element?(view, "[data-testid='last_name']")
+    # With the composite off, the email is surfaced as its own column.
+    assert has_element?(view, "[data-testid='email']")
+  end
+
+  test "with the compact member field off, the include-email sub-toggle is hidden",
+       %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_view_settings(view)
+    # While the composite Member field is on, the sub-toggle is available.
+    assert has_element?(view, "[data-testid='view-setting-member-include-email']")
+
+    view |> element("[data-testid='view-setting-compact-member']") |> render_click()
+
+    # Once the composite is off, the email is a separate column, so the
+    # in-cell "include email" sub-toggle no longer applies and is hidden.
+    refute has_element?(view, "[data-testid='view-setting-member-include-email']")
+    assert has_element?(view, "[data-testid='email']")
+  end
+
+  test "the compact address field renders a composite address cell by default", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='member-address']")
+    refute has_element?(view, "[data-testid='street']")
+    refute has_element?(view, "[data-testid='postal_code']")
+    refute has_element?(view, "[data-testid='city']")
+  end
+
+  test "turning off the compact address field shows separate address columns", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_view_settings(view)
+    view |> element("[data-testid='view-setting-compact-address']") |> render_click()
+
+    refute has_element?(view, "[data-testid='member-address']")
+    assert has_element?(view, "[data-testid='street']")
+    assert has_element?(view, "[data-testid='postal_code']")
+    assert has_element?(view, "[data-testid='city']")
+  end
+end

From 0c375234c87c7a7433c6182f3d31bdda913f2b6d Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 10:48:28 +0200
Subject: [PATCH 08/30] feat(member): make overview columns sortable through
 accessible sort headers

---
 assets/css/app.css                            |  13 +++
 assets/js/app.js                              |  66 +++++++++++
 lib/mv_web/components/core_components.ex      |  18 ++-
 .../live/components/sort_header_component.ex  |  69 +++++++-----
 lib/mv_web/live/member_live/index.ex          |  23 ++--
 lib/mv_web/live/member_live/index.html.heex   |  35 ++++--
 .../live/member_live/index/overview_query.ex  |  16 +++
 .../member_live/index_sort_a11y_test.exs      |  55 +++++++++
 .../index_sort_name_address_test.exs          | 106 ++++++++++++++++++
 9 files changed, 350 insertions(+), 51 deletions(-)
 create mode 100644 test/mv_web/member_live/index_sort_a11y_test.exs
 create mode 100644 test/mv_web/member_live/index_sort_name_address_test.exs

diff --git a/assets/css/app.css b/assets/css/app.css
index 37091909..7a828ff3 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -957,3 +957,16 @@
   margin-bottom: 0;
 }
 
+/*
+ * Sort-header tooltips must render on top of the pinned checkbox column's
+ * horizontal-scroll fade (::after on .sticky-first-col-th). The hovered/focused
+ * header th is already lifted above the checkbox th (hover/focus-within:z-50),
+ * so the whole tooltip wins the stacking; this rule additionally keeps the
+ * daisyUI tooltip bubble's own pseudo-elements above the fade overlay. Scoped
+ * to the member overview header so no unrelated tooltip is affected.
+ */
+#members-keyboard thead .tooltip::before,
+#members-keyboard thead .tooltip::after {
+  z-index: 60;
+}
+
diff --git a/assets/js/app.js b/assets/js/app.js
index 85bbc6ba..91172948 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -336,6 +336,72 @@ Hooks.SortableList = {
   }
 }
 
+// SortTooltip hook: shows the sort-header hint in the browser TOP LAYER via the
+// native Popover API, so it escapes the members table's overflow clipping
+// (overflow-x:auto forces overflow-y:auto, which clips a CSS tooltip below the
+// header) and paints above the sticky header, neighbor cells, and the pinned
+// checkbox column's fade — no z-index fight. The popover is shown on hover AND
+// keyboard focus and positioned next to the header with getBoundingClientRect
+// (portable; CSS anchor-positioning is not yet supported in Safari/Firefox).
+Hooks.SortTooltip = {
+  mounted() {
+    this.tip = document.getElementById(this.el.dataset.tooltipId)
+    // Feature-detect: without Popover API support fall back to no visual tooltip
+    // (the button's aria-label still conveys the hint to assistive tech).
+    if (!this.tip || typeof this.tip.showPopover !== "function") return
+
+    this.position = () => {
+      const btn = this.el.getBoundingClientRect()
+      const tip = this.tip.getBoundingClientRect()
+      const gap = 6
+      // Prefer just below the header; flip above when there is no room below.
+      let top = btn.bottom + gap
+      if (top + tip.height > window.innerHeight && btn.top - gap - tip.height >= 0) {
+        top = btn.top - gap - tip.height
+      }
+      // Left-align to the header, but keep the whole bubble on-screen.
+      let left = btn.left
+      const maxLeft = window.innerWidth - tip.width - gap
+      if (left > maxLeft) left = maxLeft
+      if (left < gap) left = gap
+      this.tip.style.top = `${Math.round(top)}px`
+      this.tip.style.left = `${Math.round(left)}px`
+    }
+
+    this.show = () => {
+      try {
+        if (!this.tip.matches(":popover-open")) this.tip.showPopover()
+        // showPopover() makes it measurable; positioning in the same tick avoids
+        // a visible flash (JS runs before the browser paints).
+        this.position()
+      } catch (_e) {}
+    }
+
+    this.hide = () => {
+      try {
+        if (this.tip.matches(":popover-open")) this.tip.hidePopover()
+      } catch (_e) {}
+    }
+
+    this.onKey = (e) => { if (e.key === "Escape") this.hide() }
+
+    this.el.addEventListener("mouseenter", this.show)
+    this.el.addEventListener("focus", this.show)
+    this.el.addEventListener("mouseleave", this.hide)
+    this.el.addEventListener("blur", this.hide)
+    this.el.addEventListener("keydown", this.onKey)
+  },
+
+  destroyed() {
+    if (this.hide) this.hide()
+    this.el.removeEventListener("mouseenter", this.show)
+    this.el.removeEventListener("focus", this.show)
+    this.el.removeEventListener("mouseleave", this.hide)
+    this.el.removeEventListener("blur", this.hide)
+    this.el.removeEventListener("keydown", this.onKey)
+  }
+}
+
 // SidebarState hook: Manages sidebar expanded/collapsed state
 Hooks.SidebarState = {
   mounted() {
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 2b4dcde5..76c44b1c 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -1061,7 +1061,17 @@ defmodule MvWeb.CoreComponents do
             >
               {col[:label]}
             </th>
-            <th :for={dyn_col <- @dynamic_cols} class={table_th_sticky_class(@sticky_header)}>
+            <th
+              :for={dyn_col <- @dynamic_cols}
+              class={table_th_sticky_class(@sticky_header)}
+              aria-sort={
+                table_th_aria_sort(
+                  %{sort_field: "custom_field_#{dyn_col[:custom_field].id}"},
+                  @sort_field,
+                  @sort_order
+                )
+              }
+            >
               <.live_component
                 module={MvWeb.Components.SortHeaderComponent}
                 id={:"sort_custom_field_#{dyn_col[:custom_field].id}"}
@@ -1240,8 +1250,8 @@ defmodule MvWeb.CoreComponents do
   end
 
   # Combines column class with optional sticky header classes (desktop only; theme-friendly bg).
-  # hover:z-20/focus-within:z-20 lift the active header cell above sibling sticky cells (shared z-10)
-  # so its hover tooltip bubble is not clipped by an adjacent opaque bg-base-100 header background.
+  # bg-base-100 + z-10 keep the sticky header opaque and above body rows on vertical scroll.
+  # Sort tooltips use the Popover API (top layer) and need no header z-lift.
   defp table_th_class(col, sticky_header) do
     base = Map.get(col, :class)
     sticky = if sticky_header, do: sticky_th_classes(), else: nil
@@ -1253,7 +1263,7 @@ defmodule MvWeb.CoreComponents do
   defp table_th_sticky_class(_), do: nil
 
   defp sticky_th_classes,
-    do: "lg:sticky lg:top-0 bg-base-100 hover:bg-base-100 z-10 hover:z-20 focus-within:z-20"
+    do: "lg:sticky lg:top-0 bg-base-100 z-10"
 
   @doc """
   Renders a reorderable table (sortable list) with drag handle and keyboard support.
diff --git a/lib/mv_web/live/components/sort_header_component.ex b/lib/mv_web/live/components/sort_header_component.ex
index d3ab1e94..a3470a75 100644
--- a/lib/mv_web/live/components/sort_header_component.ex
+++ b/lib/mv_web/live/components/sort_header_component.ex
@@ -6,44 +6,57 @@ defmodule MvWeb.Components.SortHeaderComponent do
     - label: string()                   # Column Heading (can be an heex template)
     - sort_field: atom() | nil             # current sort field from parent liveview
     - sort_order: :asc | :desc | nil      # current sorting order
+    - sort_hint: string() | nil           # optional; overrides the generic "click
+                                          # to sort" tooltip/aria-label for columns
+                                          # whose sort key is non-obvious (e.g. the
+                                          # Name column sorts by last name)
   """
   use MvWeb, :live_component
 
   @impl true
   def update(assigns, socket) do
-    {:ok, assign(socket, assigns)}
+    {:ok, socket |> assign(assigns) |> assign_new(:sort_hint, fn -> nil end)}
   end
 
   # Check if we can add the aria-sort label directly to the daisyUI header
   # aria-sort={aria_sort(@field, @sort_field, @sort_order)}
   @impl true
   def render(assigns) do
+    assigns =
+      assigns
+      |> assign(:tooltip_id, "sort-tooltip-#{assigns.field}")
+      |> assign(:hint, assigns.sort_hint || gettext("Click to sort"))
+
     ~H"""
     <div>
-      <.tooltip content={aria_sort(@field, @sort_field, @sort_order)} position="bottom">
-        <.button
-          type="button"
-          variant="ghost"
-          aria-label={aria_sort(@field, @sort_field, @sort_order)}
-          class="select-none"
-          phx-click="sort"
-          phx-value-field={@field}
-          data-testid={@field}
-        >
-          {@label}
-          <%= if @sort_field == @field do %>
-            <.icon
-              name={if @sort_order == :asc, do: "hero-chevron-up", else: "hero-chevron-down"}
-              class="sort-icon"
-            />
-          <% else %>
-            <.icon
-              name="hero-chevron-up-down"
-              class="sort-icon opacity-40"
-            />
-          <% end %>
-        </.button>
-      </.tooltip>
+      <button
+        id={"sort-btn-#{@field}"}
+        type="button"
+        aria-label={aria_sort(@field, @sort_field, @sort_order, @hint)}
+        aria-describedby={@tooltip_id}
+        class="link link-hover no-underline w-full flex items-center gap-1 text-left text-current select-none"
+        phx-click="sort"
+        phx-value-field={@field}
+        phx-hook="SortTooltip"
+        data-tooltip-id={@tooltip_id}
+        data-testid={@field}
+      >
+        {@label}
+        <%= if @sort_field == @field do %>
+          <.icon
+            name={if @sort_order == :asc, do: "hero-chevron-up", else: "hero-chevron-down"}
+            class="sort-icon"
+          />
+        <% else %>
+          <.icon
+            name="hero-chevron-up-down"
+            class="sort-icon opacity-40"
+          />
+        <% end %>
+      </button>
+      <div id={@tooltip_id} popover="manual" role="tooltip" class="sort-tooltip">
+        {aria_sort(@field, @sort_field, @sort_order, @hint)}
+      </div>
     </div>
     """
   end
@@ -51,13 +64,13 @@ defmodule MvWeb.Components.SortHeaderComponent do
   # -------------------------------------------------
   # Hilfsfunktionen für ARIA Attribute & Icon SVG
   # -------------------------------------------------
-  defp aria_sort(field, sort_field, dir) when field == sort_field do
+  defp aria_sort(field, sort_field, dir, hint) when field == sort_field do
     case dir do
       :asc -> gettext("ascending")
       :desc -> gettext("descending")
-      nil -> gettext("Click to sort")
+      nil -> hint
     end
   end
 
-  defp aria_sort(_, _, _), do: gettext("Click to sort")
+  defp aria_sort(_, _, _, hint), do: hint
 end
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 714efe9a..deea80df 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -1450,7 +1450,9 @@ defmodule MvWeb.MemberLive.Index do
   defp valid_sort_field_db_or_custom?(field) when is_atom(field) do
     non_sortable_fields = [:notes]
     valid_fields = Mv.Constants.member_fields() -- non_sortable_fields
-    field in valid_fields or custom_field_sort?(field) or field in [:groups, :membership_fee_type]
+
+    field in valid_fields or custom_field_sort?(field) or
+      field in [:groups, :membership_fee_type, :name, :address]
   end
 
   defp valid_sort_field_db_or_custom?(field) when is_binary(field) do
@@ -1458,6 +1460,8 @@ defmodule MvWeb.MemberLive.Index do
       cond do
         field == "groups" -> :groups
         field == "membership_fee_type" -> :membership_fee_type
+        field == "name" -> :name
+        field == "address" -> :address
         true -> safe_member_field_atom_only(field)
       end
 
@@ -1508,10 +1512,16 @@ defmodule MvWeb.MemberLive.Index do
   defp determine_field(default, ""), do: default
   defp determine_field(default, nil), do: default
 
+  # Computed/pseudo fields that are nonetheless sortable (they resolve to DB
+  # sort keys in OverviewQuery): groups aggregate and the composite Name/Address
+  # columns. Other computed fields (e.g. membership_fee_status) are not sortable.
+  @sortable_computed_fields [:groups, :name, :address]
+
   defp determine_field(default, sf) when is_binary(sf) do
-    # Handle "groups" specially - it's in computed_member_fields() but can be sorted
-    if sf == "groups" do
-      :groups
+    sortable_strings = Enum.map(@sortable_computed_fields, &Atom.to_string/1)
+
+    if sf in sortable_strings do
+      String.to_existing_atom(sf)
     else
       computed_strings = Enum.map(FieldVisibility.computed_member_fields(), &Atom.to_string/1)
 
@@ -1522,9 +1532,8 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   defp determine_field(default, sf) when is_atom(sf) do
-    # Handle :groups specially - it's in computed_member_fields() but can be sorted
-    if sf == :groups do
-      :groups
+    if sf in @sortable_computed_fields do
+      sf
     else
       if sf in FieldVisibility.computed_member_fields(),
         do: default,
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 9c0db729..7709c2cb 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -5,6 +5,7 @@
       <.live_component
         module={MvWeb.Components.BulkActionsDropdown}
         id="bulk-actions-dropdown"
+        open={@bulk_actions_open}
         export_payload_json={@export_payload_json}
         selected_count={@selected_count}
         scope={@scope}
@@ -52,7 +53,9 @@
       <.button
         type="button"
         variant="secondary"
-        class={["gap-2", @show_current_cycle && "btn-active"]}
+        class="gap-2"
+        active={@show_current_cycle}
+        aria-pressed={to_string(@show_current_cycle)}
         phx-click="toggle_cycle_view"
         data-testid="toggle-cycle-view"
         aria-label={
@@ -135,8 +138,6 @@
       sort_order={@sort_order}
       size_class={if @density == :compact, do: "table-xs", else: "table-md"}
     >
-      
-<!-- <:col :let={member} label="Id">{member.id}</:col> -->
       <:col
         :let={member}
         col_click={&MvWeb.MemberLive.Index.checkbox_column_click/1}
@@ -285,10 +286,12 @@
           [member.postal_code, member.city]
           |> Enum.reject(&(&1 in [nil, ""]))
           |> Enum.join(" ") %>
-        <div data-testid="member-address">
-          <div class="truncate" title={line1}>{line1}</div>
-          <div class="opacity-70 truncate" title={line2}>{line2}</div>
-        </div>
+        <.maybe_value value={line1 <> line2} empty_sr_text={gettext("No address")}>
+          <div data-testid="member-address">
+            <div class="truncate" title={line1}>{line1}</div>
+            <div class="opacity-70 truncate" title={line2}>{line2}</div>
+          </div>
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -307,7 +310,9 @@
           """
         }
       >
-        {member.street}
+        <.maybe_value value={member.street} empty_sr_text={gettext("Not specified")}>
+          {member.street}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -326,7 +331,9 @@
           """
         }
       >
-        {member.house_number}
+        <.maybe_value value={member.house_number} empty_sr_text={gettext("Not specified")}>
+          {member.house_number}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -345,7 +352,9 @@
           """
         }
       >
-        {member.postal_code}
+        <.maybe_value value={member.postal_code} empty_sr_text={gettext("Not specified")}>
+          {member.postal_code}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -364,7 +373,9 @@
           """
         }
       >
-        {member.city}
+        <.maybe_value value={member.city} empty_sr_text={gettext("Not specified")}>
+          {member.city}
+        </.maybe_value>
       </:col>
       <:col
         :let={member}
@@ -551,7 +562,7 @@
           class="sticky left-0 flex items-center justify-center gap-2 text-base-content/70"
           data-testid="members-loading-row"
         >
-          <span class="loading loading-spinner loading-sm" aria-hidden="true"></span>
+          <.spinner size="sm" aria-hidden="true" />
           {gettext("Loading more members …")}
         </div>
       </:footer>
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index bf4ef85c..ac3051f0 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -254,6 +254,22 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   defp apply_sort(query, nil, _order, _custom_fields), do: Ash.Query.sort(query, id: :asc)
   defp apply_sort(query, _field, nil, _custom_fields), do: Ash.Query.sort(query, id: :asc)
 
+  # Composite "Member" column: sort by last name then first name. The email that
+  # shares the cell is display-only and does not affect the sort key (§1.21).
+  defp apply_sort(query, field, order, _custom_fields) when field in [:name, "name"] do
+    Ash.Query.sort(query, [{:last_name, order}, {:first_name, order}, {:id, :asc}])
+  end
+
+  # Composite "Address" column: sort by city, then postal code, then street.
+  defp apply_sort(query, field, order, _custom_fields) when field in [:address, "address"] do
+    Ash.Query.sort(query, [
+      {:city, order},
+      {:postal_code, order},
+      {:street, order},
+      {:id, :asc}
+    ])
+  end
+
   defp apply_sort(query, field, order, custom_fields) do
     case sort_key(field) do
       nil -> apply_custom_field_sort(query, field, order, custom_fields)
diff --git a/test/mv_web/member_live/index_sort_a11y_test.exs b/test/mv_web/member_live/index_sort_a11y_test.exs
new file mode 100644
index 00000000..fa032ee3
--- /dev/null
+++ b/test/mv_web/member_live/index_sort_a11y_test.exs
@@ -0,0 +1,55 @@
+defmodule MvWeb.MemberLive.IndexSortA11yTest do
+  @moduledoc """
+  §1.11 — When a column is sorted, exactly one `th` carries `aria-sort` with the
+  correct direction, a non-color sort glyph is present, and the sort is reflected
+  in the URL.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+
+  @moduletag :ui
+
+  setup %{conn: conn} do
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{first_name: "Sortable", last_name: "Member", email: "sortable@example.com"},
+        actor: SystemActor.get_system_actor()
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  defp aria_sort_count(html) do
+    ~r/aria-sort="/ |> Regex.scan(html) |> length()
+  end
+
+  test "exactly one th carries aria-sort ascending with a non-color glyph", %{conn: conn} do
+    {:ok, view, html} = live(conn, ~p"/members?sort_field=join_date&sort_order=asc")
+
+    assert aria_sort_count(html) == 1
+    assert has_element?(view, "th[aria-sort='ascending']")
+    # Non-color shape glyph for the active ascending sort.
+    assert html =~ "hero-chevron-up"
+  end
+
+  test "aria-sort reflects descending and stays unique", %{conn: conn} do
+    {:ok, view, html} = live(conn, ~p"/members?sort_field=join_date&sort_order=desc")
+
+    assert aria_sort_count(html) == 1
+    assert has_element?(view, "th[aria-sort='descending']")
+    assert html =~ "hero-chevron-down"
+  end
+
+  test "clicking a header reflects the sort in the URL", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("[data-testid='join_date']") |> render_click()
+
+    path = assert_patch(view)
+    assert path =~ "sort_field=join_date"
+    assert path =~ "sort_order=asc"
+  end
+end
diff --git a/test/mv_web/member_live/index_sort_name_address_test.exs b/test/mv_web/member_live/index_sort_name_address_test.exs
new file mode 100644
index 00000000..519cebc6
--- /dev/null
+++ b/test/mv_web/member_live/index_sort_name_address_test.exs
@@ -0,0 +1,106 @@
+defmodule MvWeb.MemberLive.IndexSortNameAddressTest do
+  @moduledoc """
+  §1.21 — the composite Member (Name) and Address columns are sortable DB-side:
+  Name by last name → first name (email in the cell is display-only), Address by
+  city → postal code → street. Ascending/descending, reflected in the URL and in
+  `aria-sort` (§1.11).
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Helpers.SystemActor
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup %{conn: conn} do
+    actor = SystemActor.get_system_actor()
+
+    # Same last name, different first name — proves the first-name tie-breaker.
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "Bruno",
+          last_name: "Meyer",
+          email: "z-bruno@example.com",
+          city: "Aachen",
+          postal_code: "52062",
+          street: "Zebra"
+        },
+        actor: actor
+      )
+
+    {:ok, _} =
+      Mv.Membership.create_member(
+        %{
+          first_name: "Anna",
+          last_name: "Meyer",
+          email: "a-anna@example.com",
+          city: "Zwickau",
+          postal_code: "08056",
+          street: "Alpha"
+        },
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn), actor: actor}
+  end
+
+  defp read_names(query, actor) do
+    query
+    |> Ash.read!(actor: actor)
+    |> Enum.map(&{&1.last_name, &1.first_name})
+  end
+
+  test "name sort orders by last name then first name, ignoring email", %{actor: actor} do
+    asc = OverviewQuery.build(%{sort_field: :name, sort_order: :asc}) |> read_names(actor)
+
+    # Both share last name "Meyer"; the first-name tie-breaker orders Anna before
+    # Bruno, even though Bruno's email sorts first alphabetically.
+    assert asc == [{"Meyer", "Anna"}, {"Meyer", "Bruno"}]
+
+    desc = OverviewQuery.build(%{sort_field: :name, sort_order: :desc}) |> read_names(actor)
+    assert desc == [{"Meyer", "Bruno"}, {"Meyer", "Anna"}]
+  end
+
+  test "address sort orders by city, then postal code, then street", %{actor: actor} do
+    asc =
+      OverviewQuery.build(%{sort_field: :address, sort_order: :asc})
+      |> Ash.read!(actor: actor)
+      |> Enum.map(& &1.city)
+
+    assert asc == ["Aachen", "Zwickau"]
+
+    desc =
+      OverviewQuery.build(%{sort_field: :address, sort_order: :desc})
+      |> Ash.read!(actor: actor)
+      |> Enum.map(& &1.city)
+
+    assert desc == ["Zwickau", "Aachen"]
+  end
+
+  test "clicking the Name header sorts and reflects state in URL and aria-sort", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("button[phx-click='sort'][data-testid='name']") |> render_click()
+
+    path = assert_patch(view)
+    assert path =~ "sort_field=name"
+    # Exactly one column carries aria-sort (§1.11).
+    assert has_element?(view, "th[aria-sort='ascending']")
+    assert render(view) |> aria_sort_count() == 1
+  end
+
+  test "clicking the Address header sorts and reflects state in URL", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    view |> element("button[phx-click='sort'][data-testid='address']") |> render_click()
+
+    path = assert_patch(view)
+    assert path =~ "sort_field=address"
+    assert has_element?(view, "th[aria-sort='ascending']")
+  end
+
+  defp aria_sort_count(html) do
+    html |> String.split("aria-sort=") |> length() |> Kernel.-(1)
+  end
+end

From c2cb3edab85e39a172addbe155ec41e6ccc624a0 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 10:49:10 +0200
Subject: [PATCH 09/30] feat(member): bring the overview table up to WCAG 2.2
 AA

---
 assets/css/app.css                            | 13 ----
 assets/js/app.js                              | 16 +++++
 lib/mv_web/components/core_components.ex      | 67 ++++++++++++++-----
 lib/mv_web/live/member_live/index.ex          | 11 ++-
 .../member_live/index_a11y_hardening_test.exs |  9 ++-
 .../member_live/index_sticky_pinned_test.exs  | 14 ++--
 6 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index 7a828ff3..37091909 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -957,16 +957,3 @@
   margin-bottom: 0;
 }
 
-/*
- * Sort-header tooltips must render on top of the pinned checkbox column's
- * horizontal-scroll fade (::after on .sticky-first-col-th). The hovered/focused
- * header th is already lifted above the checkbox th (hover/focus-within:z-50),
- * so the whole tooltip wins the stacking; this rule additionally keeps the
- * daisyUI tooltip bubble's own pseudo-elements above the fade overlay. Scoped
- * to the member overview header so no unrelated tooltip is affected.
- */
-#members-keyboard thead .tooltip::before,
-#members-keyboard thead .tooltip::after {
-  z-index: 60;
-}
-
diff --git a/assets/js/app.js b/assets/js/app.js
index 91172948..90e36102 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -36,6 +36,22 @@ function getBrowserTimezone() {
 // Hooks for LiveView components
 let Hooks = {}
 
+// IndeterminateCheckbox: the `indeterminate` state of a checkbox is a JS
+// property, not an HTML attribute, so it cannot be set from the server render.
+// Mirror it from the data-indeterminate attribute on mount and every update
+// (e.g. select-all reflecting a partial selection — WCAG select-all semantics).
+Hooks.IndeterminateCheckbox = {
+  updateIndeterminate() {
+    this.el.indeterminate = this.el.dataset.indeterminate === "true"
+  },
+  mounted() {
+    this.updateIndeterminate()
+  },
+  updated() {
+    this.updateIndeterminate()
+  }
+}
+
 // CopyToClipboard hook: Copies text to clipboard when triggered by server event
 Hooks.CopyToClipboard = {
   mounted() {
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 76c44b1c..f8b95f93 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -1093,12 +1093,17 @@ defmodule MvWeb.CoreComponents do
           <tr
             :for={row <- @rows}
             id={@row_id && @row_id.(row)}
-            class={[
-              table_row_tr_class(
-                table_row_selected?(assigns, row),
-                @sticky_first_col
-              )
-            ]}
+            class={
+              [
+                table_row_tr_class(
+                  table_row_selected?(assigns, row),
+                  @sticky_first_col
+                ),
+                # WCAG 2.4.11: keep a keyboard-focused row from being hidden under
+                # the sticky header by reserving header-height scroll margin.
+                @sticky_header && "scroll-mt-16"
+              ]
+            }
             data-row-interactive={@row_click && "true"}
             data-selected={table_row_selected?(assigns, row) && "true"}
             title={@row_click && @row_tooltip}
@@ -1178,19 +1183,49 @@ defmodule MvWeb.CoreComponents do
             <td
               :for={dyn_col <- @dynamic_cols}
               phx-click={@row_click && @row_click.(row)}
-              class={["max-w-xs truncate", @row_click && "hover:cursor-pointer"]}
+              class={[
+                "max-w-xs",
+                dyn_col[:custom_field].value_type != :boolean && "truncate",
+                @row_click && "hover:cursor-pointer"
+              ]}
             >
-              {if dyn_col[:render] do
-                rendered = dyn_col[:render].(@row_item.(row))
+              <%= if dyn_col[:custom_field].value_type == :boolean do %>
+                <% val = dyn_col[:render] && dyn_col[:render].(@row_item.(row)) %>
+                <%= cond do %>
+                  <% val == true -> %>
+                    <div class="flex justify-center">
+                      <.icon
+                        name="hero-check-circle"
+                        class="size-4 text-success"
+                        aria-hidden="true"
+                      />
+                      <span class="sr-only">{gettext("Yes")}</span>
+                    </div>
+                  <% val == false -> %>
+                    <div class="flex justify-center">
+                      <.icon
+                        name="hero-x-circle"
+                        class="size-4 text-error"
+                        aria-hidden="true"
+                      />
+                      <span class="sr-only">{gettext("No")}</span>
+                    </div>
+                  <% true -> %>
+                    <.empty_cell sr_text={gettext("Not specified")} />
+                <% end %>
+              <% else %>
+                {if dyn_col[:render] do
+                  rendered = dyn_col[:render].(@row_item.(row))
 
-                if rendered == "" do
-                  ""
+                  if rendered == "" do
+                    ""
+                  else
+                    rendered
+                  end
                 else
-                  rendered
-                end
-              else
-                ""
-              end}
+                  ""
+                end}
+              <% end %>
             </td>
             <td :if={@action != []} class="w-0 font-semibold">
               <div class="flex gap-4">
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index deea80df..53dab1a4 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -767,8 +767,15 @@ defmodule MvWeb.MemberLive.Index do
           custom_field: custom_field,
           render: fn member ->
             case get_custom_field_value(member, custom_field) do
-              nil -> ""
-              cfv -> Formatter.format_custom_field_value(cfv.value, custom_field)
+              nil ->
+                ""
+
+              cfv ->
+                if custom_field.value_type == :boolean do
+                  extract_boolean_value(cfv.value)
+                else
+                  Formatter.format_custom_field_value(cfv.value, custom_field)
+                end
             end
           end
         }
diff --git a/test/mv_web/member_live/index_a11y_hardening_test.exs b/test/mv_web/member_live/index_a11y_hardening_test.exs
index 4b6434fc..c40a993c 100644
--- a/test/mv_web/member_live/index_a11y_hardening_test.exs
+++ b/test/mv_web/member_live/index_a11y_hardening_test.exs
@@ -47,13 +47,16 @@ defmodule MvWeb.MemberLive.IndexA11yHardeningTest do
   test "interactive row targets meet the >=24px minimum in both densities", %{conn: conn} do
     {:ok, view, _html} = live(conn, ~p"/members")
 
-    # Compact (default) and comfortable both keep the >=24px checkbox target.
-    assert has_element?(view, "input[type='checkbox'].min-h-6.min-w-6")
+    # The row/select-all checkboxes are pinned to 1.5rem (24px) in both densities
+    # via the `#members-table-guard input.checkbox` CSS rule (WCAG 2.5.8), which
+    # overrides DaisyUI's density-proportional sizing. The faithful proxy in a
+    # LiveView test is that the guarded checkbox markup exists in both densities.
+    assert has_element?(view, "#members-table-guard input[type='checkbox'].checkbox")
 
     # Switch to comfortable via the view-settings dropdown.
     view |> element("[data-testid='view-settings-button']") |> render_click()
     view |> element("[data-testid='view-setting-density']") |> render_click()
-    assert has_element?(view, "input[type='checkbox'].min-h-6.min-w-6")
+    assert has_element?(view, "#members-table-guard input[type='checkbox'].checkbox")
   end
 
   test "select-all reflects indeterminate for a partial selection", %{
diff --git a/test/mv_web/member_live/index_sticky_pinned_test.exs b/test/mv_web/member_live/index_sticky_pinned_test.exs
index 95eac861..d07df8ff 100644
--- a/test/mv_web/member_live/index_sticky_pinned_test.exs
+++ b/test/mv_web/member_live/index_sticky_pinned_test.exs
@@ -1,8 +1,10 @@
 defmodule MvWeb.MemberLive.IndexStickyPinnedTest do
   @moduledoc """
   §1.19 — When the table scrolls vertically and horizontally, the header stays
-  sticky and the identifier (Name) column stays pinned; overflowing cell content
-  truncates with ellipsis and exposes a hover/focus tooltip.
+  sticky. Horizontal pinning is limited to the checkbox column (with a scroll
+  fade marking the boundary) rather than also pinning the Name column;
+  overflowing cell content truncates with ellipsis and exposes a hover/focus
+  tooltip.
   """
   use MvWeb.ConnCase, async: false
 
@@ -30,16 +32,18 @@ defmodule MvWeb.MemberLive.IndexStickyPinnedTest do
     %{conn: conn_with_oidc_user(conn)}
   end
 
-  test "header is sticky and the identifier column is pinned", %{conn: conn} do
+  test "header is sticky and only the checkbox column is pinned", %{conn: conn} do
     {:ok, _view, html} = live(conn, ~p"/members")
 
     # Sticky header (desktop).
     assert html =~ "lg:sticky"
     assert html =~ "lg:top-0"
 
-    # Checkbox column pinned at left-0, identifier (Name) column pinned beside it.
+    # Only the checkbox column is pinned (left-0) now; a scroll fade marks the
+    # boundary instead of also pinning the Name column at left-12.
     assert html =~ "left-0"
-    assert html =~ "left-12"
+    assert html =~ "sticky-first-col-th"
+    refute html =~ "left-12"
   end
 
   test "composite cells truncate and expose a tooltip via title", %{conn: conn} do

From 77fc11a0b0f203e20b0385d8de239562dea85b39 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 10:54:09 +0200
Subject: [PATCH 10/30] refactor(member-live): modularize the overview and drop
 the superseded in-memory paths

Extract the cookie parser, export-payload builder and fee-status helper
into their own modules and remove the filter/sort/load helpers the
database pushdown made dead, so the overview LiveView stays a thin
coordinator over focused units.
---
 lib/mv/membership/member_export/build.ex      |   8 +-
 lib/mv_web/components/core_components.ex      |  31 ++-
 .../controllers/member_export_controller.ex   |   8 +-
 lib/mv_web/live/member_live/index.ex          | 215 +--------------
 lib/mv_web/live/member_live/index/cookie.ex   |  28 ++
 .../live/member_live/index/export_payload.ex  | 163 ++++++++++++
 .../live/member_live/index/field_selection.ex |  17 +-
 .../member_live/index/field_visibility.ex     | 153 ++---------
 .../index/membership_fee_status.ex            |  30 +--
 .../live/member_live/index/view_settings.ex   |  17 +-
 .../live/member_live/index/cookie_test.exs    |  22 ++
 .../member_live/index/export_payload_test.exs |  87 +++++++
 .../index/field_visibility_test.exs           | 244 ------------------
 .../index/membership_fee_status_test.exs      |  52 ----
 .../index_membership_fee_status_test.exs      |   3 +
 .../member_live/index_pagination_test.exs     |   4 +-
 test/mv_web/member_live/index_test.exs        | 168 ------------
 17 files changed, 375 insertions(+), 875 deletions(-)
 create mode 100644 lib/mv_web/live/member_live/index/cookie.ex
 create mode 100644 lib/mv_web/live/member_live/index/export_payload.ex
 rename lib/mv_web/{ => live}/member_live/index/membership_fee_status.ex (81%)
 create mode 100644 test/mv_web/live/member_live/index/cookie_test.exs
 create mode 100644 test/mv_web/live/member_live/index/export_payload_test.exs
 rename test/mv_web/{ => live}/member_live/index/membership_fee_status_test.exs (85%)

diff --git a/lib/mv/membership/member_export/build.ex b/lib/mv/membership/member_export/build.ex
index 9f848a3b..f1af5dbc 100644
--- a/lib/mv/membership/member_export/build.ex
+++ b/lib/mv/membership/member_export/build.ex
@@ -145,7 +145,7 @@ defmodule Mv.Membership.MemberExport.Build do
       |> Ash.Query.new()
       |> Ash.Query.select(select_fields)
       |> load_custom_field_values_query(custom_field_ids_union)
-      |> maybe_load_cycles(need_cycles, parsed.show_current_cycle)
+      |> maybe_load_cycles(need_cycles)
       |> maybe_load_groups(need_groups)
       |> maybe_load_membership_fee_type(need_membership_fee_type)
 
@@ -359,10 +359,10 @@ defmodule Mv.Membership.MemberExport.Build do
 
   defp custom_field_sort?(field), do: String.starts_with?(field, @custom_field_prefix)
 
-  defp maybe_load_cycles(query, false, _show_current), do: query
+  defp maybe_load_cycles(query, false), do: query
 
-  defp maybe_load_cycles(query, true, show_current) do
-    MembershipFeeStatus.load_cycles_for_members(query, show_current)
+  defp maybe_load_cycles(query, true) do
+    MembershipFeeStatus.load_cycles_for_members(query)
   end
 
   defp maybe_load_groups(query, false), do: query
diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index f8b95f93..b95ba33e 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -143,12 +143,18 @@ defmodule MvWeb.CoreComponents do
 
   attr :size, :string, values: ~w(sm md lg), default: "md"
   attr :disabled, :boolean, default: false, doc: "Whether the button is disabled"
+
+  attr :active, :boolean,
+    default: false,
+    doc: "Renders the button in its active/pressed (toggled-on) state"
+
   slot :inner_block, required: true
 
   def button(assigns) do
     rest = assigns.rest
     variant = assigns[:variant] || "primary"
     size = assigns[:size] || "md"
+    active_class = if assigns[:active], do: "btn-active", else: ""
 
     variant_classes = %{
       "primary" => "btn-primary",
@@ -169,7 +175,9 @@ defmodule MvWeb.CoreComponents do
 
     base_class = Map.fetch!(variant_classes, variant)
     size_class = size_classes[size]
-    btn_class = [base_class, size_class] |> Enum.reject(&(&1 == "")) |> Enum.join(" ")
+
+    btn_class =
+      [base_class, size_class, active_class] |> Enum.reject(&(&1 == "")) |> Enum.join(" ")
 
     assigns =
       assigns
@@ -214,6 +222,27 @@ defmodule MvWeb.CoreComponents do
     end
   end
 
+  @doc """
+  Renders a loading spinner for inline "busy" states.
+
+  Wraps the DaisyUI `loading` classes so views never spell them out. Mark it
+  `aria-hidden="true"` when an adjacent text label already conveys the busy state.
+
+  ## Examples
+
+      <.spinner />
+      <.spinner size="lg" aria-hidden="true" />
+  """
+  attr :size, :string, values: ~w(xs sm md lg), default: "sm"
+  attr :class, :any, default: nil, doc: "Additional layout classes"
+  attr :rest, :global
+
+  def spinner(assigns) do
+    ~H"""
+    <span class={["loading loading-spinner", "loading-#{@size}", @class]} {@rest}></span>
+    """
+  end
+
   @doc """
   Renders a non-interactive badge with WCAG-compliant contrast.
 
diff --git a/lib/mv_web/controllers/member_export_controller.ex b/lib/mv_web/controllers/member_export_controller.ex
index e33b2115..a7683b4a 100644
--- a/lib/mv_web/controllers/member_export_controller.ex
+++ b/lib/mv_web/controllers/member_export_controller.ex
@@ -294,7 +294,7 @@ defmodule MvWeb.MemberExportController do
       |> Ash.Query.new()
       |> Ash.Query.select(select_fields)
       |> load_custom_field_values_query(parsed.custom_field_ids_union)
-      |> maybe_load_cycles(need_cycles, parsed.show_current_cycle)
+      |> maybe_load_cycles(need_cycles)
       |> maybe_load_groups(need_groups)
       |> maybe_load_membership_fee_type(need_membership_fee_type)
 
@@ -338,10 +338,10 @@ defmodule MvWeb.MemberExportController do
     end
   end
 
-  defp maybe_load_cycles(query, false, _show_current), do: query
+  defp maybe_load_cycles(query, false), do: query
 
-  defp maybe_load_cycles(query, true, show_current) do
-    MembershipFeeStatus.load_cycles_for_members(query, show_current)
+  defp maybe_load_cycles(query, true) do
+    MembershipFeeStatus.load_cycles_for_members(query)
   end
 
   defp maybe_load_groups(query, false), do: query
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 53dab1a4..16977816 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -35,6 +35,7 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.Helpers.DateFormatter
   alias MvWeb.MemberLive.Index.CustomFieldValueLookup
   alias MvWeb.MemberLive.Index.DateFilter
+  alias MvWeb.MemberLive.Index.ExportPayload
   alias MvWeb.MemberLive.Index.FieldSelection
   alias MvWeb.MemberLive.Index.FieldVisibility
   alias MvWeb.MemberLive.Index.FilterParams
@@ -377,8 +378,8 @@ defmodule MvWeb.MemberLive.Index do
     query_params =
       build_query_params(
         opts_for_query_params(socket, %{
-          sort_field: export_sort_field(socket.assigns.sort_field),
-          sort_order: export_sort_order(socket.assigns.sort_order)
+          sort_field: ExportPayload.sort_field(socket.assigns.sort_field),
+          sort_order: ExportPayload.sort_order(socket.assigns.sort_order)
         })
       )
       |> maybe_add_field_selection(
@@ -553,53 +554,6 @@ defmodule MvWeb.MemberLive.Index do
     {:noreply, push_reload(socket, new_path)}
   end
 
-  # Backward compatibility: tuple form delegates to map form
-  def handle_info({:reset_all_filters, cycle_status_filter, boolean_filters}, socket) do
-    handle_info(
-      {:reset_all_filters,
-       %{
-         cycle_status_filter: cycle_status_filter,
-         boolean_filters: boolean_filters,
-         group_filters: %{},
-         fee_type_filters: %{}
-       }},
-      socket
-    )
-  end
-
-  def handle_info(
-        {:reset_all_filters, cycle_status_filter, boolean_filters, group_filters},
-        socket
-      ) do
-    handle_info(
-      {:reset_all_filters,
-       %{
-         cycle_status_filter: cycle_status_filter,
-         boolean_filters: boolean_filters,
-         group_filters: group_filters,
-         fee_type_filters: %{}
-       }},
-      socket
-    )
-  end
-
-  def handle_info(
-        {:reset_all_filters, cycle_status_filter, boolean_filters, group_filters,
-         fee_type_filters},
-        socket
-      ) do
-    handle_info(
-      {:reset_all_filters,
-       %{
-         cycle_status_filter: cycle_status_filter,
-         boolean_filters: boolean_filters,
-         group_filters: group_filters,
-         fee_type_filters: fee_type_filters
-       }},
-      socket
-    )
-  end
-
   def handle_info({:reset_all_filters, %{} = opts}, socket) do
     socket =
       socket
@@ -1348,7 +1302,7 @@ defmodule MvWeb.MemberLive.Index do
     |> OverviewQuery.build()
     |> Ash.Query.select(@overview_fields)
     |> load_custom_field_values(compute_ids_to_load(socket))
-    |> MembershipFeeStatus.load_cycles_for_members(socket.assigns.show_current_cycle)
+    |> MembershipFeeStatus.load_cycles_for_members()
     |> Ash.Query.load(groups: [:id, :name, :slug])
     |> maybe_load_fee_type(socket)
   end
@@ -1490,8 +1444,6 @@ defmodule MvWeb.MemberLive.Index do
     String.starts_with?(field, @custom_field_prefix)
   end
 
-  defp custom_field_sort?(_), do: false
-
   defp extract_custom_field_ids(visible_custom_fields) do
     Enum.map(visible_custom_fields, fn field_string ->
       case String.split(field_string, @custom_field_prefix) do
@@ -1781,13 +1733,6 @@ defmodule MvWeb.MemberLive.Index do
     CustomFieldValueLookup.find_by_field(member, custom_field)
   end
 
-  def get_boolean_custom_field_value(member, custom_field) do
-    case get_custom_field_value(member, custom_field) do
-      nil -> nil
-      cfv -> extract_boolean_value(cfv.value)
-    end
-  end
-
   defp extract_boolean_value(%Ash.Union{value: value, type: :boolean}),
     do: extract_boolean_value(value)
 
@@ -1843,14 +1788,6 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
-  def format_selected_member_emails(members, selected_members) do
-    members
-    |> Enum.filter(fn member ->
-      MapSet.member?(selected_members, member.id) && member.email && member.email != ""
-    end)
-    |> Enum.map(&format_member_email/1)
-  end
-
   def checkbox_column_click(member), do: JS.push("select_member", value: %{id: member.id})
 
   def format_member_email(member) do
@@ -1997,149 +1934,7 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   defp assign_export_payload(socket) do
-    payload = build_export_payload(socket)
+    payload = ExportPayload.build(socket.assigns)
     assign(socket, :export_payload_json, Jason.encode!(payload))
   end
-
-  defp build_export_payload(socket) do
-    visible_custom_field_ids = socket.assigns[:visible_custom_field_ids] || []
-
-    member_fields_db = socket.assigns[:member_fields_visible_db] || []
-    member_fields_computed = socket.assigns[:member_fields_visible_computed] || []
-
-    # Order DB member fields exactly like the table/constants
-    ordered_member_fields_db =
-      Mv.Constants.member_fields()
-      |> Enum.filter(&(&1 in member_fields_db))
-
-    # Order computed fields in canonical order
-    ordered_computed_fields =
-      FieldVisibility.computed_member_fields()
-      |> Enum.filter(&(&1 in member_fields_computed))
-
-    member_fields_with_groups =
-      build_export_member_fields_list(
-        ordered_member_fields_db,
-        socket.assigns[:member_fields_visible]
-      )
-
-    # Order custom fields like the table (same as dynamic_cols / all_custom_fields order)
-    ordered_custom_field_ids =
-      socket.assigns.all_custom_fields
-      |> Enum.map(&to_string(&1.id))
-      |> Enum.filter(&(&1 in visible_custom_field_ids))
-
-    %{
-      selected_ids: socket.assigns.selected_members |> MapSet.to_list(),
-      member_fields:
-        Enum.map(member_fields_with_groups, fn
-          f when is_atom(f) -> Atom.to_string(f)
-          f when is_binary(f) -> f
-        end),
-      computed_fields: Enum.map(ordered_computed_fields, &Atom.to_string/1),
-      custom_field_ids: ordered_custom_field_ids,
-      column_order:
-        export_column_order(
-          ordered_member_fields_db,
-          ordered_computed_fields,
-          ordered_custom_field_ids,
-          :membership_fee_type in socket.assigns[:member_fields_visible],
-          :groups in socket.assigns[:member_fields_visible]
-        ),
-      query: socket.assigns[:query] || nil,
-      sort_field: export_sort_field(socket.assigns[:sort_field]),
-      sort_order: export_sort_order(socket.assigns[:sort_order]),
-      show_current_cycle: socket.assigns[:show_current_cycle] || false,
-      cycle_status_filter: export_cycle_status_filter(socket.assigns[:cycle_status_filter]),
-      boolean_filters: socket.assigns[:boolean_custom_field_filters] || %{}
-    }
-  end
-
-  defp expand_db_string_for_export(f, membership_fee_type_visible, computed_strings) do
-    if f == "membership_fee_start_date" do
-      extra =
-        if(membership_fee_type_visible, do: ["membership_fee_type"], else: []) ++
-          if "membership_fee_status" in computed_strings, do: ["membership_fee_status"], else: []
-
-      [f] ++ extra
-    else
-      [f]
-    end
-  end
-
-  defp build_export_member_fields_list(ordered_db, member_fields_visible) do
-    with_extras =
-      Enum.flat_map(ordered_db, fn f ->
-        if f == :membership_fee_start_date and
-             :membership_fee_type in (member_fields_visible || []) do
-          [f, :membership_fee_type]
-        else
-          [f]
-        end
-      end)
-
-    # If fee type is visible but start_date was not in the list, append it
-    with_extras =
-      if :membership_fee_type in (member_fields_visible || []) and
-           :membership_fee_type not in with_extras do
-        with_extras ++ [:membership_fee_type]
-      else
-        with_extras
-      end
-
-    if :groups in (member_fields_visible || []), do: with_extras ++ [:groups], else: with_extras
-  end
-
-  defp export_cycle_status_filter(nil), do: nil
-  defp export_cycle_status_filter(:paid), do: "paid"
-  defp export_cycle_status_filter(:unpaid), do: "unpaid"
-  defp export_cycle_status_filter(_), do: nil
-
-  defp export_sort_field(nil), do: nil
-  defp export_sort_field(f) when is_atom(f), do: Atom.to_string(f)
-  defp export_sort_field(f) when is_binary(f), do: f
-
-  defp export_sort_order(nil), do: nil
-  defp export_sort_order(:asc), do: "asc"
-  defp export_sort_order(:desc), do: "desc"
-  defp export_sort_order(o) when is_binary(o), do: o
-  # Build a single ordered list that matches the table order:
-  # - DB fields in Mv.Constants.member_fields() order (already pre-filtered as ordered_member_fields_db)
-  # - membership_fee_type and membership_fee_status inserted after membership_fee_start_date when visible
-  # - groups appended before custom fields when visible
-  # - custom fields appended in the same order as table (already ordered_custom_field_ids)
-  defp export_column_order(
-         ordered_member_fields_db,
-         ordered_computed_fields,
-         ordered_custom_field_ids,
-         membership_fee_type_visible,
-         groups_visible
-       ) do
-    db_strings = Enum.map(ordered_member_fields_db, &Atom.to_string/1)
-    computed_strings = Enum.map(ordered_computed_fields, &Atom.to_string/1)
-
-    # Place membership_fee_type and membership_fee_status after membership_fee_start_date when present
-    db_with_extras =
-      Enum.flat_map(
-        db_strings,
-        &expand_db_string_for_export(&1, membership_fee_type_visible, computed_strings)
-      )
-
-    # If fee type is visible but start_date was not in the list, append it before computed/groups
-    db_with_extras =
-      if membership_fee_type_visible and "membership_fee_type" not in db_with_extras do
-        db_with_extras ++ ["membership_fee_type"]
-      else
-        db_with_extras
-      end
-
-    # Any remaining computed fields not inserted above (future-proof)
-    remaining_computed =
-      computed_strings
-      |> Enum.reject(&(&1 in db_with_extras))
-
-    result = db_with_extras ++ remaining_computed
-    result = if groups_visible, do: result ++ ["groups"], else: result
-    result ++ ordered_custom_field_ids
-  end
 end
diff --git a/lib/mv_web/live/member_live/index/cookie.ex b/lib/mv_web/live/member_live/index/cookie.ex
new file mode 100644
index 00000000..a3c2de88
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/cookie.ex
@@ -0,0 +1,28 @@
+defmodule MvWeb.MemberLive.Index.Cookie do
+  @moduledoc """
+  Shared cookie-header parsing for the member-overview persistence chain.
+
+  Both `MvWeb.MemberLive.Index.ViewSettings` and
+  `MvWeb.MemberLive.Index.FieldSelection` read their persisted value from the
+  raw request `Cookie:` header on the disconnected mount, so the parsing lives
+  here once.
+  """
+
+  @doc """
+  Parses a raw `Cookie:` request-header string into a `%{name => value}` map,
+  URL-decoding each value. A valueless entry (`"key"`) maps to `""`; malformed
+  segments are skipped.
+  """
+  @spec parse_header(String.t()) :: %{String.t() => String.t()}
+  def parse_header(cookie_header) when is_binary(cookie_header) do
+    cookie_header
+    |> String.split(";")
+    |> Enum.map(&String.trim/1)
+    |> Enum.map(&String.split(&1, "=", parts: 2))
+    |> Enum.reduce(%{}, fn
+      [key, value], acc -> Map.put(acc, key, URI.decode(value))
+      [key], acc -> Map.put(acc, key, "")
+      _, acc -> acc
+    end)
+  end
+end
diff --git a/lib/mv_web/live/member_live/index/export_payload.ex b/lib/mv_web/live/member_live/index/export_payload.ex
new file mode 100644
index 00000000..3c15c611
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/export_payload.ex
@@ -0,0 +1,163 @@
+defmodule MvWeb.MemberLive.Index.ExportPayload do
+  @moduledoc """
+  Builds the member-overview export descriptor from the LiveView assigns.
+
+  The overview hands this payload (as JSON) to the export flow so a CSV export
+  reproduces exactly the columns, order, filters, and sort the user currently
+  sees. It is pure: it reads the overview assigns and returns a plain map; the
+  LiveView owns encoding and assigning it.
+
+  Column order mirrors the rendered table:
+
+    * DB member fields in `Mv.Constants.member_fields/0` order;
+    * `membership_fee_type` / `membership_fee_status` inserted right after
+      `membership_fee_start_date` when visible;
+    * `groups` appended before the custom fields when visible;
+    * custom fields in the table's custom-field order.
+  """
+
+  alias MvWeb.MemberLive.Index.FieldVisibility
+
+  @doc """
+  Builds the export descriptor map from the overview assigns.
+  """
+  @spec build(map()) :: map()
+  def build(assigns) do
+    visible_custom_field_ids = assigns[:visible_custom_field_ids] || []
+
+    member_fields_db = assigns[:member_fields_visible_db] || []
+    member_fields_computed = assigns[:member_fields_visible_computed] || []
+    member_fields_visible = assigns[:member_fields_visible] || []
+
+    # Order DB member fields exactly like the table/constants.
+    ordered_member_fields_db =
+      Mv.Constants.member_fields()
+      |> Enum.filter(&(&1 in member_fields_db))
+
+    # Order computed fields in canonical order.
+    ordered_computed_fields =
+      FieldVisibility.computed_member_fields()
+      |> Enum.filter(&(&1 in member_fields_computed))
+
+    member_fields_with_groups =
+      build_member_fields_list(ordered_member_fields_db, member_fields_visible)
+
+    # Order custom fields like the table (same as dynamic_cols / all_custom_fields order).
+    ordered_custom_field_ids =
+      assigns.all_custom_fields
+      |> Enum.map(&to_string(&1.id))
+      |> Enum.filter(&(&1 in visible_custom_field_ids))
+
+    %{
+      selected_ids: assigns.selected_members |> MapSet.to_list(),
+      member_fields:
+        Enum.map(member_fields_with_groups, fn
+          f when is_atom(f) -> Atom.to_string(f)
+          f when is_binary(f) -> f
+        end),
+      computed_fields: Enum.map(ordered_computed_fields, &Atom.to_string/1),
+      custom_field_ids: ordered_custom_field_ids,
+      column_order:
+        column_order(
+          ordered_member_fields_db,
+          ordered_computed_fields,
+          ordered_custom_field_ids,
+          :membership_fee_type in member_fields_visible,
+          :groups in member_fields_visible
+        ),
+      query: assigns[:query] || nil,
+      sort_field: sort_field(assigns[:sort_field]),
+      sort_order: sort_order(assigns[:sort_order]),
+      show_current_cycle: assigns[:show_current_cycle] || false,
+      cycle_status_filter: cycle_status_filter(assigns[:cycle_status_filter]),
+      boolean_filters: assigns[:boolean_custom_field_filters] || %{}
+    }
+  end
+
+  @doc "Serializes a sort field (atom or string) to its export string, or nil."
+  @spec sort_field(atom() | String.t() | nil) :: String.t() | nil
+  def sort_field(nil), do: nil
+  def sort_field(f) when is_atom(f), do: Atom.to_string(f)
+  def sort_field(f) when is_binary(f), do: f
+
+  @doc "Serializes a sort order (atom or string) to its export string, or nil."
+  @spec sort_order(atom() | String.t() | nil) :: String.t() | nil
+  def sort_order(nil), do: nil
+  def sort_order(:asc), do: "asc"
+  def sort_order(:desc), do: "desc"
+  def sort_order(o) when is_binary(o), do: o
+
+  defp cycle_status_filter(nil), do: nil
+  defp cycle_status_filter(:paid), do: "paid"
+  defp cycle_status_filter(:unpaid), do: "unpaid"
+  defp cycle_status_filter(_), do: nil
+
+  defp build_member_fields_list(ordered_db, member_fields_visible) do
+    member_fields_visible = member_fields_visible || []
+
+    with_extras =
+      Enum.flat_map(ordered_db, fn f ->
+        if f == :membership_fee_start_date and :membership_fee_type in member_fields_visible do
+          [f, :membership_fee_type]
+        else
+          [f]
+        end
+      end)
+
+    # If fee type is visible but start_date was not in the list, append it.
+    with_extras =
+      if :membership_fee_type in member_fields_visible and
+           :membership_fee_type not in with_extras do
+        with_extras ++ [:membership_fee_type]
+      else
+        with_extras
+      end
+
+    if :groups in member_fields_visible, do: with_extras ++ [:groups], else: with_extras
+  end
+
+  defp expand_db_string(f, membership_fee_type_visible, computed_strings) do
+    if f == "membership_fee_start_date" do
+      extra =
+        if(membership_fee_type_visible, do: ["membership_fee_type"], else: []) ++
+          if "membership_fee_status" in computed_strings, do: ["membership_fee_status"], else: []
+
+      [f] ++ extra
+    else
+      [f]
+    end
+  end
+
+  defp column_order(
+         ordered_member_fields_db,
+         ordered_computed_fields,
+         ordered_custom_field_ids,
+         membership_fee_type_visible,
+         groups_visible
+       ) do
+    db_strings = Enum.map(ordered_member_fields_db, &Atom.to_string/1)
+    computed_strings = Enum.map(ordered_computed_fields, &Atom.to_string/1)
+
+    # Place membership_fee_type and membership_fee_status after membership_fee_start_date when present.
+    db_with_extras =
+      Enum.flat_map(
+        db_strings,
+        &expand_db_string(&1, membership_fee_type_visible, computed_strings)
+      )
+
+    # If fee type is visible but start_date was not in the list, append it before computed/groups.
+    db_with_extras =
+      if membership_fee_type_visible and "membership_fee_type" not in db_with_extras do
+        db_with_extras ++ ["membership_fee_type"]
+      else
+        db_with_extras
+      end
+
+    # Any remaining computed fields not inserted above (future-proof).
+    remaining_computed = Enum.reject(computed_strings, &(&1 in db_with_extras))
+
+    result = db_with_extras ++ remaining_computed
+    result = if groups_visible, do: result ++ ["groups"], else: result
+    result ++ ordered_custom_field_ids
+  end
+end
diff --git a/lib/mv_web/live/member_live/index/field_selection.ex b/lib/mv_web/live/member_live/index/field_selection.ex
index 846cf1dc..fecbb2a8 100644
--- a/lib/mv_web/live/member_live/index/field_selection.ex
+++ b/lib/mv_web/live/member_live/index/field_selection.ex
@@ -29,6 +29,8 @@ defmodule MvWeb.MemberLive.Index.FieldSelection do
   Comma-separated list: `?fields=first_name,email,custom_field_abc-123`
   """
 
+  alias MvWeb.MemberLive.Index.Cookie
+
   @cookie_name "member_field_selection"
   @cookie_max_age 365 * 24 * 60 * 60
   @session_key "member_field_selection"
@@ -80,7 +82,7 @@ defmodule MvWeb.MemberLive.Index.FieldSelection do
         %{}
 
       [cookie_header | _rest] ->
-        cookies = parse_cookie_header(cookie_header)
+        cookies = Cookie.parse_header(cookie_header)
 
         case Map.get(cookies, @cookie_name) do
           nil -> %{}
@@ -90,19 +92,6 @@ defmodule MvWeb.MemberLive.Index.FieldSelection do
     end
   end
 
-  # Parses cookie header string into a map
-  defp parse_cookie_header(cookie_header) when is_binary(cookie_header) do
-    cookie_header
-    |> String.split(";")
-    |> Enum.map(&String.trim/1)
-    |> Enum.map(&String.split(&1, "=", parts: 2))
-    |> Enum.reduce(%{}, fn
-      [key, value], acc -> Map.put(acc, key, URI.decode(value))
-      [key], acc -> Map.put(acc, key, "")
-      _, acc -> acc
-    end)
-  end
-
   @doc """
   Saves field selection to cookie.
 
diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex
index 682b7b9f..4cd28c76 100644
--- a/lib/mv_web/live/member_live/index/field_visibility.ex
+++ b/lib/mv_web/live/member_live/index/field_visibility.ex
@@ -60,30 +60,12 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
                             :join_date
                           ])
 
-  @doc """
-  The curated default-visible columns (member-field atoms) for a first visit.
-  """
-  @spec default_visible_fields() :: [atom()]
-  def default_visible_fields, do: MapSet.to_list(@default_visible_fields)
-
-  @doc """
-  The curated default-visible columns for the given view settings.
-
-  In compact mode the composite `:name` / `:address` columns are visible by
-  default; when a composite is switched off, its constituent columns take over
-  as the defaults instead (§7b).
-
-  While the Member composite is compact, `include_email` decides where the email
-  lives: folded into the Member cell (`true`, no separate column), or as a
-  default-visible `:email` column (`false`).
-  """
-  @spec default_visible_fields(boolean(), boolean(), boolean()) :: [atom()]
-  def default_visible_fields(compact_member, include_email, compact_address) do
-    compact_member
-    |> default_visible_set(include_email, compact_address)
-    |> MapSet.to_list()
-  end
-
+  # The curated default-visible column set for the given view settings. In
+  # compact mode the composite `:name` / `:address` columns are default; when a
+  # composite is switched off, its constituent columns take over as the defaults
+  # instead (§7b). While the Member composite is compact, `include_email` decides
+  # where the email lives: folded into the Member cell (`true`, no separate
+  # column) or as a default-visible `:email` column (`false`).
   defp default_visible_set(compact_member, include_email, compact_address) do
     @default_visible_fields
     |> apply_name_default(compact_member, include_email)
@@ -205,48 +187,12 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   end
 
   @doc """
-  Gets all available fields for selection.
+  Builds field selection from URL, scoped to the columns offered for the given
+  view settings (`:compact_member` / `:member_include_email` / `:compact_address`
+  in `opts`): fields in `url_selection` are visible, all others false.
 
-  Returns a list of field identifiers:
-  - Member fields as atoms (e.g., `:first_name`, `:email`)
-  - Custom fields as strings (e.g., `"custom_field_abc-123"`)
-
-  ## Parameters
-
-    - `custom_fields` - List of CustomField resources that are available
-
-  ## Returns
-
-    List of field identifiers (atoms and strings)
-  """
-  @spec get_all_available_fields([struct()]) :: [atom() | String.t()]
-  def get_all_available_fields(custom_fields) do
-    member_fields =
-      overview_member_fields()
-      |> Enum.reject(fn field -> field == @export_only_alias end)
-
-    custom_field_names = Enum.map(custom_fields, &"custom_field_#{&1.id}")
-
-    member_fields ++ custom_field_names
-  end
-
-  @doc """
-  Builds field selection from URL only: fields in `url_selection` are visible, all others false.
-  Use when `?fields=...` is in the URL so column visibility is not merged with global settings.
-  """
-  @spec selection_from_url_only(%{String.t() => boolean()}, [struct()]) :: %{
-          String.t() => boolean()
-        }
-  def selection_from_url_only(url_selection, custom_fields) when is_map(url_selection) do
-    do_selection_from_url_only(url_selection, get_all_available_fields(custom_fields))
-  end
-
-  def selection_from_url_only(_, _), do: %{}
-
-  @doc """
-  Like `selection_from_url_only/2`, but scoped to the columns offered for the
-  given view settings (`:compact_member` / `:member_include_email` /
-  `:compact_address` in `opts`).
+  Use when `?fields=...` is in the URL so column visibility is not merged with
+  global settings.
   """
   @spec selection_from_url_only(%{String.t() => boolean()}, [struct()], keyword()) :: %{
           String.t() => boolean()
@@ -276,48 +222,16 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   end
 
   @doc """
-  Merges user field selection with global settings.
-
-  User selection takes priority over global settings. If a field is not in the
-  user selection, the global setting is used. If a field is not in global settings,
-  it defaults to `true` (visible).
-
-  ## Parameters
-
-    - `user_selection` - Map of field names (strings) to boolean visibility
-    - `global_settings` - Settings struct with `member_field_visibility` field
-    - `custom_fields` - List of CustomField resources
-
-  ## Returns
-
-    Map of field names (strings) to boolean visibility values
-
-  ## Examples
-
-      iex> user_selection = %{"first_name" => false}
-      iex> settings = %{member_field_visibility: %{first_name: true, email: true}}
-      iex> merge_with_global_settings(user_selection, settings, [])
-      %{"first_name" => false, "email" => true}  # User selection overrides global
-  """
-  @spec merge_with_global_settings(
-          %{String.t() => boolean()},
-          map(),
-          [struct()]
-        ) :: %{String.t() => boolean()}
-  def merge_with_global_settings(user_selection, global_settings, custom_fields) do
-    all_fields = get_all_available_fields(custom_fields)
-    do_merge(user_selection, global_settings, custom_fields, all_fields, @default_visible_fields)
-  end
-
-  @doc """
-  Like `merge_with_global_settings/3`, but scoped to the columns offered for the
-  given view settings (`:compact_member` / `:member_include_email` /
+  Merges user field selection with global settings, scoped to the columns offered
+  for the given view settings (`:compact_member` / `:member_include_email` /
   `:compact_address` in `opts`).
 
-  Only offered columns appear in the result, so a column that is not applicable
-  in the current mode (e.g. `:first_name` while the composite "Name" is on) never
-  leaks into the visible set. Defaults follow the mode via
-  `default_visible_fields/2`.
+  User selection takes priority over global settings. If a field is not in the
+  user selection, the global setting is used; if a field is not in global
+  settings, it defaults to visible. Only offered columns appear in the result, so
+  a column that is not applicable in the current mode (e.g. `:first_name` while
+  the composite "Name" is on) never leaks into the visible set. Defaults follow
+  the mode via `default_visible_set/3`.
   """
   @spec merge_with_global_settings(%{String.t() => boolean()}, map(), [struct()], keyword()) ::
           %{String.t() => boolean()}
@@ -345,35 +259,6 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
     end)
   end
 
-  @doc """
-  Gets the list of visible fields from a field selection map.
-
-  Returns only fields where visibility is `true`.
-
-  ## Parameters
-
-    - `field_selection` - Map of field names to boolean visibility
-
-  ## Returns
-
-    List of field identifiers (atoms for member fields, strings for custom fields)
-
-  ## Examples
-
-      iex> selection = %{"first_name" => true, "email" => false, "street" => true}
-      iex> get_visible_fields(selection)
-      [:first_name, :street]
-  """
-  @spec get_visible_fields(%{String.t() => boolean()}) :: [atom() | String.t()]
-  def get_visible_fields(field_selection) when is_map(field_selection) do
-    field_selection
-    |> Enum.filter(fn {_field, visible} -> visible end)
-    |> Enum.map(fn {field_string, _visible} -> to_field_identifier(field_string) end)
-    |> Enum.uniq()
-  end
-
-  def get_visible_fields(_), do: []
-
   @doc """
   Gets visible member fields from field selection.
 
diff --git a/lib/mv_web/member_live/index/membership_fee_status.ex b/lib/mv_web/live/member_live/index/membership_fee_status.ex
similarity index 81%
rename from lib/mv_web/member_live/index/membership_fee_status.ex
rename to lib/mv_web/live/member_live/index/membership_fee_status.ex
index d586b285..54571c49 100644
--- a/lib/mv_web/member_live/index/membership_fee_status.ex
+++ b/lib/mv_web/live/member_live/index/membership_fee_status.ex
@@ -21,8 +21,6 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatus do
   ## Parameters
 
     - `query` - Ash query for members
-    - `show_current` - If true, get current cycle status; if false, get last completed cycle status (currently unused, kept for API compatibility)
-    - `today` - Optional date to use as reference (currently unused, kept for API compatibility)
 
   ## Returns
 
@@ -33,8 +31,8 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatus do
     Uses Ash.Query.load to efficiently preload cycles in a single query.
     All cycles are loaded; filtering happens in memory in `get_cycle_status_for_member/2`.
   """
-  @spec load_cycles_for_members(Ash.Query.t(), boolean(), Date.t() | nil) :: Ash.Query.t()
-  def load_cycles_for_members(query, _show_current \\ false, _today \\ nil) do
+  @spec load_cycles_for_members(Ash.Query.t()) :: Ash.Query.t()
+  def load_cycles_for_members(query) do
     # Load membership_fee_type and cycles
     query
     |> Ash.Query.load([:membership_fee_type, membership_fee_cycles: [:membership_fee_type]])
@@ -158,30 +156,6 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatus do
     end)
   end
 
-  @doc """
-  Filters members by unpaid cycle status.
-
-  Returns members that have unpaid cycles in either the last completed cycle
-  or the current cycle, depending on `show_current`.
-
-  ## Parameters
-
-    - `members` - List of member structs with loaded cycles
-    - `show_current` - If true, filter by current cycle; if false, filter by last completed cycle
-
-  ## Returns
-
-    List of members with unpaid cycles
-
-  ## Deprecated
-
-    This function is kept for backwards compatibility. Use `filter_members_by_cycle_status/3` instead.
-  """
-  @spec filter_unpaid_members([Member.t()], boolean()) :: [Member.t()]
-  def filter_unpaid_members(members, show_current \\ false) do
-    filter_members_by_cycle_status(members, :unpaid, show_current)
-  end
-
   # Private helper function to format status label
   defp format_status_label(:paid), do: gettext("Paid")
   defp format_status_label(:unpaid), do: gettext("Unpaid")
diff --git a/lib/mv_web/live/member_live/index/view_settings.ex b/lib/mv_web/live/member_live/index/view_settings.ex
index d80a076e..b26fcb17 100644
--- a/lib/mv_web/live/member_live/index/view_settings.ex
+++ b/lib/mv_web/live/member_live/index/view_settings.ex
@@ -21,6 +21,8 @@ defmodule MvWeb.MemberLive.Index.ViewSettings do
   cookie is read directly from the request conn.
   """
 
+  alias MvWeb.MemberLive.Index.Cookie
+
   @cookie_name "member_view_settings"
   @session_key "member_view_settings"
   @connect_param "view_settings"
@@ -117,7 +119,7 @@ defmodule MvWeb.MemberLive.Index.ViewSettings do
     case Plug.Conn.get_req_header(conn, "cookie") do
       [cookie_header | _rest] ->
         cookie_header
-        |> parse_cookie_header()
+        |> Cookie.parse_header()
         |> Map.get(@cookie_name)
         |> parse_json()
 
@@ -170,17 +172,4 @@ defmodule MvWeb.MemberLive.Index.ViewSettings do
   end
 
   defp parse_json(_), do: %{}
-
-  # Parses a cookie header string into a name => value map.
-  defp parse_cookie_header(cookie_header) when is_binary(cookie_header) do
-    cookie_header
-    |> String.split(";")
-    |> Enum.map(&String.trim/1)
-    |> Enum.map(&String.split(&1, "=", parts: 2))
-    |> Enum.reduce(%{}, fn
-      [key, value], acc -> Map.put(acc, key, URI.decode(value))
-      [key], acc -> Map.put(acc, key, "")
-      _, acc -> acc
-    end)
-  end
 end
diff --git a/test/mv_web/live/member_live/index/cookie_test.exs b/test/mv_web/live/member_live/index/cookie_test.exs
new file mode 100644
index 00000000..83e4b1cc
--- /dev/null
+++ b/test/mv_web/live/member_live/index/cookie_test.exs
@@ -0,0 +1,22 @@
+defmodule MvWeb.MemberLive.Index.CookieTest do
+  @moduledoc """
+  Tests for the shared cookie-header parser used by the overview persistence chain.
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.Cookie
+
+  describe "parse_header/1" do
+    test "splits pairs and URL-decodes values" do
+      assert Cookie.parse_header("a=1; b=hello%20world") == %{"a" => "1", "b" => "hello world"}
+    end
+
+    test "maps a valueless entry to an empty string" do
+      assert Cookie.parse_header("flag; a=1") == %{"flag" => "", "a" => "1"}
+    end
+
+    test "keeps only the first '=' as the separator" do
+      assert Cookie.parse_header("token=a=b=c") == %{"token" => "a=b=c"}
+    end
+  end
+end
diff --git a/test/mv_web/live/member_live/index/export_payload_test.exs b/test/mv_web/live/member_live/index/export_payload_test.exs
new file mode 100644
index 00000000..932816e6
--- /dev/null
+++ b/test/mv_web/live/member_live/index/export_payload_test.exs
@@ -0,0 +1,87 @@
+defmodule MvWeb.MemberLive.Index.ExportPayloadTest do
+  @moduledoc """
+  Tests for the member-overview export descriptor builder: the column order it
+  emits must mirror the rendered table (DB fields in constants order, fee
+  type/status after the fee start date, groups before custom fields), and the
+  filter/sort/selection state must be serialized faithfully.
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.ExportPayload
+
+  defp custom_field(id), do: %{id: id}
+
+  describe "build/1" do
+    test "orders columns like the table: db fields, fee type/status, groups, custom fields" do
+      assigns = %{
+        selected_members: MapSet.new(["m1", "m2"]),
+        member_fields_visible_db: [:first_name, :membership_fee_start_date, :last_name],
+        member_fields_visible_computed: [:membership_fee_status],
+        member_fields_visible: [
+          :first_name,
+          :last_name,
+          :membership_fee_start_date,
+          :membership_fee_type,
+          :membership_fee_status,
+          :groups
+        ],
+        visible_custom_field_ids: ["cf-a"],
+        all_custom_fields: [custom_field("cf-a"), custom_field("cf-b")],
+        query: "ada",
+        sort_field: :last_name,
+        sort_order: :desc,
+        show_current_cycle: true,
+        cycle_status_filter: :unpaid,
+        boolean_custom_field_filters: %{"cf-x" => true}
+      }
+
+      payload = ExportPayload.build(assigns)
+
+      # DB fields follow Mv.Constants.member_fields/0 order (first_name, last_name,
+      # then membership_fee_start_date), membership_fee_type + status are inserted
+      # right after the fee start date, groups precede the custom fields, and custom
+      # fields keep table order (only visible ones).
+      assert payload.column_order == [
+               "first_name",
+               "last_name",
+               "membership_fee_start_date",
+               "membership_fee_type",
+               "membership_fee_status",
+               "groups",
+               "cf-a"
+             ]
+
+      assert Enum.sort(payload.selected_ids) == ["m1", "m2"]
+      assert payload.custom_field_ids == ["cf-a"]
+      assert payload.query == "ada"
+      assert payload.sort_field == "last_name"
+      assert payload.sort_order == "desc"
+      assert payload.show_current_cycle == true
+      assert payload.cycle_status_filter == "unpaid"
+      assert payload.boolean_filters == %{"cf-x" => true}
+    end
+
+    test "defaults optional state and omits groups/custom fields when not visible" do
+      assigns = %{
+        selected_members: MapSet.new(),
+        member_fields_visible_db: [:first_name],
+        member_fields_visible_computed: [],
+        member_fields_visible: [:first_name],
+        visible_custom_field_ids: [],
+        all_custom_fields: [custom_field("cf-a")]
+      }
+
+      payload = ExportPayload.build(assigns)
+
+      assert payload.column_order == ["first_name"]
+      assert payload.selected_ids == []
+      assert payload.custom_field_ids == []
+      assert payload.query == nil
+      assert payload.sort_field == nil
+      assert payload.sort_order == nil
+      assert payload.show_current_cycle == false
+      assert payload.cycle_status_filter == nil
+      assert payload.boolean_filters == %{}
+    end
+  end
+end
diff --git a/test/mv_web/live/member_live/index/field_visibility_test.exs b/test/mv_web/live/member_live/index/field_visibility_test.exs
index 728c6cf5..0da46324 100644
--- a/test/mv_web/live/member_live/index/field_visibility_test.exs
+++ b/test/mv_web/live/member_live/index/field_visibility_test.exs
@@ -6,201 +6,6 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
 
   alias MvWeb.MemberLive.Index.FieldVisibility
 
-  # Mock custom field structs for testing
-  defp create_custom_field(id, name, show_in_overview \\ true) do
-    %{
-      id: id,
-      name: name,
-      show_in_overview: show_in_overview
-    }
-  end
-
-  describe "get_all_available_fields/1" do
-    test "returns member fields and custom fields" do
-      custom_fields = [
-        create_custom_field("cf1", "Custom Field 1"),
-        create_custom_field("cf2", "Custom Field 2")
-      ]
-
-      result = FieldVisibility.get_all_available_fields(custom_fields)
-
-      # Should include all member fields
-      assert :first_name in result
-      assert :email in result
-      assert :street in result
-
-      # Should include custom fields as strings
-      assert "custom_field_cf1" in result
-      assert "custom_field_cf2" in result
-    end
-
-    test "handles empty custom fields list" do
-      result = FieldVisibility.get_all_available_fields([])
-
-      # Should only have member fields
-      assert :first_name in result
-      assert :email in result
-
-      refute Enum.any?(result, fn field ->
-               is_binary(field) and String.starts_with?(field, "custom_field_")
-             end)
-    end
-
-    test "includes all member fields from constants" do
-      custom_fields = []
-      result = FieldVisibility.get_all_available_fields(custom_fields)
-
-      member_fields = Mv.Constants.member_fields()
-
-      Enum.each(member_fields, fn field ->
-        assert field in result
-      end)
-    end
-
-    test "includes pseudo member fields (membership_fee_status, membership_fee_type, groups)" do
-      result = FieldVisibility.get_all_available_fields([])
-
-      assert :membership_fee_status in result
-      assert :membership_fee_type in result
-      assert :groups in result
-    end
-  end
-
-  describe "merge_with_global_settings/3" do
-    test "user selection overrides global settings" do
-      user_selection = %{"first_name" => false}
-      settings = %{member_field_visibility: %{first_name: true, email: true}}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["first_name"] == false
-      assert result["email"] == true
-    end
-
-    test "falls back to global settings when user selection is empty" do
-      user_selection = %{}
-      settings = %{member_field_visibility: %{first_name: false, email: true}}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["first_name"] == false
-      assert result["email"] == true
-    end
-
-    test "defaults to the curated set when field not in settings" do
-      user_selection = %{}
-      settings = %{member_field_visibility: %{join_date: false}}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      # join_date from settings overrides its curated default
-      assert result["join_date"] == false
-      # name is in the curated default set -> visible
-      assert result["name"] == true
-      # email is not in the curated default set -> hidden
-      assert result["email"] == false
-    end
-
-    test "handles custom fields visibility" do
-      user_selection = %{}
-      settings = %{member_field_visibility: %{}}
-
-      custom_fields = [
-        create_custom_field("cf1", "Custom 1", true),
-        create_custom_field("cf2", "Custom 2", false)
-      ]
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["custom_field_cf1"] == true
-      assert result["custom_field_cf2"] == false
-    end
-
-    test "user selection overrides custom field visibility" do
-      user_selection = %{"custom_field_cf1" => false}
-      settings = %{member_field_visibility: %{}}
-
-      custom_fields = [
-        create_custom_field("cf1", "Custom 1", true)
-      ]
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["custom_field_cf1"] == false
-    end
-
-    test "handles string keys in settings (JSONB format)" do
-      user_selection = %{}
-      settings = %{member_field_visibility: %{"first_name" => false, "email" => true}}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["first_name"] == false
-      assert result["email"] == true
-    end
-
-    test "handles mixed atom and string keys in settings" do
-      user_selection = %{}
-      # Use string keys only (as JSONB would return)
-      settings = %{member_field_visibility: %{"first_name" => false, "email" => true}}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      assert result["first_name"] == false
-      assert result["email"] == true
-    end
-
-    test "handles nil settings gracefully" do
-      user_selection = %{}
-      settings = %{member_field_visibility: nil}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      # Falls back to the curated default set (no crash on nil)
-      assert result["join_date"] == true
-      assert result["email"] == false
-    end
-
-    test "handles missing member_field_visibility key" do
-      user_selection = %{}
-      settings = %{}
-      custom_fields = []
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      # Falls back to the curated default set
-      assert result["join_date"] == true
-      assert result["email"] == false
-    end
-
-    test "includes all fields in result" do
-      user_selection = %{"first_name" => false}
-      settings = %{member_field_visibility: %{email: true}}
-
-      custom_fields = [
-        create_custom_field("cf1", "Custom 1", true)
-      ]
-
-      result = FieldVisibility.merge_with_global_settings(user_selection, settings, custom_fields)
-
-      # Should include all member fields
-      member_fields = Mv.Constants.member_fields()
-
-      Enum.each(member_fields, fn field ->
-        assert Map.has_key?(result, Atom.to_string(field))
-      end)
-
-      # Should include custom fields
-      assert Map.has_key?(result, "custom_field_cf1")
-    end
-  end
-
   describe "offered_member_fields/3 ordering (name group, then email, then address group, then rest)" do
     test "compact member + compact address: Name, E-Mail, Adresse lead" do
       result = FieldVisibility.offered_member_fields(true, false, true)
@@ -251,55 +56,6 @@ defmodule MvWeb.MemberLive.Index.FieldVisibilityTest do
 
   defp index_of(list, elem), do: Enum.find_index(list, &(&1 == elem))
 
-  describe "get_visible_fields/1" do
-    test "returns only fields with true visibility" do
-      selection = %{
-        "first_name" => true,
-        "email" => false,
-        "street" => true,
-        "custom_field_123" => false
-      }
-
-      result = FieldVisibility.get_visible_fields(selection)
-
-      assert :first_name in result
-      assert :street in result
-      refute :email in result
-      refute "custom_field_123" in result
-    end
-
-    test "converts member field strings to atoms" do
-      selection = %{"first_name" => true, "email" => true}
-
-      result = FieldVisibility.get_visible_fields(selection)
-
-      assert :first_name in result
-      assert :email in result
-    end
-
-    test "keeps custom fields as strings" do
-      selection = %{"custom_field_abc-123" => true}
-
-      result = FieldVisibility.get_visible_fields(selection)
-
-      assert "custom_field_abc-123" in result
-    end
-
-    test "handles empty selection" do
-      assert FieldVisibility.get_visible_fields(%{}) == []
-    end
-
-    test "handles all fields hidden" do
-      selection = %{"first_name" => false, "email" => false}
-
-      assert FieldVisibility.get_visible_fields(selection) == []
-    end
-
-    test "handles invalid input" do
-      assert FieldVisibility.get_visible_fields(nil) == []
-    end
-  end
-
   describe "get_visible_member_fields/1" do
     test "returns only member fields that are visible" do
       selection = %{
diff --git a/test/mv_web/member_live/index/membership_fee_status_test.exs b/test/mv_web/live/member_live/index/membership_fee_status_test.exs
similarity index 85%
rename from test/mv_web/member_live/index/membership_fee_status_test.exs
rename to test/mv_web/live/member_live/index/membership_fee_status_test.exs
index 8412f617..bcd3275c 100644
--- a/test/mv_web/member_live/index/membership_fee_status_test.exs
+++ b/test/mv_web/live/member_live/index/membership_fee_status_test.exs
@@ -6,7 +6,6 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
 
   import Mv.Fixtures, only: [create_fee_type: 1, create_cycle: 3]
 
-  alias Mv.Membership.Member
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
 
   require Ash.Query
@@ -26,35 +25,6 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
     member
   end
 
-  describe "load_cycles_for_members/2" do
-    test "efficiently loads cycles for members" do
-      fee_type = create_fee_type(%{interval: :yearly})
-
-      member1 = create_member(%{membership_fee_type_id: fee_type.id})
-      member2 = create_member(%{membership_fee_type_id: fee_type.id})
-
-      create_cycle(member1, fee_type, %{cycle_start: ~D[2023-01-01], status: :paid})
-      create_cycle(member2, fee_type, %{cycle_start: ~D[2023-01-01], status: :unpaid})
-
-      query =
-        Member
-        |> Ash.Query.filter(id in [^member1.id, ^member2.id])
-        |> MembershipFeeStatus.load_cycles_for_members()
-
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-      members = Ash.read!(query, actor: system_actor)
-
-      assert length(members) == 2
-
-      # Verify cycles are loaded
-      member1_loaded = Enum.find(members, &(&1.id == member1.id))
-      member2_loaded = Enum.find(members, &(&1.id == member2.id))
-
-      assert member1_loaded.membership_fee_cycles != nil
-      assert member2_loaded.membership_fee_cycles != nil
-    end
-  end
-
   describe "get_cycle_status_for_member/2" do
     test "returns status of last completed cycle" do
       fee_type = create_fee_type(%{interval: :yearly})
@@ -339,27 +309,5 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
       assert length(filtered) == 1
       assert List.first(filtered).id == member2.id
     end
-
-    test "returns all members when filter is nil" do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member1 = create_member(%{membership_fee_type_id: fee_type.id})
-      member2 = create_member(%{membership_fee_type_id: fee_type.id})
-
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      members =
-        [member1, member2]
-        |> Enum.map(fn m ->
-          m
-          |> Ash.load!([membership_fee_cycles: [:membership_fee_type]], actor: system_actor)
-          |> Ash.load!(:membership_fee_type, actor: system_actor)
-        end)
-
-      # filter_unpaid_members should still work for backwards compatibility
-      filtered = MembershipFeeStatus.filter_unpaid_members(members, false)
-
-      # Both members have no cycles, so both should be filtered out
-      assert Enum.empty?(filtered)
-    end
   end
 end
diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index 2efe055d..5ee23afb 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -95,6 +95,9 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
       html = render(view)
       # Should show suspended status (current cycle)
       assert html =~ "hero-pause-circle" || html =~ "suspended"
+
+      # The toggle button exposes its pressed state to assistive tech.
+      assert has_element?(view, ~s([data-testid=toggle-cycle-view][aria-pressed="true"]))
     end
 
     test "shows correct color coding for paid status", %{conn: conn} do
diff --git a/test/mv_web/member_live/index_pagination_test.exs b/test/mv_web/member_live/index_pagination_test.exs
index e21a5531..e10ffd45 100644
--- a/test/mv_web/member_live/index_pagination_test.exs
+++ b/test/mv_web/member_live/index_pagination_test.exs
@@ -8,10 +8,10 @@ defmodule MvWeb.MemberLive.IndexPaginationTest do
 
   import Phoenix.LiveViewTest
 
-  require Ash.Query
-
   alias Mv.Helpers.SystemActor
 
+  require Ash.Query
+
   # Matches the :overview default_limit / @page_limit in the LiveView.
   @page_limit 50
 
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index 14d76a82..fbff9f47 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -708,27 +708,6 @@ defmodule MvWeb.MemberLive.IndexTest do
       # Flash message should appear
       assert has_element?(view, "#flash-group")
     end
-
-    test "copy excludes a member whose email is blank from the recipient list", %{conn: conn} do
-      # The Member create action requires an email, so a blank-email member cannot
-      # be persisted; we exercise the preserved defensive filter in
-      # format_selected_member_emails/2 directly. One member has an email, the
-      # other has a blank one — only the former is a recipient (§1.10).
-      with_email = %{
-        id: Ecto.UUID.generate(),
-        first_name: "Has",
-        last_name: "Mail",
-        email: "has@example.com"
-      }
-
-      blank_email = %{id: Ecto.UUID.generate(), first_name: "Blank", last_name: "Mail", email: ""}
-      selected = MapSet.new([with_email.id, blank_email.id])
-
-      emails = MemberIndex.format_selected_member_emails([with_email, blank_email], selected)
-
-      assert emails == ["Has Mail <has@example.com>"]
-      _ = conn
-    end
   end
 
   describe "copy_emails empty-recipient feedback" do
@@ -1800,153 +1779,6 @@ defmodule MvWeb.MemberLive.IndexTest do
       |> Ash.load!(:custom_field_values, actor: actor)
     end
 
-    # Tests for get_boolean_custom_field_value/2
-    test "get_boolean_custom_field_value extracts true from Ash.Union format", %{conn: _conn} do
-      system_actor = SystemActor.get_system_actor()
-      boolean_field = create_boolean_custom_field()
-      member = create_member_with_boolean_value(%{}, boolean_field, true, system_actor)
-
-      # Test the function (will fail until implemented)
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == true
-    end
-
-    test "get_boolean_custom_field_value extracts false from Ash.Union format", %{conn: _conn} do
-      system_actor = SystemActor.get_system_actor()
-      boolean_field = create_boolean_custom_field()
-      member = create_member_with_boolean_value(%{}, boolean_field, false, system_actor)
-
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == false
-    end
-
-    test "get_boolean_custom_field_value extracts true from map format with _union_type and _union_value keys",
-         %{conn: _conn} do
-      system_actor = SystemActor.get_system_actor()
-      boolean_field = create_boolean_custom_field()
-
-      {:ok, member} =
-        Membership.create_member(
-          %{
-            first_name: "Test",
-            last_name: "Member",
-            email: "test.member.#{System.unique_integer([:positive])}@example.com"
-          },
-          actor: system_actor
-        )
-
-      # Create CustomFieldValue with map format (Ash expects _union_type and _union_value)
-      {:ok, _cfv} =
-        CustomFieldValue
-        |> Ash.Changeset.for_create(:create, %{
-          member_id: member.id,
-          custom_field_id: boolean_field.id,
-          value: %{"_union_type" => "boolean", "_union_value" => true}
-        })
-        |> Ash.create(actor: system_actor)
-
-      # Reload member with custom field values
-      member = member |> Ash.load!(:custom_field_values, actor: system_actor)
-
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == true
-    end
-
-    test "get_boolean_custom_field_value returns nil when no CustomFieldValue exists", %{
-      conn: _conn
-    } do
-      system_actor = SystemActor.get_system_actor()
-      boolean_field = create_boolean_custom_field()
-
-      {:ok, member} =
-        Membership.create_member(
-          %{
-            first_name: "Test",
-            last_name: "Member",
-            email: "test.member.#{System.unique_integer([:positive])}@example.com"
-          },
-          actor: system_actor
-        )
-
-      # Member has no custom field value for this field
-      member = member |> Ash.load!(:custom_field_values, actor: system_actor)
-
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == nil
-    end
-
-    test "get_boolean_custom_field_value returns nil when CustomFieldValue has nil value", %{
-      conn: _conn
-    } do
-      system_actor = SystemActor.get_system_actor()
-      boolean_field = create_boolean_custom_field()
-
-      {:ok, member} =
-        Membership.create_member(
-          %{
-            first_name: "Test",
-            last_name: "Member",
-            email: "test.member.#{System.unique_integer([:positive])}@example.com"
-          },
-          actor: system_actor
-        )
-
-      # Create CustomFieldValue with nil value (edge case)
-      {:ok, _cfv} =
-        CustomFieldValue
-        |> Ash.Changeset.for_create(:create, %{
-          member_id: member.id,
-          custom_field_id: boolean_field.id,
-          value: nil
-        })
-        |> Ash.create(actor: system_actor)
-
-      member = member |> Ash.load!(:custom_field_values, actor: system_actor)
-
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == nil
-    end
-
-    test "get_boolean_custom_field_value returns nil for non-boolean CustomFieldValue", %{
-      conn: _conn
-    } do
-      system_actor = SystemActor.get_system_actor()
-      string_field = create_string_custom_field()
-      boolean_field = create_boolean_custom_field()
-
-      {:ok, member} =
-        Membership.create_member(
-          %{
-            first_name: "Test",
-            last_name: "Member",
-            email: "test.member.#{System.unique_integer([:positive])}@example.com"
-          },
-          actor: system_actor
-        )
-
-      # Create string custom field value (not boolean)
-      {:ok, _cfv} =
-        CustomFieldValue
-        |> Ash.Changeset.for_create(:create, %{
-          member_id: member.id,
-          custom_field_id: string_field.id,
-          value: %{"_union_type" => "string", "_union_value" => "test"}
-        })
-        |> Ash.create(actor: system_actor)
-
-      member = member |> Ash.load!(:custom_field_values, actor: system_actor)
-
-      # Try to get boolean value from string field - should return nil
-      result = MemberIndex.get_boolean_custom_field_value(member, boolean_field)
-
-      assert result == nil
-    end
-
     # Tests for apply_boolean_custom_field_filters/2
     test "apply_boolean_custom_field_filters filters members with true value and excludes false/without values",
          %{conn: _conn} do

From 1c67527c5651071285480149d36dc48d2915d830 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 10:58:39 +0200
Subject: [PATCH 11/30] docs(member-live): document the overview and use
 English throughout its internals

---
 .../components/bulk_actions_dropdown.ex       | 10 ++--
 lib/mv_web/live/member_live/index.ex          | 60 ++++++++++++-------
 .../member_live/index/field_visibility.ex     |  6 +-
 .../live/member_live/index/view_settings.ex   |  4 +-
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/lib/mv_web/components/bulk_actions_dropdown.ex b/lib/mv_web/components/bulk_actions_dropdown.ex
index c6db9145..8d0e1509 100644
--- a/lib/mv_web/components/bulk_actions_dropdown.ex
+++ b/lib/mv_web/components/bulk_actions_dropdown.ex
@@ -1,6 +1,6 @@
 defmodule MvWeb.Components.BulkActionsDropdown do
   @moduledoc """
-  Single "Aktionen" dropdown bundling the four member bulk actions, flattened to
+  Single "Actions" dropdown bundling the four member bulk actions, flattened to
   one level: open in email program (mailto), copy email addresses, export to CSV,
   export to PDF.
 
@@ -10,10 +10,10 @@ defmodule MvWeb.Components.BulkActionsDropdown do
 
   ## Scope and trigger badge
 
-  The trigger reads `Aktionen` followed by a scope badge: an emphasized
+  The trigger reads the `Actions` label followed by a scope badge: an emphasized
   (`primary`) count `N` when `N` members are selected, and a muted (`neutral`)
-  badge otherwise — `gefiltert` when a search term or filter narrows the list,
-  `alle` when nothing is selected and no search/filter is active. Only an actual
+  badge otherwise — `filtered` when a search term or filter narrows the list,
+  `all` when nothing is selected and no search/filter is active. Only an actual
   selection is emphasized. The badge sits inside the shared `dropdown_menu/1`
   trigger via its `trigger_badge` slot, matching the member-filter dropdown's
   count badge. The `scope`, `selected_count`, `mailto_bcc`, `recipient_count`
@@ -216,7 +216,7 @@ defmodule MvWeb.Components.BulkActionsDropdown do
     gettext("Too many recipients for this function. Copy the addresses or export the list.")
   end
 
-  # The trigger scope is shown as a badge after the "Aktionen" label. Only an
+  # The trigger scope is shown as a badge after the "Actions" label. Only an
   # actual selection is emphasized (primary); both the "filtered" and "all"
   # scopes are muted (neutral), since neither means members are selected.
   defp scope_label(assigns) do
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 16977816..6933e005 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -4,24 +4,40 @@ defmodule MvWeb.MemberLive.Index do
 
   ## Features
   - Full-text search across member profiles using PostgreSQL tsvector
-  - Sortable columns (name, email, address fields)
-  - Bulk selection for future batch operations
-  - Real-time updates via LiveView
-  - Bookmarkable URLs with query parameters
+  - DB-side filtering, sorting, and keyset pagination (infinite scroll)
+  - Sortable columns, including composite Name (last→first) and Address (city→postal→street)
+  - Column manager and per-browser view settings (density, composite Member/Address, include-email)
+  - Bulk selection spanning the whole filtered set (select-all / copy emails / export)
+  - Bookmarkable URLs: filter/sort/search/view state is URL-encoded
 
   ## URL Parameters
-  - `query` - Search query string for full-text search
-  - `sort_field` - Field to sort by (e.g., :first_name, :email, :join_date)
-  - `sort_order` - Sort direction (:asc or :desc)
+  All list state is URL-encoded so the view is bookmarkable and restored on reload:
+  - `query` - full-text search string
+  - `sort_field` / `sort_order` - sort column and direction (`asc` / `desc`)
+  - `fields` - visible-column selection
+  - `highlight` - member id to render as selected (return from the show page)
+  - group / fee-type / boolean / date custom-field filter params (see
+    `MvWeb.MemberLive.Index.FilterParams` and `DateFilter` for the encoding)
 
-  ## Events
-  - `select_member` - Toggle individual member selection
-  - `select_all` - Toggle selection of all visible members
-  - `copy_emails` - Copy email addresses of the selected members, or of all/filtered members when nothing is selected
+  ## Events (`handle_event`)
+  - `select_member` / `select_all` - toggle individual / whole-filtered-set selection
+  - `select_row_and_navigate` - open a member's show page
+  - `load_more` - fetch and append the next keyset page (infinite scroll)
+  - `sort` - change the active sort column/direction
+  - `toggle_cycle_view` - switch the payment-status view between current and last cycle
+  - `copy_emails` - copy emails of the selected members, or of the whole filtered set when none are selected
+
+  ## Messages (`handle_info`, from the filter/search/view-settings components)
+  - `search_changed`, `view_setting_toggled`, `field_toggled`, `fields_selected`,
+    `fields_reset`, `reset_all_filters`, and the per-filter change messages
+    (`group_filter_changed`, `fee_type_filter_changed`, `boolean_filter_changed`,
+    `date_filters_changed`, `payment_filter_changed`)
 
   ## Implementation Notes
-  - Search uses PostgreSQL full-text search (plainto_tsquery)
-  - Sort state is synced with URL for bookmarkability
+  - Filtering/sorting/pagination run in PostgreSQL via Ash; the socket holds only
+    the loaded keyset window, not the whole table
+  - List state is synced with the URL for bookmarkability; a signature guard
+    avoids redundant reloads
   - Components communicate via `handle_info` for decoupling
   """
   use MvWeb, :live_view
@@ -980,7 +996,7 @@ defmodule MvWeb.MemberLive.Index do
 
   # Flips the "include email" sub-toggle. Only meaningful while the composite
   # Member cell is on: it moves the email between an in-cell line (on) and a
-  # separate E-Mail column (off), so besides re-rendering the rows it recomputes
+  # separate email column (off), so besides re-rendering the rows it recomputes
   # which columns the manager offers and their visibility.
   defp toggle_view_setting(socket, :member_include_email) do
     new_value = not socket.assigns.view_settings.member_include_email
@@ -995,10 +1011,10 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   # Flips the compact Member field. Besides re-rendering the rows, this changes
-  # which columns the manager offers (composite "Name" vs. Vorname/Nachname/E-Mail,
+  # which columns the manager offers (composite "Name" vs. first-name/last-name/email,
   # §7b). The email visibility carries over between the two representations,
   # analogously to the "include email" sub-toggle: composite + include-email ⇄ the
-  # E-Mail column being visible.
+  # email column being visible.
   defp toggle_view_setting(socket, :compact_member) do
     new_value = not socket.assigns.view_settings.compact_member
     email_visible? = email_currently_visible?(socket)
@@ -1013,8 +1029,8 @@ defmodule MvWeb.MemberLive.Index do
     |> push_field_selection_url()
   end
 
-  # Flips the compact Address field: offers the composite "Adresse" vs. the
-  # separate Straße/Hausnummer/PLZ/Ort columns, making the newly relevant columns
+  # Flips the compact Address field: offers the composite "Address" vs. the
+  # separate street/house-number/postal-code/city columns, making the newly relevant columns
   # visible and recomputing the offered set + visibility for the new mode.
   defp toggle_view_setting(socket, :compact_address) do
     new_value = not socket.assigns.view_settings.compact_address
@@ -1031,7 +1047,7 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   # Whether the member email is currently surfaced: while the composite is on,
-  # either folded into the cell (include_email) or as a separate E-Mail column;
+  # either folded into the cell (include_email) or as a separate email column;
   # while it is off, as its own column. Read before the flip, so `compact_member`
   # still holds the previous mode.
   defp email_currently_visible?(socket) do
@@ -1063,8 +1079,8 @@ defmodule MvWeb.MemberLive.Index do
 
   # Makes the now-relevant Member columns visible for the new mode. Turning the
   # composite on surfaces "Name" (with the email either folded via include_email
-  # or kept as a separate column); turning it off surfaces Vorname/Nachname and
-  # carries the prior email visibility onto the E-Mail column.
+  # or kept as a separate column); turning it off surfaces first-name/last-name and
+  # carries the prior email visibility onto the email column.
   defp apply_member_toggle(socket, true = _new_compact, email_visible?) do
     selection =
       socket.assigns.user_field_selection
@@ -1910,7 +1926,7 @@ defmodule MvWeb.MemberLive.Index do
   @doc """
   Returns true when the member list is restricted by a non-empty search term or
   any active filter (cycle status, group, fee type, boolean custom field, or a
-  date filter differing from the default). Drives the "(gefiltert)" vs "(alle)"
+  date filter differing from the default). Drives the "filtered" vs "all"
   trigger label and reads only assigns — no DB access.
   """
   def filters_active?(assigns) do
diff --git a/lib/mv_web/live/member_live/index/field_visibility.ex b/lib/mv_web/live/member_live/index/field_visibility.ex
index 4cd28c76..e7baba78 100644
--- a/lib/mv_web/live/member_live/index/field_visibility.ex
+++ b/lib/mv_web/live/member_live/index/field_visibility.ex
@@ -76,7 +76,7 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   defp apply_name_default(set, true = _compact, true = _include_email), do: set
 
   # Compact Member cell without folded email: the composite plus a separate
-  # default-visible E-Mail column.
+  # default-visible email column.
   defp apply_name_default(set, true = _compact, false = _include_email),
     do: MapSet.put(set, :email)
 
@@ -111,7 +111,7 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   3. the address group — the composite `:address` when compact, otherwise its
      constituents `:street`, `:house_number`, `:postal_code`, `:city`.
 
-  Everything else follows in the configured Datenfelder order. This keeps the
+  Everything else follows in the configured data-fields order. This keeps the
   name group ahead of the address group even when the name group is expanded
   into `:first_name`/`:last_name` while the address stays compact.
   """
@@ -145,7 +145,7 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
       address_variant_hidden?(field, compact_address)
   end
 
-  # Compact hides Vorname/Nachname (folded into the composite). The email is
+  # Compact hides first-name/last-name (folded into the composite). The email is
   # hidden only when it is folded into the cell (compact + include_email); with
   # include_email off it stays offered as a separate column. Non-compact hides the
   # composite in favour of the constituents.
diff --git a/lib/mv_web/live/member_live/index/view_settings.ex b/lib/mv_web/live/member_live/index/view_settings.ex
index b26fcb17..f3e2644c 100644
--- a/lib/mv_web/live/member_live/index/view_settings.ex
+++ b/lib/mv_web/live/member_live/index/view_settings.ex
@@ -6,11 +6,11 @@ defmodule MvWeb.MemberLive.Index.ViewSettings do
 
     * `:density` — `:compact` or `:comfortable` (the row-spacing / compact mode)
     * `:compact_member` — composite "Member" cell (last+first name) vs separate
-      Vorname/Nachname columns
+      first-name/last-name columns
     * `:member_include_email` — whether the email is surfaced (email line in the
       composite cell, or a separate Email column when the member field is split)
     * `:compact_address` — composite Address cell (street / postal+city) vs
-      separate Straße/PLZ/Ort columns
+      separate street/postal-code/city columns
 
   Persistence is per browser (not per account), resolved in priority order from
   the LiveView connect params, the session, the request cookie, and finally the

From 0cc37f7e9b6cacf71fbd66908a6b08a090cbb3d3 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 11:01:05 +0200
Subject: [PATCH 12/30] docs(changelog): record member overview data foundation
 and redesign under Unreleased

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2a57d3..f734002b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- **Members overview – view settings** – A new "View" dropdown switches the table between compact and comfortable density and controls how the Member and Address fields are shown: as combined composite cells or split into their underlying columns (Vorname/Nachname/E-Mail resp. Straße/PLZ/Ort). Every choice is remembered per browser.
+- **Members overview – reset columns to default** – The column-visibility menu gained a reset button that restores the curated default column set.
+
+### Changed
+- **Members overview – loads on demand** – The overview no longer reads every member into memory. Filtering, sorting and pagination now run in the database, and rows stream in via infinite scroll as you reach the bottom of the list, so large member lists open quickly. The exact number of matching members is announced (for example "250 Members").
+- **Members overview – condensed name and address** – By default a member shows as a composite name cell and a two-line address cell (street / postal code + city); both columns are sortable and city and postal code stay findable via search. A clear (×) button was added to the search field.
+- **Members overview – bulk actions span the full result set** – Select-all, copy e-mail addresses, and export now act on the complete filtered set rather than only the rows currently loaded, and the count reflects the full filtered total.
+- **Members overview – sticky header, pinned column and sortable headers** – The table keeps a sticky header and pinned identifier column, sort headers that expose the active sort direction, boolean columns rendered as ✓/✗ icons, larger touch targets in both densities, and result-count and loading changes announced through a polite live region — meeting WCAG 2.2 AA for accessibility.
+
 ## [1.3.0] - 2026-06-16
 
 ### Added

From 4adb6be5e5492e40f8c47190f5c9e430252ff659 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 15:42:01 +0200
Subject: [PATCH 13/30] refactor(member): drop the unused second-sticky-column
 table option

---
 lib/mv_web/components/core_components.ex | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index b95ba33e..ff74760d 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -1012,11 +1012,6 @@ defmodule MvWeb.CoreComponents do
     doc:
       "when true, first header/body column gets sticky left positioning to keep selection controls visible"
 
-  attr :sticky_second_col, :boolean,
-    default: false,
-    doc:
-      "when true, the second column is also pinned left (e.g. an identifier column kept visible while scrolling horizontally)"
-
   attr :viewport_bottom, :any,
     default: nil,
     doc:
@@ -1083,8 +1078,7 @@ defmodule MvWeb.CoreComponents do
               class={[
                 table_th_class(col, @sticky_header),
                 @sticky_first_col && col_idx == 0 &&
-                  "sticky-first-col-th sticky left-0 z-30 bg-base-100",
-                @sticky_second_col && col_idx == 1 && "sticky left-12 z-30 bg-base-100"
+                  "sticky-first-col-th sticky left-0 z-30 bg-base-100"
               ]}
               aria-sort={table_th_aria_sort(col, @sort_field, @sort_order)}
             >
@@ -1160,13 +1154,6 @@ defmodule MvWeb.CoreComponents do
                     classes
                   end
 
-                classes =
-                  if @sticky_second_col && col_idx == 1 do
-                    ["sticky left-12 z-20 bg-base-100" | classes]
-                  else
-                    classes
-                  end
-
                 classes =
                   if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do
                     ["truncate" | classes]

From c9dd900a5f090e9adc7c9762ccfa693849aaea50 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 15:42:32 +0200
Subject: [PATCH 14/30] docs(member): clarify the :overview vs :read read
 actions

---
 lib/membership/member.ex     | 5 ++++-
 lib/membership/membership.ex | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index f57c32a5..9f7965bb 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -271,7 +271,10 @@ defmodule Mv.Membership.Member do
     # action only enables keyset pagination with a unique `id` tie-breaker so
     # pages never skip or duplicate rows.
     read :overview do
-      description "Keyset-paginated member overview read"
+      # Distinct from the plain `:read` (`list_members`), which returns the full
+      # unpaginated set: `:overview` (`overview_members`) is keyset-paginated and
+      # left intentionally bare so `OverviewQuery` composes filters/sort onto it.
+      description "Keyset-paginated, externally-composed member overview read"
       pagination keyset?: true, default_limit: 50, required?: false
     end
 
diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex
index b7c5974d..d1295c6b 100644
--- a/lib/membership/membership.ex
+++ b/lib/membership/membership.ex
@@ -44,6 +44,8 @@ defmodule Mv.Membership do
   resources do
     resource Mv.Membership.Member do
       define :create_member, action: :create_member
+      # `list_members` returns the full unpaginated set; `overview_members` is the
+      # keyset-paginated base for the member overview (composed by OverviewQuery).
       define :list_members, action: :read
       define :overview_members, action: :overview
       define :update_member, action: :update_member

From cdb8b03ce1a7577ccd26736a60974cf0a6261671 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 15:42:58 +0200
Subject: [PATCH 15/30] test(member): move the cycle-status test beside its
 OverviewQuery

---
 .../member_live/index/overview_query_cycle_status_test.exs}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/mv_web/{member_live/index_cycle_status_filter_test.exs => live/member_live/index/overview_query_cycle_status_test.exs} (97%)

diff --git a/test/mv_web/member_live/index_cycle_status_filter_test.exs b/test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
similarity index 97%
rename from test/mv_web/member_live/index_cycle_status_filter_test.exs
rename to test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
index f6bb4467..1ee235c9 100644
--- a/test/mv_web/member_live/index_cycle_status_filter_test.exs
+++ b/test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
@@ -1,4 +1,4 @@
-defmodule MvWeb.MemberLive.IndexCycleStatusFilterTest do
+defmodule MvWeb.MemberLive.Index.OverviewQueryCycleStatusTest do
   @moduledoc """
   §1.13 — the paid/unpaid cycle-status filter, under the current or last-completed
   cycle view, returns the same members as the previous in-memory classifier,

From ce49d751ea2f1cca35ca2e42e0f81661394e2af2 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 17:27:01 +0200
Subject: [PATCH 16/30] fix: missing type declaration for buttons causing new
 warnings

---
 lib/mv_web/components/core_components.ex |  2 +-
 mix.lock                                 | 38 ++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/mv_web/components/core_components.ex b/lib/mv_web/components/core_components.ex
index 2ed22fd1..a75a0801 100644
--- a/lib/mv_web/components/core_components.ex
+++ b/lib/mv_web/components/core_components.ex
@@ -135,7 +135,7 @@ defmodule MvWeb.CoreComponents do
       <.button variant="ghost" size="sm">Edit</.button>
       <.button disabled={true}>Disabled</.button>
   """
-  attr :rest, :global, include: ~w(href navigate patch method data-testid form)
+  attr :rest, :global, include: ~w(href navigate patch method data-testid form type)
 
   attr :variant, :string,
     values: ~w(primary secondary neutral ghost outline danger link icon),
diff --git a/mix.lock b/mix.lock
index 60cfef59..1cffe99c 100644
--- a/mix.lock
+++ b/mix.lock
@@ -7,18 +7,18 @@
   "ash_postgres": {:hex, :ash_postgres, "2.9.1", "bf4229d65706f794650edb47c9f30138a6e2d5af6efe002ca38e619306cca9f6", [:mix], [{:ash, "~> 3.24", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, "~> 0.6", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "72c0366649985a858d4ef8f906968cee339dfd7519bb0beaa2b4d87f3d5b0bb9"},
   "ash_sql": {:hex, :ash_sql, "0.6.3", "a708b34ba71b40141dab9e75dc44a095885ae4635b25135d3fd4c3620b299b97", [:mix], [{:ash, ">= 3.24.5 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "3ee461380d96dca32766a210ea60c64783f690ad5565f0434a00cd475e71e8b9"},
   "assent": {:hex, :assent, "0.2.13", "11226365d2d8661d23e9a2cf94d3255e81054ff9d88ac877f28bfdf38fa4ef31", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:finch, "~> 0.15", [hex: :finch, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:req, "~> 0.4", [hex: :req, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "bf9f351b01dd6bceea1d1f157f05438f6765ce606e6eb8d29296003d29bf6eab"},
-  "bandit": {:hex, :bandit, "1.11.1", "1eb33123cc3c17ae0c3447874eb83399ee530f960c39711ed240342fbd4865fa", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d4401016df9abbc6dcd325c0b78b2b193e7c7c96bb68f31e576112be025d84a5"},
+  "bandit": {:hex, :bandit, "1.12.0", "6c5214daa2469644ac4ab0113b98abc24f75e348378e6a974c6343b3e5da22ef", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.5", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "45dac82dc86f45cf4a196dee9cc5a8b791d9c9469d996055f055e6ee36c66e20"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"},
   "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
   "castore": {:hex, :castore, "1.0.19", "6903cabdfd9d1af46454126e7c8385186659dd33ecfb74a885cae52221ad6109", [:mix], [], "hexpm", "3669e6cab13f54c2df26b3e6833745d647f35b6e30d8ddd5975df0d5c842ca98"},
   "cc_precompiler": {:hex, :cc_precompiler, "0.1.11", "8c844d0b9fb98a3edea067f94f616b3f6b29b959b6b3bf25fee94ffe34364768", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "3427232caf0835f94680e5bcf082408a70b48ad68a5f5c0b02a3bea9f3a075b9"},
   "cinder": {:hex, :cinder, "0.14.0", "ae0866aaa3c166cc882de04f1c9d9906d5be0e5cfb8d7e9f7d62c097d97013e7", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, "~> 2.3", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 1.0.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "e05d9c6c75dc839faaaa2063e46cd69dda3907718af71964231c93d2f602bc49"},
-  "circular_buffer": {:hex, :circular_buffer, "1.0.0", "25c004da0cba7bd8bc1bdabded4f9a902d095e20600fd15faf1f2ffbaea18a07", [:mix], [], "hexpm", "c829ec31c13c7bafd1f546677263dff5bfb006e929f25635878ac3cfba8749e5"},
+  "circular_buffer": {:hex, :circular_buffer, "1.0.1", "01f0e3d5fe945080692cf6521c0988e9dbb5dc312831cefe77e5b63a4e658160", [:mix], [], "hexpm", "7d4ece3137d49c1f8dd0b3e0aa7c484f4d83a0be5d4b516c282085c1d5f2d7b9"},
   "comeonin": {:hex, :comeonin, "5.5.1", "5113e5f3800799787de08a6e0db307133850e635d34e9fab23c70b6501669510", [:mix], [], "hexpm", "65aac8f19938145377cee73973f192c5645873dcf550a8a6b18187d17c13ccdb"},
-  "cowboy": {:hex, :cowboy, "2.15.0", "9cfe86ed7117bf045e10adbedb0170af7be57f2a3637e7be143433d8dd267396", [:make, :rebar3], [{:cowlib, ">= 2.16.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "179fb65140fb440a17b767ad53b755081506f9596c4db5c49c0396d8c8643668"},
+  "cowboy": {:hex, :cowboy, "2.17.0", "059d6ae769214cedf55d115ce5bf38649ff6b32ec693067cf6b185d0ab1b53c3", [:make, :rebar3], [{:cowlib, ">= 2.18.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "84f0e4c9d5820342cd506472052b79336d0d9d3624e46303f6d0af9dc94e8d5f"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
-  "cowlib": {:hex, :cowlib, "2.16.1", "318d385d55f657e9a5005838c4e426e13dcd724a691438384b6165a69687e531", [:make, :rebar3], [], "hexpm", "58f1e425a9e04176f1d30e20116f57c4e90ef0e187552e9741c465bdf4044f70"},
+  "cowlib": {:hex, :cowlib, "2.18.0", "4a3ef8cb012c21c7cbb7c925f75405e26d7fcd393fd78c46187539dbc9a48310", [:make, :rebar3], [], "hexpm", "c4f89d33a61162d4cfdcb5a1af7e562d80a700b2573cc71020ce6521b152dc1a"},
   "credo": {:hex, :credo, "1.7.18", "5c5596bf7aedf9c8c227f13272ac499fe8eae6237bd326f2f07dfc173786f042", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a189d164685fd945809e862fe76a7420c4398fa288d76257662aecb909d6b3e5"},
   "crux": {:hex, :crux, "0.1.3", "c698dee09d811678dcddad11a02a832c6bff100f1a7aee49ac44c87485bdbac8", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "04188ea9c1cee13e3ef132417200765857402dcc581f45a8a7862eec3b0530ff"},
   "db_connection": {:hex, :db_connection, "2.10.1", "d5465f6bcc125c1b8981c1dbf23c193ca16f446ec0b25832dc174f74f18be510", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "18ed94c6e627b4bf452dbd4df61b69a35a1e768525140bc1917b7a685026a6a3"},
@@ -32,20 +32,20 @@
   "erlex": {:hex, :erlex, "0.2.9", "7debbbaa9f4f368b8cd648983e0f1d7963028508e9c59e9d4ed504e94ef52a55", [:mix], [], "hexpm", "8cfffc0ec7159e6d73de2ab28a588064de80f88b2798d5cbe4482cbbc200178b"},
   "esbuild": {:hex, :esbuild, "0.10.0", "b0aa3388a1c23e727c5a3e7427c932d89ee791746b0081bbe56103e9ef3d291f", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "468489cda427b974a7cc9f03ace55368a83e1a7be12fba7e30969af78e5f8c70"},
   "ets": {:hex, :ets, "0.9.0", "79c6a6c205436780486f72d84230c6cba2f8a9920456750ddd1e47389107d5fd", [:mix], [], "hexpm", "2861fdfb04bcaeff370f1a5904eec864f0a56dcfebe5921ea9aadf2a481c822b"},
-  "ex_ast": {:hex, :ex_ast, "0.12.0", "052ad63711da41b7efbfb3490dbf3d757bb67caec17d02f6deb0db4a0363e5f6", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.7", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "66b4797f157d32f0a63c6da227515f78816c0ac8f621f6d7a2b22108e7b4dd85"},
+  "ex_ast": {:hex, :ex_ast, "0.12.7", "ba3aa94140345b0688f9c5dea62b5d558536cc5f2ff7e37466f884e85aca0964", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.7", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "62d3967d3308868db56c51803ff3908a632609d0fd39d6a609032bff49a34f42"},
   "ex_phone_number": {:hex, :ex_phone_number, "0.4.10", "11809f6600b2ecb0a2e75d496c2ec2f273d49d1e2f58b2be2667decb0aabfb43", [:mix], [{:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: false]}], "hexpm", "eefccf58d8149d64af658721bff0edcb9e9b8943f74000ede151948ef03046c1"},
   "expo": {:hex, :expo, "1.1.1", "4202e1d2ca6e2b3b63e02f69cfe0a404f77702b041d02b58597c00992b601db5", [:mix], [], "hexpm", "5fb308b9cb359ae200b7e23d37c76978673aa1b06e2b3075d814ce12c5811640"},
   "file_system": {:hex, :file_system, "1.1.1", "31864f4685b0148f25bd3fbef2b1228457c0c89024ad67f7a81a3ffbc0bbad3a", [:mix], [], "hexpm", "7a15ff97dfe526aeefb090a7a9d3d03aa907e100e262a0f8f7746b78f8f87a5d"},
-  "finch": {:hex, :finch, "0.22.0", "5c48fa6f9706a78eb9036cacb67b8b996b4e66d111c543f4c29bb0f879a6806b", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.8", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 1.1", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b94e83c47780fc6813f746a1f1a34ee65cda42da4c5ea26a68f0acc4498e23dc"},
+  "finch": {:hex, :finch, "0.23.0", "e3f9287ac25a8832f848b144c2b57346aac65b205e2e0629a52adfe6507fd837", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.8", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 1.1", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "80e58d3f936f57e3fdf404f83a3642897ae6d9fb642934e46da4d8fe761b99d5"},
   "fine": {:hex, :fine, "0.1.6", "4bf7151493443c454aac9f2fa2f34f5fefd0346a83fb5586a016c4a135c63247", [:mix], [], "hexpm", "5638eb4495488e885ebec167fa57973e5c35e1a50c344eb7666c90ec1c4e3b12"},
   "gen_smtp": {:hex, :gen_smtp, "1.3.0", "62c3d91f0dcf6ce9db71bcb6881d7ad0d1d834c7f38c13fa8e952f4104a8442e", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "0b73fbf069864ecbce02fe653b16d3f35fd889d0fdd4e14527675565c39d84e6"},
   "gettext": {:hex, :gettext, "1.0.2", "5457e1fd3f4abe47b0e13ff85086aabae760497a3497909b8473e0acee57673b", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "eab805501886802071ad290714515c8c4a17196ea76e5afc9d06ca85fb1bfeb3"},
   "glob_ex": {:hex, :glob_ex, "0.1.11", "cb50d3f1ef53f6ca04d6252c7fde09fd7a1cf63387714fe96f340a1349e62c93", [:mix], [], "hexpm", "342729363056e3145e61766b416769984c329e4378f1d558b63e341020525de4"},
   "hammer": {:hex, :hammer, "7.3.0", "2e9759b2aea75d070eacd7f7239d5ea74991762788a22223d3cc1d555c7475a0", [:mix], [], "hexpm", "cfd88c4075c03be92b2fbbcb35af354315e21c6dd47adf7947a2d500cbebef2c"},
   "heroicons": {:git, "https://github.com/tailwindlabs/heroicons.git", "0435d4ca364a608cc75e2f8683d374e55abbae26", [tag: "v2.2.0", sparse: "optimized", depth: 1]},
-  "hpax": {:hex, :hpax, "1.0.3", "ed67ef51ad4df91e75cc6a1494f851850c0bd98ebc0be6e81b026e765ee535aa", [:mix], [], "hexpm", "8eab6e1cfa8d5918c2ce4ba43588e894af35dbd8e91e6e55c817bca5847df34a"},
+  "hpax": {:hex, :hpax, "1.0.4", "777de5d433b0fbdc7c418159c8055910faa8047ffdb3d6b31098d2a46cd7685c", [:mix], [], "hexpm", "afc7cb142ebcc2d01ce7816190b98ce5dd49e799111b24249f3443d730f377ca"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
-  "igniter": {:hex, :igniter, "0.8.1", "3c6ea47f3a6031015e29da8b4ba5c685f0a2e409facf63041fd83e982ca3aa89", [:mix], [{:ex_ast, "~> 0.5", [hex: :ex_ast, repo: "hexpm", optional: false]}, {:glob_ex, "~> 0.1.7", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:jason, "~> 1.4.5", [hex: :jason, repo: "hexpm", optional: false]}, {:owl, "~> 0.11", [hex: :owl, repo: "hexpm", optional: false]}, {:phx_new, "~> 1.7", [hex: :phx_new, repo: "hexpm", optional: true]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:rewrite, ">= 1.1.1 and < 2.0.0-0", [hex: :rewrite, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.4", [hex: :sourceror, repo: "hexpm", optional: false]}, {:spitfire, ">= 0.1.3 and < 1.0.0-0", [hex: :spitfire, repo: "hexpm", optional: false]}], "hexpm", "d99472e6daf3bfc3675d699c6c7ace9196f377207aab83e09d7b95e9d90e8ae8"},
+  "igniter": {:hex, :igniter, "0.8.2", "28621d9d2559c86a0249a195d9a7c55e8967b781850feff0bce6c4013b75f1c3", [:mix], [{:ex_ast, "~> 0.5", [hex: :ex_ast, repo: "hexpm", optional: false]}, {:glob_ex, "~> 0.1.7", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:jason, "~> 1.4.5", [hex: :jason, repo: "hexpm", optional: false]}, {:owl, "~> 0.11", [hex: :owl, repo: "hexpm", optional: false]}, {:phx_new, "~> 1.7", [hex: :phx_new, repo: "hexpm", optional: true]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:rewrite, ">= 1.1.1 and < 2.0.0-0", [hex: :rewrite, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.4", [hex: :sourceror, repo: "hexpm", optional: false]}, {:spitfire, ">= 0.1.3 and < 1.0.0-0", [hex: :spitfire, repo: "hexpm", optional: false]}], "hexpm", "89146ad3fba21f3ea10873ae509fc760618623d4578e4723929a9dd1532aa30f"},
   "imprintor": {:hex, :imprintor, "0.6.0", "c6dfeb3c47d15cfb7e8491cf0a40548b3b9e37d0fc33940ca6dd283d36c4bada", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "9c26b0e665c0ab183860e77c450e0b0a4e390249e8322328dbe1be70d0fbca36"},
   "iterex": {:hex, :iterex, "0.1.2", "58f9b9b9a22a55cbfc7b5234a9c9c63eaac26d276b3db80936c0e1c60355a5a6", [:mix], [], "hexpm", "2e103b8bcc81757a9af121f6dc0df312c9a17220f302b1193ef720460d03029d"},
   "jason": {:hex, :jason, "1.4.5", "2e3a008590b0b8d7388c20293e9dcc9cf3e5d642fd2a114e4cbbb52e595d940a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b0c823996102bcd0239b3c2444eb00409b72f6a140c1950bc8b457d836b30684"},
@@ -56,50 +56,50 @@
   "live_debugger": {:hex, :live_debugger, "1.0.0", "0bbcbdcb3b40b6862b6dfbb76579e7832e2787fee643031e5958f597def6fb32", [:mix], [{:file_system, "~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, ">= 1.1.7 and < 2.0.0-0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "b80f5d9db874d3270eb534738a10982b2b4ce55d58f94544e43b4a36111585fc"},
   "luhn": {:hex, :luhn, "0.3.3", "5aa0c6a32c2db4b9db9f9b883ba8301c1ae169d57199b9e6cb1ba2707bc51d96", [:mix], [], "hexpm", "3e823a913a25aab51352c727f135278d22954874d5f0835be81ed4fec3daf78d"},
   "mime": {:hex, :mime, "2.0.7", "b8d739037be7cd402aee1ba0306edfdef982687ee7e9859bee6198c1e7e2f128", [:mix], [], "hexpm", "6171188e399ee16023ffc5b76ce445eb6d9672e2e241d2df6050f3c771e80ccd"},
-  "mint": {:hex, :mint, "1.9.0", "d6f534c2a3e98b2a8cc749b4796eb77e9e3af79a76f96e4c74035a827de0d318", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "007154c7d8c43916aed3c93afd1f11aebbaa9c5ff4b7ba55ebe0d17ee0296042"},
+  "mint": {:hex, :mint, "1.9.1", "3bc120b743ed2e99ad920910f2613e9faebabb2257731b0e2ea4d8ccd9eceede", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "831101bd560b086316fab5f7adb21a4f3455717d8e4bc8368b052e09aa9163e0"},
   "mix_audit": {:hex, :mix_audit, "2.1.5", "c0f77cee6b4ef9d97e37772359a187a166c7a1e0e08b50edf5bf6959dfe5a016", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "87f9298e21da32f697af535475860dc1d3617a010e0b418d2ec6142bc8b42d69"},
   "multigraph": {:hex, :multigraph, "0.16.1-mg.4", "2bbe149f5411b0e3bf0624c7bf2e3da2738efeac2f9a67bbbcb807ab171f0a76", [:mix], [], "hexpm", "b9f3e2577cef4658eeedf97c76d22a86d33a7aab702a93c1da9c122e849e9037"},
   "nimble_csv": {:hex, :nimble_csv, "1.3.0", "b7f998dc62b222bce9596e46f028c7a5af04cb5dde6df2ea197c583227c54971", [:mix], [], "hexpm", "41ccdc18f7c8f8bb06e84164fc51635321e80d5a3b450761c4997d620925d619"},
   "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"},
   "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
-  "owl": {:hex, :owl, "0.13.0", "26010e066d5992774268f3163506972ddac0a7e77bfe57fa42a250f24d6b876e", [:mix], [{:ucwidth, "~> 0.2", [hex: :ucwidth, repo: "hexpm", optional: true]}], "hexpm", "59bf9d11ce37a4db98f57cb68fbfd61593bf419ec4ed302852b6683d3d2f7475"},
-  "phoenix": {:hex, :phoenix, "1.8.7", "d8d755b4ff4b449f610223dd706b4ae64155cb720d3dc09c706c079ecea189e4", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "47352f72d6ab31009ef77516b1b3a14745be97b54061fd458031b9d8294869d5"},
+  "owl": {:hex, :owl, "0.13.1", "1ec4a5dea170465f0e90c502c203079224516bc0cbd599281c8667b3c6ef8848", [:mix], [{:ucwidth, "~> 0.2", [hex: :ucwidth, repo: "hexpm", optional: true]}], "hexpm", "351e768af8f2edc575cdaab1a5a2f6d6381be591758a026c701c703145508a0c"},
+  "phoenix": {:hex, :phoenix, "1.8.8", "ada3d761359274178180c0e992ef0c2b536bd7c3bd75ebba94acbf39ab4347fe", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "f0c843037bd2e7012fc1d1ec9574dfa6972b7e3d09e9b77fd23aa283af0aa994"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.7.0", "75c4b9dfb3efdc42aec2bd5f8bccd978aca0651dbcbc7a3f362ea5d9d43153c6", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "1d75011e4254cb4ddf823e81823a9629559a1be93b4321a6a5f11a5306fbf4cc"},
   "phoenix_html": {:hex, :phoenix_html, "4.3.0", "d3577a5df4b6954cd7890c84d955c470b5310bb49647f0a114a6eeecc850f7ad", [:mix], [], "hexpm", "3eaa290a78bab0f075f791a46a981bbe769d94bc776869f4f3063a14f30497ad"},
   "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.8.7", "405880012cb4b706f26dd1c6349125bfc903fb9e44d1ea668adaf4e04d4884b7", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:ecto_sqlite3_extras, "~> 1.1.7 or ~> 1.2.0", [hex: :ecto_sqlite3_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "3a8625cab39ec261d48a13b7468dc619c0ede099601b084e343968309bd4d7d7"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.6.2", "b18b0773a1ba77f28c52decbb0f10fd1ac4d3ae5b8632399bbf6986e3b665f62", [:mix], [{:file_system, "~> 0.2.10 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "d1f89c18114c50d394721365ffb428cce24f1c13de0467ffa773e2ff4a30d5b9"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.31", "c45c85df509dd79c917bc530e26c71299e3920850f65ea52ab6a19ccee66875a", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2f53cc6a9e149f30449341c2775990819d97e3b22338fe719c4d30342e6f9638"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "1.2.5", "29fdf6be32b88395d82cce9f31c154fe0dd9538c9bc6bca78ae4a569cb8b7f8a", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "864e71ee13e676a2bdecb09698054450ad1c21f14b0863238d44ed9f213a269a"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
   "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.1", "b74ccaa8046fbc388a62134360ee7d9742d5a8ae74063f34eb050279de7a99e1", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "4000eeba3f9d7d1a6bf56d2bd56733d5cadf41a7f0d8ffe5bb67e7d667e204a2"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.4", "b45c9d9cf15b3a1af5fb555c674b525391b6a1fe975f040fb4d913397b31abf4", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "4e992022ce14f31fe57335db27a28154afcc94e9983266835bb3040243eb620b"},
   "picosat_elixir": {:hex, :picosat_elixir, "0.2.3", "bf326d0f179fbb3b706bb2c15fbc367dacfa2517157d090fdfc32edae004c597", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f76c9db2dec9d2561ffaa9be35f65403d53e984e8cd99c832383b7ab78c16c66"},
-  "plug": {:hex, :plug, "1.19.2", "e4950525b22c6789dfb38a3f95d47171ba159da3fc5a33be9643b43d5e8adb98", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b6fce20a56af5e60fa5dfecf3f907bb98ec981be43c79a3809a499bc3d133de0"},
-  "plug_cowboy": {:hex, :plug_cowboy, "2.8.1", "5aa391a5e8d1ac3192e36a3bcaff12b5fd6ef6c7e29b53a38e63a860783e77d0", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "4c200288673d5bc86a0ab7dc6a2a069176a74e5d573ef62740a1c517458a5f26"},
+  "plug": {:hex, :plug, "1.20.2", "adbee2441232412e37fbb357fd5e4cd533fdd253b29f2e1992262b0f1fb01462", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b16baf55877d60891002ffc1ce0b3ff7d6f30a38a23e02e4d4293c4ac266f136"},
+  "plug_cowboy": {:hex, :plug_cowboy, "2.9.0", "87e21e0d9054ced99c36d128f49e3ea2cd8b745fffb97de50bff99706087af4f", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "2002bafba4f3a45b55a58e68d70211b153a7ed18d37edb1ceb6e96e7a92c422e"},
   "plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
   "postgrex": {:hex, :postgrex, "0.22.2", "4aec14df2a72722aee92492566edbeeb44e233ecb86b1915d03136297ef1385d", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "8946382ddb06294f56026ac4278b3cc212bac8a2c82ed68b4087819ed1abc53b"},
   "ranch": {:hex, :ranch, "1.8.1", "208169e65292ac5d333d6cdbad49388c1ae198136e4697ae2f474697140f201c", [:make, :rebar3], [], "hexpm", "aed58910f4e21deea992a67bf51632b6d60114895eb03bb392bb733064594dd0"},
   "reactor": {:hex, :reactor, "1.0.2", "79e4e81d016ab0016afd10bb4c18cb3a574f08f10f8e53be5f08ce27f8eed541", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:multigraph, "~> 0.16.1-mg.2", [hex: :multigraph, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "19fd55aaaadaae28f55133351051c25d4ac217f99e3e5a67940cc4a321e3948e"},
-  "req": {:hex, :req, "0.5.18", "48e6431cb4135e8a7815e745177485369a9b4a9924d5fe68ca00eb09ceaed1ef", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.21.0 or ~> 0.22.0", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "fa03812c440a9754bf34355e0c5d4f3ed316458db62e3284b7a352ef8dc0b996"},
+  "req": {:hex, :req, "0.6.2", "b9b2024f35bcf60a92cc8cad2eaaf9d4e7aace463ff74be1afe5986830184413", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.21", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cc9cd30a2ddd04989929b887178e1610c940456d962c6c3a52df6146d2eef9bf"},
   "rewrite": {:hex, :rewrite, "1.3.0", "67448ba7975690b35ba7e7f35717efcce317dbd5963cb0577aa7325c1923121a", [:mix], [{:glob_ex, "~> 0.1", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "d111ac7ff3a58a802ef4f193bbd1831e00a9c57b33276e5068e8390a212714a5"},
   "rustler_precompiled": {:hex, :rustler_precompiled, "0.9.0", "3a052eda09f3d2436364645cc1f13279cf95db310eb0c17b0d8f25484b233aa0", [:mix], [{:rustler, "~> 0.23", [hex: :rustler, repo: "hexpm", optional: true]}], "hexpm", "471d97315bd3bf7b64623418b3693eedd8e47de3d1cb79a0ac8f9da7d770d94c"},
   "slugify": {:hex, :slugify, "1.3.1", "0d3b8b7e5c1eeaa960e44dce94382bee34a39b3ea239293e457a9c5b47cc6fd3", [:mix], [], "hexpm", "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"},
   "sobelow": {:hex, :sobelow, "0.14.1", "2f81e8632f15574cba2402bcddff5497b413c01e6f094bc0ab94e83c2f74db81", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8fac9a2bd90fdc4b15d6fca6e1608efb7f7c600fa75800813b794ee9364c87f2"},
-  "sourceror": {:hex, :sourceror, "1.12.0", "da354c5f35aad3cc1132f5d5b0d8437d865e2661c263260480bab51b5eedb437", [:mix], [], "hexpm", "755703683bd014ebcd5de9acc24b68fb874a660a568d1d63f8f98cd8a6ef9cd0"},
+  "sourceror": {:hex, :sourceror, "1.12.2", "85bfd48159f020c0cbfc72f289f11456fdc05dc43719b6f2589fb969faefa113", [:mix], [], "hexpm", "da37d3da09c5b890528802c7056a8f585a061973820d7656b6e3649c14f0e9cb"},
   "spark": {:hex, :spark, "2.7.0", "e685b33c038f12851993880bb7e3b326117612eb746fe15828678c152f8321c6", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "e2f675fbda32375b01d9ee7c652671531027fd043bf4a91bafdb2ab716aa1122"},
-  "spitfire": {:hex, :spitfire, "0.3.12", "0f7780e4c6ea3753b65ea0c4924f3dfd5c21a51aaa734ffb9dd0b68d2544f27e", [:mix], [], "hexpm", "a389931287b85330c0e954ab06447e198516ab368a232a0200ed77ca13ca9acf"},
+  "spitfire": {:hex, :spitfire, "0.3.13", "edd207b065eaec57acc5484097d0aa3e97fe4246168c54e67a9af040b8dee4c1", [:mix], [], "hexpm", "3601be88ceed4967b584e96444de3e1d12d6555ae0864a7390b9cd5332d134b4"},
   "splode": {:hex, :splode, "0.3.1", "9843c54f84f71b7833fec3f0be06c3cfb5be6b35960ee195ea4fad84b1c25030", [:mix], [], "hexpm", "8f2309b6ec2ecbb01435656429ed1d9ed04ba28797a3280c3b0d1217018ecfbd"},
   "stream_data": {:hex, :stream_data, "1.3.0", "bde37905530aff386dea1ddd86ecbf00e6642dc074ceffc10b7d4e41dfd6aac9", [:mix], [], "hexpm", "3cc552e286e817dca43c98044c706eec9318083a1480c52ae2688b08e2936e3c"},
   "sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"},
   "swoosh": {:hex, :swoosh, "1.25.1", "569fcff34817da8a03f28775146b3c8b71b4c9b14f8f78d37ff3ef422862a18b", [:mix], [{:bandit, ">= 1.0.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mua, "~> 0.2.3", [hex: :mua, repo: "hexpm", optional: true]}, {:multipart, "~> 0.4", [hex: :multipart, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.5.10 or ~> 0.6 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "58b3e8db6406fe417a89b5042358d2e8f15d32a3317d4f8581d7a3ae501e410b"},
-  "tailwind": {:hex, :tailwind, "0.4.1", "e7bcc222fe96a1e55f948e76d13dd84a1a7653fb051d2a167135db3b4b08d3e9", [:mix], [], "hexpm", "6249d4f9819052911120dbdbe9e532e6bd64ea23476056adb7f730aa25c220d1"},
+  "tailwind": {:hex, :tailwind, "0.5.1", "35435b13158c90d37da11e1cfc808755fca1d7b6c5ab87b1b19c5de87e2f0a10", [:mix], [], "hexpm", "c4e26302a59fec72abc5610ecb6ad2116d9aa31f31aab2d4b8eb6e95d25a689c"},
   "telemetry": {:hex, :telemetry, "1.4.2", "a0cb522801dffb1c49fe6e30561badffc7b6d0e180db1300df759faa22062855", [:rebar3], [], "hexpm", "928f6495066506077862c0d1646609eed891a4326bee3126ba54b60af61febb1"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"},
   "text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"},
   "thousand_island": {:hex, :thousand_island, "1.5.0", "f50a213cac97262b6d5ebb85745aa2c00fec1413191e6e66834788d45425cecb", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "708923d40523e43cf99041ab37a0d4b0ec426ac6438fa3716ab23d919eaeb412"},
-  "tidewave": {:hex, :tidewave, "0.5.6", "91f35540b5599640443f1d3a1c6166bf506e202840261a6344e384e8813c1f64", [:mix], [{:circular_buffer, "~> 0.4 or ~> 1.0", [hex: :circular_buffer, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_live_reload, ">= 1.6.1", [hex: :phoenix_live_reload, repo: "hexpm", optional: true]}, {:plug, "~> 1.17", [hex: :plug, repo: "hexpm", optional: false]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}], "hexpm", "dc82d52b8b6ffc04680544b17cd340c7d4166bb0d63999eb960850526866b533"},
+  "tidewave": {:hex, :tidewave, "0.6.1", "53ab0ee06b0bc1225aeebdc56cdb8143e47cbdca47c34a1cb9d3406ef7a51f3c", [:mix], [{:circular_buffer, "~> 0.4 or ~> 1.0", [hex: :circular_buffer, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix_live_reload, ">= 1.6.1", [hex: :phoenix_live_reload, repo: "hexpm", optional: true]}, {:plug, "~> 1.17", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d81b021814709a0de5bd2c6db814f026ae29bd431bf5e0f48c841edbb05480f4"},
   "tz": {:hex, :tz, "0.28.1", "717f5ffddfd1e475e2a233e221dc0b4b76c35c4b3650b060c8e3ba29dd6632e9", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:mint, "~> 1.6", [hex: :mint, repo: "hexpm", optional: true]}], "hexpm", "bfdca1aa1902643c6c43b77c1fb0cb3d744fd2f09a8a98405468afdee0848c8a"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.1", "a48703a25c170eedadca83b11e88985af08d35f37c6f664d6dcfb106a97782fc", [:rebar3], [], "hexpm", "b3a917854ce3ae233619744ad1e0102e05673136776fb2fa76234f3e03b23642"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},

From eb20c8f3b6b21612b60e673c604a09cf4360ac5b Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 18:12:31 +0200
Subject: [PATCH 17/30] style: fix formatting

---
 lib/mv_web/components/layouts.ex              |  4 +--
 lib/mv_web/components/layouts/sidebar.ex      |  6 ++--
 .../components/member_filter_component.ex     | 28 +++++++++----------
 lib/mv_web/live/member_live/index.html.heex   |  3 +-
 lib/mv_web/live/statistics_live.ex            | 21 +++++---------
 lib/mv_web/live/user_live/form.ex             | 12 ++++----
 6 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex
index 9aff23c0..7ad21cb8 100644
--- a/lib/mv_web/components/layouts.ex
+++ b/lib/mv_web/components/layouts.ex
@@ -171,8 +171,8 @@ defmodule MvWeb.Layouts do
             </label>
             <span class="font-bold">{@club_name}</span>
           </header>
-          
-    <!-- Main Content (shared between mobile and desktop) -->
+
+          <!-- Main Content (shared between mobile and desktop) -->
           <main class="px-4 py-8 sm:px-6 lg:px-8">
             <div class="mx-auto space-y-4 max-full">
               {render_slot(@inner_block)}
diff --git a/lib/mv_web/components/layouts/sidebar.ex b/lib/mv_web/components/layouts/sidebar.ex
index 2a4ea981..2efef617 100644
--- a/lib/mv_web/components/layouts/sidebar.ex
+++ b/lib/mv_web/components/layouts/sidebar.ex
@@ -26,8 +26,7 @@ defmodule MvWeb.Layouts.Sidebar do
       aria-label={gettext("Close sidebar")}
       class="drawer-overlay lg:hidden focus:outline-none focus:ring-2 focus:ring-primary"
       tabindex="-1"
-    >
-    </label>
+    ></label>
     <aside id="main-sidebar" class="sidebar" aria-label={gettext("Main navigation")}>
       {sidebar_header(assigns)}
       <%= if @current_user do %>
@@ -174,8 +173,7 @@ defmodule MvWeb.Layouts.Sidebar do
             <span
               class="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-primary"
               aria-hidden="true"
-            >
-            </span>
+            ></span>
           <% end %>
         </span>
         <span class="menu-label">{@label}</span>
diff --git a/lib/mv_web/live/components/member_filter_component.ex b/lib/mv_web/live/components/member_filter_component.ex
index a0753387..dfb83e9f 100644
--- a/lib/mv_web/live/components/member_filter_component.ex
+++ b/lib/mv_web/live/components/member_filter_component.ex
@@ -158,8 +158,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
         </.badge>
         <.icon name="hero-chevron-down" class="size-4" />
       </.button>
-      
-    <!--
+
+      <!--
         NOTE: We use a div panel instead of ul.menu/li structure to avoid DaisyUI menu styles
         (padding, display, hover, font sizes) that would interfere with our form controls.
         Filter controls are form elements (fieldset with legend, radio inputs), not menu items.
@@ -232,8 +232,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </div>
             </fieldset>
           </div>
-          
-    <!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
+
+          <!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
           <div :if={length(@groups) > 0} class="mb-4">
             <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
               {gettext("Groups")}
@@ -299,8 +299,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </fieldset>
             </div>
           </div>
-          
-    <!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
+
+          <!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
           <div :if={length(@fee_types) > 0} class="mb-4">
             <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
               {gettext("Fee types")}
@@ -366,8 +366,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </fieldset>
             </div>
           </div>
-          
-    <!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
+
+          <!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
           <div class="mb-4">
             <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
               {gettext("Dates")}
@@ -484,8 +484,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </div>
             </fieldset>
           </div>
-          
-    <!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
+
+          <!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
           <div :if={length(@date_custom_fields) > 0} class="mb-4">
             <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
               {gettext("Custom date fields")}
@@ -523,8 +523,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </fieldset>
             </div>
           </div>
-          
-    <!-- Custom Fields Group -->
+
+          <!-- Custom Fields Group -->
           <div :if={length(@boolean_custom_fields) > 0} class="mb-2">
             <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
               {gettext("Individual datafields")}
@@ -590,8 +590,8 @@ defmodule MvWeb.Components.MemberFilterComponent do
               </fieldset>
             </div>
           </div>
-          
-    <!-- Footer -->
+
+          <!-- Footer -->
           <div class="mt-4 flex justify-between pt-3 border-t border-base-200">
             <.button
               type="button"
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index eb7085dc..3f2d7090 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -103,8 +103,7 @@
       sort_field={@sort_field}
       sort_order={@sort_order}
     >
-      
-<!-- <:col :let={member} label="Id">{member.id}</:col> -->
+      <!-- <:col :let={member} label="Id">{member.id}</:col> -->
       <:col
         :let={member}
         col_click={&MvWeb.MemberLive.Index.checkbox_column_click/1}
diff --git a/lib/mv_web/live/statistics_live.ex b/lib/mv_web/live/statistics_live.ex
index 8a9b5cd2..cf627185 100644
--- a/lib/mv_web/live/statistics_live.ex
+++ b/lib/mv_web/live/statistics_live.ex
@@ -152,11 +152,9 @@ defmodule MvWeb.StatisticsLive do
                 <p class="text-xs text-base-content/70 mt-2">
                   <span class="inline-block w-2 h-2 rounded-full bg-success align-middle mr-1"></span>
                   {gettext("Paid")}
-                  <span class="inline-block w-2 h-2 rounded-full bg-warning align-middle mx-2 mr-1">
-                  </span>
+                  <span class="inline-block w-2 h-2 rounded-full bg-warning align-middle mx-2 mr-1"></span>
                   {gettext("Unpaid")}
-                  <span class="inline-block w-2 h-2 rounded-full bg-base-content/20 align-middle mx-2 mr-1">
-                  </span>
+                  <span class="inline-block w-2 h-2 rounded-full bg-base-content/20 align-middle mx-2 mr-1"></span>
                   {gettext("Suspended")}
                 </p>
               </div>
@@ -271,8 +269,7 @@ defmodule MvWeb.StatisticsLive do
                     class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
                     aria-hidden="true"
                     title={gettext("Joins")}
-                  >
-                  </span>
+                  ></span>
                 </span>
               </td>
               <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
@@ -282,8 +279,7 @@ defmodule MvWeb.StatisticsLive do
                     class="inline-block w-2 h-2 rounded-full bg-error shrink-0"
                     aria-hidden="true"
                     title={gettext("Exits")}
-                  >
-                  </span>
+                  ></span>
                 </span>
               </td>
             </tr>
@@ -437,8 +433,7 @@ defmodule MvWeb.StatisticsLive do
                     class="inline-block w-2 h-2 rounded-full bg-success shrink-0"
                     aria-hidden="true"
                     title={gettext("Paid")}
-                  >
-                  </span>
+                  ></span>
                 </span>
               </td>
               <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
@@ -448,8 +443,7 @@ defmodule MvWeb.StatisticsLive do
                     class="inline-block w-2 h-2 rounded-full bg-warning shrink-0"
                     aria-hidden="true"
                     title={gettext("Unpaid")}
-                  >
-                  </span>
+                  ></span>
                 </span>
               </td>
               <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
@@ -459,8 +453,7 @@ defmodule MvWeb.StatisticsLive do
                     class="inline-block w-2 h-2 rounded-full bg-base-content/20 shrink-0"
                     aria-hidden="true"
                     title={gettext("Suspended")}
-                  >
-                  </span>
+                  ></span>
                 </span>
               </td>
               <td class="align-middle text-xs font-mono text-base-content whitespace-nowrap pt-0">
diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex
index 2d295921..910b3d34 100644
--- a/lib/mv_web/live/user_live/form.ex
+++ b/lib/mv_web/live/user_live/form.ex
@@ -92,8 +92,8 @@ defmodule MvWeb.UserLive.Form do
               />
             </div>
           <% end %>
-          
-    <!-- Password Section -->
+
+          <!-- Password Section -->
           <div class="mt-6">
             <label class="flex items-center space-x-2">
               <input
@@ -129,8 +129,8 @@ defmodule MvWeb.UserLive.Form do
                   required
                   autocomplete="new-password"
                 />
-                
-    <!-- Only show password confirmation for new users (register_with_password) -->
+
+                <!-- Only show password confirmation for new users (register_with_password) -->
                 <%= if !@user do %>
                   <.input
                     field={@form[:password_confirmation]}
@@ -180,8 +180,8 @@ defmodule MvWeb.UserLive.Form do
               <% end %>
             <% end %>
           </div>
-          
-    <!-- Member Linking Section (admin only: only admins can link/unlink users to members) -->
+
+          <!-- Member Linking Section (admin only: only admins can link/unlink users to members) -->
           <%= if @can_manage_member_linking do %>
             <div class="mt-6">
               <h2 class="mb-3 text-base font-semibold">{gettext("Linked Member")}</h2>

From 08bae3ce55fea04670e0c65f64081e2b100474f1 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Mon, 6 Jul 2026 19:51:26 +0200
Subject: [PATCH 18/30] chore: disable mix hex.audit as long as unfixable
 security advisories can't be skipped

---
 .drone.jsonnet |  6 ++++--
 mix.lock       | 18 +++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 388e8f4c..87f3260c 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -40,8 +40,10 @@ local step_lint = {
     'mix compile --warnings-as-errors', // Check for compilation errors & warnings
     'mix format --check-formatted',     // Check formatting
     'mix sobelow --config',             // Security checks
-    'mix deps.audit --ignore-file .deps_audit_ignore',  // Known vulnerabilities
-    'mix hex.audit',                    // Unmaintained dependencies
+    // mix hex.audit (Hex >= 2.5) fails on unpatched transitive advisories (cowlib, swoosh).
+    // mix deps.audit supports .deps_audit_ignore for accepted risks; re-enable hex.audit when
+    // ignore_advisories lands in Hex or those packages are patched.
+    'mix deps.audit --ignore-file .deps_audit_ignore',
     'mix credo --strict',               // Code quality hints
     'mix gettext.extract --check-up-to-date',  // Translations up to date
   ],
diff --git a/mix.lock b/mix.lock
index 1cffe99c..17cb540d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,11 +1,11 @@
 %{
-  "ash": {:hex, :ash, "3.27.7", "349e47b9fc293c8de56866f900f6e1a3a5deea1e110d205749f94a9833431811", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.6.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "eb8a1a74090d7f1753a63fe422cd493b7f50736e2d95d280ccfb508956dccc1d"},
+  "ash": {:hex, :ash, "3.29.3", "ba3c286c10fef489e01e1896bb6e80dbcac357c55b6d375da9e9eb7b49e88234", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.14", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.6.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2a7a45d3a3b980457b5cc7e339a84a35c232a7ab99047bbf7ce55e7dc36df357"},
   "ash_admin": {:hex, :ash_admin, "1.1.0", "df7c8075347ca9229f132648534a33319f29ae5aceed6c1015d138bba1a4811f", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.20 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:cinder, "~> 0.9", [hex: :cinder, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "f8bd6c08b584a315a9574c7bbe9c1c914bc5c51838045994b0e5369871f9b3d8"},
-  "ash_authentication": {:hex, :ash_authentication, "4.13.7", "421b5ddb516026f6794435980a632109ec116af2afa68a45e15fb48b41c92cfa", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "0d45ac3fdcca6902dabbe161ce63e9cea8f90583863c2e14261c9309e5837121"},
+  "ash_authentication": {:hex, :ash_authentication, "4.14.1", "67ce78459f1064d0a0374beced5bf6bd106e98d59f3253a96525f3073c2493fb", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "e149234fc70dc2544aac7a52656318bebca89a58ecbe98fb884ae41cf76fe6d7"},
   "ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.16.0", "02045ecde9eeb30ab1bfffbdf693c64426af24902bcd533765eba725b9b9f46f", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, "~> 4.10", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "1107a45af771ee7c02ebe82abcaf9a778096e66b3e6cb2b6e614d22d1fe385f7"},
   "ash_phoenix": {:hex, :ash_phoenix, "2.3.22", "f59a347ee09e1fa9973fe1b2faf7f8f793acc14dc09341062783b8eb1a9f5c99", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "4b34ea84e122c238ad1843888b8fd4d21aec27605b9b1e6e27e1b70329560fbb"},
-  "ash_postgres": {:hex, :ash_postgres, "2.9.1", "bf4229d65706f794650edb47c9f30138a6e2d5af6efe002ca38e619306cca9f6", [:mix], [{:ash, "~> 3.24", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, "~> 0.6", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "72c0366649985a858d4ef8f906968cee339dfd7519bb0beaa2b4d87f3d5b0bb9"},
-  "ash_sql": {:hex, :ash_sql, "0.6.3", "a708b34ba71b40141dab9e75dc44a095885ae4635b25135d3fd4c3620b299b97", [:mix], [{:ash, ">= 3.24.5 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "3ee461380d96dca32766a210ea60c64783f690ad5565f0434a00cd475e71e8b9"},
+  "ash_postgres": {:hex, :ash_postgres, "2.10.0", "831d3b70b80560a6894cb17c98e3f72e3dbbc06e835dbac36363c27e186b1940", [:mix], [{:ash, "~> 3.29", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, "~> 0.6", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "e73298910d29b8051b30af390094165848b588288204ab12990f365c9fc653cc"},
+  "ash_sql": {:hex, :ash_sql, "0.6.5", "4c64ccee3cbe7101a088aa84df54da9ce3622f7fb14cdbfc3e9fa9e010a5baa4", [:mix], [{:ash, ">= 3.24.5 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, ">= 3.13.4 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "e054670f5cf59e5dd2b13695c5de02ade592dc2f012ece10adb98a87e94cca8b"},
   "assent": {:hex, :assent, "0.2.13", "11226365d2d8661d23e9a2cf94d3255e81054ff9d88ac877f28bfdf38fa4ef31", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:finch, "~> 0.15", [hex: :finch, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:req, "~> 0.4", [hex: :req, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "bf9f351b01dd6bceea1d1f157f05438f6765ce606e6eb8d29296003d29bf6eab"},
   "bandit": {:hex, :bandit, "1.12.0", "6c5214daa2469644ac4ab0113b98abc24f75e348378e6a974c6343b3e5da22ef", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.5", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "45dac82dc86f45cf4a196dee9cc5a8b791d9c9469d996055f055e6ee36c66e20"},
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.3.2", "d50091e3c9492d73e17fc1e1619a9b09d6a5ef99160eb4d736926fd475a16ca3", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "471be5151874ae7931911057d1467d908955f93554f7a6cd1b7d804cac8cef53"},
@@ -20,14 +20,14 @@
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.18.0", "4a3ef8cb012c21c7cbb7c925f75405e26d7fcd393fd78c46187539dbc9a48310", [:make, :rebar3], [], "hexpm", "c4f89d33a61162d4cfdcb5a1af7e562d80a700b2573cc71020ce6521b152dc1a"},
   "credo": {:hex, :credo, "1.7.18", "5c5596bf7aedf9c8c227f13272ac499fe8eae6237bd326f2f07dfc173786f042", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a189d164685fd945809e862fe76a7420c4398fa288d76257662aecb909d6b3e5"},
-  "crux": {:hex, :crux, "0.1.3", "c698dee09d811678dcddad11a02a832c6bff100f1a7aee49ac44c87485bdbac8", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "04188ea9c1cee13e3ef132417200765857402dcc581f45a8a7862eec3b0530ff"},
-  "db_connection": {:hex, :db_connection, "2.10.1", "d5465f6bcc125c1b8981c1dbf23c193ca16f446ec0b25832dc174f74f18be510", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "18ed94c6e627b4bf452dbd4df61b69a35a1e768525140bc1917b7a685026a6a3"},
+  "crux": {:hex, :crux, "0.1.4", "1fa21f5ca886d3498f83871a3ef19379b80abf8cfcf2ed32007e80279e714f1e", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "ff7d880cf732d82360aa81e439b8d4831cd30768061c9233f90c97e10162b9c0"},
+  "db_connection": {:hex, :db_connection, "2.10.2", "ae391e803a5adff104da913c2fc1c0c14a37f8b10001dcef568796e1fb7bf95c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "510b14482330f1af6490a2fa0efd8d4f1435d1529b165647df22ac0f2df0fa93"},
   "decimal": {:hex, :decimal, "3.1.1", "430d87b04011ce6cbd4fd205be758311a81f87d552d40904abd00f015935b1d0", [:mix], [], "hexpm", "c5f25f2ced74a0587d03e6023f595db8e924c9d3922c8c8ffd9edfc4498cf1f6"},
   "dialyxir": {:hex, :dialyxir, "1.4.7", "dda948fcee52962e4b6c5b4b16b2d8fa7d50d8645bbae8b8685c3f9ecb7f5f4d", [:mix], [{:erlex, ">= 0.2.8", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "b34527202e6eb8cee198efec110996c25c5898f43a4094df157f8d28f27d9efe"},
   "dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"},
-  "ecto": {:hex, :ecto, "3.13.6", "352135b474f91d1ab99a1b502171d207e9db60421c9e3d0ecab4c7ab96b24d14", [:mix], [{:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8afa059bc16cd2c94739ec0a11e3e5df69d828125119109bef35f20a21a76af2"},
+  "ecto": {:hex, :ecto, "3.14.0", "2fa64521eebfcb2670d907a86e4ad947290e9933706bb315e6fb5c21b172cb26", [:mix], [{:decimal, "~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "130d69ffb4285f9ce4792b65dfbb994fd13ea4cbc3cbea2524b199aa3de84af3"},
   "ecto_commons": {:hex, :ecto_commons, "0.3.7", "f33c162a6f63695d5939af02c65a0e76aa6e7278b82c7bfc357ffbfea353bf0f", [:mix], [{:burnex, "~> 3.0", [hex: :burnex, repo: "hexpm", optional: true]}, {:ecto, "~> 3.4", [hex: :ecto, repo: "hexpm", optional: false]}, {:ex_phone_number, "~> 0.4", [hex: :ex_phone_number, repo: "hexpm", optional: false]}, {:luhn, "~> 0.3.0", [hex: :luhn, repo: "hexpm", optional: false]}], "hexpm", "9c33771ebd38cd83d3f90fab6069826ba9d4f7580f1481b3c0913f8b9795c5fd"},
-  "ecto_sql": {:hex, :ecto_sql, "3.13.5", "2f8282b2ad97bf0f0d3217ea0a6fff320ead9e2f8770f810141189d182dc304e", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aa36751f4e6a2b56ae79efb0e088042e010ff4935fc8684e74c23b1f49e25fdc"},
+  "ecto_sql": {:hex, :ecto_sql, "3.14.0", "06446ab8410d2f85bfbb80857ee224ab3b693700cbb38f6535d507449a627b2e", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.14.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.8", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f4d8d36faf294c9417b5a37ec7ac8217ee2abdef5fcf197ba690f361548d3949"},
   "elixir_make": {:hex, :elixir_make, "0.9.0", "6484b3cd8c0cee58f09f05ecaf1a140a8c97670671a6a0e7ab4dc326c3109726", [:mix], [], "hexpm", "db23d4fd8b757462ad02f8aa73431a426fe6671c80b200d9710caf3d1dd0ffdb"},
   "erlex": {:hex, :erlex, "0.2.9", "7debbbaa9f4f368b8cd648983e0f1d7963028508e9c59e9d4ed504e94ef52a55", [:mix], [], "hexpm", "8cfffc0ec7159e6d73de2ab28a588064de80f88b2798d5cbe4482cbbc200178b"},
   "esbuild": {:hex, :esbuild, "0.10.0", "b0aa3388a1c23e727c5a3e7427c932d89ee791746b0081bbe56103e9ef3d291f", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "468489cda427b974a7cc9f03ace55368a83e1a7be12fba7e30969af78e5f8c70"},
@@ -87,7 +87,7 @@
   "slugify": {:hex, :slugify, "1.3.1", "0d3b8b7e5c1eeaa960e44dce94382bee34a39b3ea239293e457a9c5b47cc6fd3", [:mix], [], "hexpm", "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"},
   "sobelow": {:hex, :sobelow, "0.14.1", "2f81e8632f15574cba2402bcddff5497b413c01e6f094bc0ab94e83c2f74db81", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8fac9a2bd90fdc4b15d6fca6e1608efb7f7c600fa75800813b794ee9364c87f2"},
   "sourceror": {:hex, :sourceror, "1.12.2", "85bfd48159f020c0cbfc72f289f11456fdc05dc43719b6f2589fb969faefa113", [:mix], [], "hexpm", "da37d3da09c5b890528802c7056a8f585a061973820d7656b6e3649c14f0e9cb"},
-  "spark": {:hex, :spark, "2.7.0", "e685b33c038f12851993880bb7e3b326117612eb746fe15828678c152f8321c6", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "e2f675fbda32375b01d9ee7c652671531027fd043bf4a91bafdb2ab716aa1122"},
+  "spark": {:hex, :spark, "2.7.2", "36becc6ff03b40908cc821d403d7f06d893498e293d2f718afc6ca097fcb9d93", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "adb323ddbf9dbbe326f9e5def54ac96c47911e852b2c270bb19a5147c56f1b45"},
   "spitfire": {:hex, :spitfire, "0.3.13", "edd207b065eaec57acc5484097d0aa3e97fe4246168c54e67a9af040b8dee4c1", [:mix], [], "hexpm", "3601be88ceed4967b584e96444de3e1d12d6555ae0864a7390b9cd5332d134b4"},
   "splode": {:hex, :splode, "0.3.1", "9843c54f84f71b7833fec3f0be06c3cfb5be6b35960ee195ea4fad84b1c25030", [:mix], [], "hexpm", "8f2309b6ec2ecbb01435656429ed1d9ed04ba28797a3280c3b0d1217018ecfbd"},
   "stream_data": {:hex, :stream_data, "1.3.0", "bde37905530aff386dea1ddd86ecbf00e6642dc074ceffc10b7d4e41dfd6aac9", [:mix], [], "hexpm", "3cc552e286e817dca43c98044c706eec9318083a1480c52ae2688b08e2936e3c"},

From 4b647c21e74c6fd65e4494b357be64941d42a8d2 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:14 +0200
Subject: [PATCH 19/30] feat(membership-fee): index fee cycles by member,
 status and end date

---
 lib/membership_fees/membership_fee_cycle.ex   |  10 +
 ...membership_fee_cycles_status_end_index.exs |  22 ++
 .../membership_fee_cycles/20260706191442.json | 206 ++++++++++++++++++
 3 files changed, 238 insertions(+)
 create mode 100644 priv/repo/migrations/20260706191440_add_membership_fee_cycles_status_end_index.exs
 create mode 100644 priv/resource_snapshots/repo/membership_fee_cycles/20260706191442.json

diff --git a/lib/membership_fees/membership_fee_cycle.ex b/lib/membership_fees/membership_fee_cycle.ex
index cb881938..d6842efe 100644
--- a/lib/membership_fees/membership_fee_cycle.ex
+++ b/lib/membership_fees/membership_fee_cycle.ex
@@ -36,6 +36,16 @@ defmodule Mv.MembershipFees.MembershipFeeCycle do
   postgres do
     table "membership_fee_cycles"
     repo Mv.Repo
+
+    custom_indexes do
+      # Serves the period-scoped unpaid-cycle count on the member overview:
+      # count of a member's cycles with status = :unpaid and cycle_end in the
+      # active period. The composite (member_id, status, cycle_end) lets the
+      # aggregate seek the per-member unpaid slice and range-scan cycle_end
+      # without touching paid/suspended rows.
+      index [:member_id, :status, :cycle_end],
+        name: "membership_fee_cycles_member_status_end_index"
+    end
   end
 
   resource do
diff --git a/priv/repo/migrations/20260706191440_add_membership_fee_cycles_status_end_index.exs b/priv/repo/migrations/20260706191440_add_membership_fee_cycles_status_end_index.exs
new file mode 100644
index 00000000..b3fb8a55
--- /dev/null
+++ b/priv/repo/migrations/20260706191440_add_membership_fee_cycles_status_end_index.exs
@@ -0,0 +1,22 @@
+defmodule Mv.Repo.Migrations.AddMembershipFeeCyclesStatusEndIndex do
+  @moduledoc """
+  Adds a composite index on membership_fee_cycles(member_id, status, cycle_end)
+  to serve the period-scoped unpaid-cycle count on the member overview.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`.
+  """
+
+  use Ecto.Migration
+
+  def up do
+    create index(:membership_fee_cycles, [:member_id, :status, :cycle_end],
+             name: "membership_fee_cycles_member_status_end_index"
+           )
+  end
+
+  def down do
+    drop_if_exists index(:membership_fee_cycles, [:member_id, :status, :cycle_end],
+                     name: "membership_fee_cycles_member_status_end_index"
+                   )
+  end
+end
diff --git a/priv/resource_snapshots/repo/membership_fee_cycles/20260706191442.json b/priv/resource_snapshots/repo/membership_fee_cycles/20260706191442.json
new file mode 100644
index 00000000..5d974b60
--- /dev/null
+++ b/priv/resource_snapshots/repo/membership_fee_cycles/20260706191442.json
@@ -0,0 +1,206 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"uuid_generate_v7()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "cycle_start",
+      "type": "date"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "cycle_end",
+      "type": "date"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": 2,
+      "size": null,
+      "source": "amount",
+      "type": "decimal"
+    },
+    {
+      "allow_nil?": false,
+      "default": "\"unpaid\"",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "status",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "notes",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "membership_fee_cycles_member_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "members"
+      },
+      "scale": null,
+      "size": null,
+      "source": "member_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "membership_fee_cycles_membership_fee_type_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "membership_fee_types"
+      },
+      "scale": null,
+      "size": null,
+      "source": "membership_fee_type_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "create_table_options": null,
+  "custom_indexes": [
+    {
+      "all_tenants?": false,
+      "concurrently": false,
+      "error_fields": [
+        "member_id",
+        "status",
+        "cycle_end"
+      ],
+      "fields": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        },
+        {
+          "type": "atom",
+          "value": "status"
+        },
+        {
+          "type": "atom",
+          "value": "cycle_end"
+        }
+      ],
+      "include": null,
+      "message": null,
+      "name": "membership_fee_cycles_member_status_end_index",
+      "nulls_distinct": true,
+      "prefix": null,
+      "table": null,
+      "unique": false,
+      "using": null,
+      "where": null
+    }
+  ],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "6CDBA37AC6000D63F3014D3EED08B613B32E8D908D598248747EFA093BC5246A",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "membership_fee_cycles_unique_cycle_per_member_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "member_id"
+        },
+        {
+          "type": "atom",
+          "value": "cycle_start"
+        }
+      ],
+      "name": "unique_cycle_per_member",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "membership_fee_cycles"
+}
\ No newline at end of file

From 95ef3177acd914ca6645285ad6eed3b61cf791f0 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:14 +0200
Subject: [PATCH 20/30] feat(member): add period-scoped unpaid-cycle
 payment-aging model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Counts each member's unpaid billing cycles that fall inside the selected
period. Cycle boundaries are member-relative — derived from each member's
fee-type interval — so "the current cycle" spans different calendar dates
per member.
---
 lib/membership/member.ex                      |  19 +++
 lib/mv/constants.ex                           |  38 +++++
 .../live/member_live/index/payment_aging.ex   | 131 ++++++++++++++++++
 priv/gettext/de/LC_MESSAGES/default.po        |   6 +
 priv/gettext/default.pot                      |   6 +
 .../index_payment_aging_property_test.exs     |  82 +++++++++++
 .../member_live/index_payment_aging_test.exs  |  79 +++++++++++
 .../member_live/index_payment_period_test.exs |  95 +++++++++++++
 8 files changed, 456 insertions(+)
 create mode 100644 lib/mv_web/live/member_live/index/payment_aging.ex
 create mode 100644 test/mv_web/member_live/index_payment_aging_property_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_aging_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_period_test.exs

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 9f7965bb..b0ff298f 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -717,6 +717,25 @@ defmodule Mv.Membership.Member do
       constraints one_of: [:unpaid, :paid, :suspended]
     end
 
+    calculate :unpaid_cycle_count,
+              :integer,
+              expr(
+                count(membership_fee_cycles,
+                  query: [
+                    filter:
+                      expr(
+                        status == :unpaid and
+                          (is_nil(^arg(:period_from)) or cycle_end >= ^arg(:period_from)) and
+                          (is_nil(^arg(:period_to)) or cycle_end <= ^arg(:period_to))
+                      )
+                  ]
+                )
+              ) do
+      description "Count of the member's unpaid cycles whose cycle_end is within the given period"
+      argument :period_from, :date, allow_nil?: true
+      argument :period_to, :date, allow_nil?: true
+    end
+
     calculate :overdue_count, :integer do
       description "Count of unpaid cycles that have already ended (cycle_end < today)"
       # Automatically load cycles with all attributes and membership_fee_type
diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex
index 657aa9b7..449d1868 100644
--- a/lib/mv/constants.ex
+++ b/lib/mv/constants.ex
@@ -38,6 +38,12 @@ defmodule Mv.Constants do
 
   @custom_date_filter_prefix "cdf_"
 
+  @payment_period_from_param "pay_from"
+
+  @payment_period_to_param "pay_to"
+
+  @payment_filter_param "pay_filter"
+
   @max_boolean_filters 50
 
   @max_mailto_bulk_recipients 50
@@ -162,6 +168,38 @@ defmodule Mv.Constants do
   """
   def custom_date_filter_prefix, do: @custom_date_filter_prefix
 
+  @doc """
+  Returns the URL parameter name for the payment-aging period lower bound
+  (ISO-8601 date; scopes both the payment column and the payment filter).
+
+  ## Examples
+
+      iex> Mv.Constants.payment_period_from_param()
+      "pay_from"
+  """
+  def payment_period_from_param, do: @payment_period_from_param
+
+  @doc """
+  Returns the URL parameter name for the payment-aging period upper bound.
+
+  ## Examples
+
+      iex> Mv.Constants.payment_period_to_param()
+      "pay_to"
+  """
+  def payment_period_to_param, do: @payment_period_to_param
+
+  @doc """
+  Returns the URL parameter name for the payment-count filter
+  (`fully_paid` | `unpaid_1` | `unpaid_2` | `unpaid_3`).
+
+  ## Examples
+
+      iex> Mv.Constants.payment_filter_param()
+      "pay_filter"
+  """
+  def payment_filter_param, do: @payment_filter_param
+
   @doc """
   Returns the maximum number of boolean custom field filters allowed per request.
 
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
new file mode 100644
index 00000000..18d3163b
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -0,0 +1,131 @@
+defmodule MvWeb.MemberLive.Index.PaymentAging do
+  @moduledoc """
+  Period-scoped payment aging for the member overview.
+
+  The overview presents payment as an accounts-receivable aging count: per
+  member, the number of that member's cycles with `status == :unpaid` whose
+  denormalized `cycle_end` falls inside an active period. The period is a view
+  dimension that scopes the column and the payment filter together; its default
+  is **all outstanding** (both bounds nil → all time). Suspended cycles are
+  excluded from the count but surfaced separately in the badge tooltip.
+
+  This module owns:
+
+    * the period value shape and its default,
+    * URL param encode/decode for the period,
+    * the badge descriptor derived from a count,
+    * the open-cycles list (unpaid + suspended, member-relative) that backs the
+      badge tooltip.
+
+  The count itself is computed DB-side by the `unpaid_cycle_count` calculation
+  on `Mv.Membership.Member`; `open_cycles/2` works over already-loaded cycles.
+  """
+
+  use Gettext, backend: MvWeb.Gettext
+
+  alias Mv.Constants
+  alias MvWeb.Helpers.MembershipFeeHelpers
+
+  @type period :: %{from: Date.t() | nil, to: Date.t() | nil}
+
+  @payment_period_from_param Constants.payment_period_from_param()
+  @payment_period_to_param Constants.payment_period_to_param()
+
+  @doc """
+  The default period: all outstanding cycles, all time (both bounds nil).
+  """
+  @spec default_period() :: period()
+  def default_period, do: %{from: nil, to: nil}
+
+  @doc """
+  Decodes URL params into a period. Absent or malformed ISO-8601 bounds fall
+  back to nil, so no params yields the all-outstanding default.
+  """
+  @spec parse_period(map()) :: period()
+  def parse_period(params) when is_map(params) do
+    %{
+      from: parse_date(Map.get(params, @payment_period_from_param)),
+      to: parse_date(Map.get(params, @payment_period_to_param))
+    }
+  end
+
+  @doc """
+  Encodes a period into URL params. A nil bound is omitted; the default period
+  encodes to the empty map (a fresh URL is the canonical default).
+  """
+  @spec to_params(period()) :: %{optional(String.t()) => String.t()}
+  def to_params(%{from: from, to: to}) do
+    %{}
+    |> maybe_put_date(@payment_period_from_param, from)
+    |> maybe_put_date(@payment_period_to_param, to)
+  end
+
+  def to_params(_), do: %{}
+
+  @doc """
+  Badge descriptor for an unpaid-cycle count. A count of 0 reads "Paid"
+  (success); a positive count reads "N unpaid" (error).
+  """
+  @spec badge(non_neg_integer()) :: %{
+          variant: atom(),
+          label: String.t(),
+          count: non_neg_integer()
+        }
+  def badge(0), do: %{variant: :success, label: gettext("Paid"), count: 0}
+
+  def badge(count) when is_integer(count) and count > 0 do
+    %{
+      variant: MembershipFeeHelpers.status_variant(:unpaid),
+      label: gettext("%{count} unpaid", count: count),
+      count: count
+    }
+  end
+
+  @doc """
+  Splits a member's loaded cycles into the open (unpaid) and suspended cycles
+  whose `cycle_end` falls inside `period`, both sorted by `cycle_end`. Paid
+  cycles and cycles outside the period are dropped. Used to render the badge
+  tooltip. Expects `membership_fee_cycles` to be loaded on the member.
+  """
+  @spec open_cycles(map(), period()) :: %{unpaid: [map()], suspended: [map()]}
+  def open_cycles(member, %{from: from, to: to}) do
+    cycles = in_period_cycles(member, from, to)
+
+    %{
+      unpaid: cycles |> Enum.filter(&(&1.status == :unpaid)) |> sort_by_end(),
+      suspended: cycles |> Enum.filter(&(&1.status == :suspended)) |> sort_by_end()
+    }
+  end
+
+  defp in_period_cycles(member, from, to) do
+    case Map.get(member, :membership_fee_cycles) do
+      cycles when is_list(cycles) -> Enum.filter(cycles, &in_period?(&1.cycle_end, from, to))
+      _ -> []
+    end
+  end
+
+  defp in_period?(%Date{} = cycle_end, from, to) do
+    (is_nil(from) or Date.compare(cycle_end, from) != :lt) and
+      (is_nil(to) or Date.compare(cycle_end, to) != :gt)
+  end
+
+  defp in_period?(_, _, _), do: false
+
+  defp sort_by_end(cycles), do: Enum.sort_by(cycles, & &1.cycle_end, Date)
+
+  defp maybe_put_date(params, _key, nil), do: params
+
+  defp maybe_put_date(params, key, %Date{} = date),
+    do: Map.put(params, key, Date.to_iso8601(date))
+
+  defp parse_date(nil), do: nil
+
+  defp parse_date(value) when is_binary(value) do
+    case Date.from_iso8601(String.trim(value)) do
+      {:ok, date} -> date
+      _ -> nil
+    end
+  end
+
+  defp parse_date(_), do: nil
+end
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index db07d05f..cc8dae08 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -2696,6 +2696,7 @@ msgstr "Optionen"
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -4213,3 +4214,8 @@ msgstr "Klicke, um nach Nachname zu sortieren"
 #, elixir-autogen, elixir-format
 msgid "No address"
 msgstr "Keine Adresse"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} unpaid"
+msgstr "%{count} unbezahlt"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index c3b21727..34772344 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -2697,6 +2697,7 @@ msgstr ""
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -4213,3 +4214,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "No address"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} unpaid"
+msgstr ""
diff --git a/test/mv_web/member_live/index_payment_aging_property_test.exs b/test/mv_web/member_live/index_payment_aging_property_test.exs
new file mode 100644
index 00000000..ae6d7223
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_aging_property_test.exs
@@ -0,0 +1,82 @@
+defmodule MvWeb.MemberLive.IndexPaymentAgingPropertyTest do
+  @moduledoc """
+  §2.5 — Unpaid-cycle count correctness (period-scoped, member-relative).
+
+  For arbitrary per-member cycle sets (status × cycle_end) and arbitrary active
+  periods, the `unpaid_cycle_count` calculation equals the set-theoretic
+  definition `|{c : c.status == :unpaid and c.cycle_end ∈ period}|` — paid and
+  suspended cycles excluded, nil period bounds unbounded.
+  """
+  use Mv.DataCase, async: false
+  use ExUnitProperties
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias Mv.MembershipFees.MembershipFeeCycle
+
+  require Ash.Query
+
+  # Distinct monthly cycle_starts so cycles never collide on the
+  # (member_id, cycle_start) identity; monthly keeps each cycle_end inside a
+  # single month for legible in/out-of-period placement.
+  @starts for y <- 2022..2026, m <- [1, 4, 7, 10], do: Date.new!(y, m, 1)
+  @bounds [nil, ~D[2023-01-01], ~D[2024-06-30], ~D[2025-12-31]]
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    fee_type = create_fee_type(%{interval: :monthly}, actor)
+    %{actor: actor, fee_type: fee_type}
+  end
+
+  defp cycle_gen do
+    StreamData.tuple(
+      {StreamData.member_of(@starts), StreamData.member_of([:unpaid, :paid, :suspended])}
+    )
+  end
+
+  defp in_period?(cycle_end, from, to) do
+    (is_nil(from) or Date.compare(cycle_end, from) != :lt) and
+      (is_nil(to) or Date.compare(cycle_end, to) != :gt)
+  end
+
+  property "unpaid_cycle_count equals the set-theoretic definition", %{
+    actor: actor,
+    fee_type: ft
+  } do
+    check all(
+            cycles <- StreamData.list_of(cycle_gen(), max_length: 6),
+            from <- StreamData.member_of(@bounds),
+            to <- StreamData.member_of(@bounds),
+            max_runs: 40
+          ) do
+      member = member_fixture_with_actor(%{}, actor)
+
+      cycles
+      |> Enum.uniq_by(fn {start, _status} -> start end)
+      |> Enum.each(fn {start, status} ->
+        create_cycle(member, ft, %{cycle_start: start, status: status}, actor)
+      end)
+
+      stored =
+        MembershipFeeCycle
+        |> Ash.Query.filter(member_id == ^member.id)
+        |> Ash.read!(actor: actor)
+
+      expected =
+        Enum.count(stored, fn c ->
+          c.status == :unpaid and in_period?(c.cycle_end, from, to)
+        end)
+
+      actual =
+        member
+        |> Ash.load!([unpaid_cycle_count: %{period_from: from, period_to: to}], actor: actor)
+        |> Map.fetch!(:unpaid_cycle_count)
+
+      assert actual == expected
+
+      # Clean up so populations do not accumulate across runs.
+      Enum.each(stored, &Ash.destroy!(&1, actor: actor))
+      Ash.destroy!(member, actor: actor)
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_aging_test.exs b/test/mv_web/member_live/index_payment_aging_test.exs
new file mode 100644
index 00000000..f80d1a42
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_aging_test.exs
@@ -0,0 +1,79 @@
+defmodule MvWeb.MemberLive.IndexPaymentAgingTest do
+  @moduledoc """
+  §1.13 / §3.3 — the period-scoped `unpaid_cycle_count` calculation on Member.
+
+  Counts a member's cycles with `status == :unpaid` whose denormalized
+  `cycle_end` falls inside the active period; paid and suspended cycles are
+  never counted. A nil period bound means "unbounded on that side" (the
+  all-outstanding default counts every unpaid cycle).
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias Mv.Membership.Member
+
+  require Ash.Query
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    # Monthly so several cycles can share one period without cycle_start collisions.
+    fee_type = create_fee_type(%{interval: :monthly}, actor)
+    %{actor: actor, fee_type: fee_type}
+  end
+
+  defp count(member, from, to, actor) do
+    member
+    |> Ash.load!([unpaid_cycle_count: %{period_from: from, period_to: to}], actor: actor)
+    |> Map.fetch!(:unpaid_cycle_count)
+  end
+
+  test "counts only unpaid cycles with cycle_end in the period; suspended and paid excluded",
+       %{actor: actor, fee_type: ft} do
+    # No membership_fee_type_id on the member itself → no auto-generated cycles.
+    member = member_fixture_with_actor(%{}, actor)
+
+    # In-period unpaid (counted)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-02-01], status: :unpaid}, actor)
+    # In-period but not unpaid (excluded)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-03-01], status: :paid}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-04-01], status: :suspended}, actor)
+    # Unpaid but out of period (excluded)
+    create_cycle(member, ft, %{cycle_start: ~D[2023-01-01], status: :unpaid}, actor)
+
+    assert count(member, ~D[2024-01-01], ~D[2024-12-31], actor) == 2
+
+    # Fully-paid member (only paid/suspended in period) → 0
+    paid_member = member_fixture_with_actor(%{}, actor)
+    create_cycle(paid_member, ft, %{cycle_start: ~D[2024-01-01], status: :paid}, actor)
+    create_cycle(paid_member, ft, %{cycle_start: ~D[2024-02-01], status: :suspended}, actor)
+    assert count(paid_member, ~D[2024-01-01], ~D[2024-12-31], actor) == 0
+  end
+
+  test "nil period bounds count every unpaid cycle (all-outstanding default)",
+       %{actor: actor, fee_type: ft} do
+    member = member_fixture_with_actor(%{}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2020-01-01], status: :unpaid}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-06-01], status: :unpaid}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2026-01-01], status: :unpaid}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2025-01-01], status: :paid}, actor)
+
+    assert count(member, nil, nil, actor) == 3
+  end
+
+  test "loads for a whole read query (DB-pushable aggregate)", %{actor: actor, fee_type: ft} do
+    member = member_fixture_with_actor(%{}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
+
+    [loaded] =
+      Member
+      |> Ash.Query.filter(id == ^member.id)
+      |> Ash.Query.load(
+        unpaid_cycle_count: %{period_from: ~D[2024-01-01], period_to: ~D[2024-12-31]}
+      )
+      |> Ash.read!(actor: actor)
+
+    assert loaded.unpaid_cycle_count == 1
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
new file mode 100644
index 00000000..7b56240e
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -0,0 +1,95 @@
+defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
+  @moduledoc """
+  §1.13 / §1.14 / §3.3 — the PaymentAging module: period parse/serialize with
+  the all-outstanding default, badge formatting, and the open-cycles list that
+  backs the badge tooltip (unpaid cycles for the period; suspended shown apart).
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias MvWeb.MemberLive.Index.PaymentAging
+
+  require Ash.Query
+
+  describe "period parsing / serialization" do
+    test "default period is all-outstanding (both bounds nil)" do
+      assert PaymentAging.default_period() == %{from: nil, to: nil}
+    end
+
+    test "no params parses to the default period" do
+      assert PaymentAging.parse_period(%{}) == %{from: nil, to: nil}
+    end
+
+    test "parses ISO bounds and round-trips through to_params" do
+      period = %{from: ~D[2024-01-01], to: ~D[2024-12-31]}
+      params = PaymentAging.to_params(period)
+
+      assert params["pay_from"] == "2024-01-01"
+      assert params["pay_to"] == "2024-12-31"
+      assert PaymentAging.parse_period(params) == period
+    end
+
+    test "default period serializes to no params" do
+      assert PaymentAging.to_params(PaymentAging.default_period()) == %{}
+    end
+
+    test "malformed bounds fall back to nil" do
+      assert PaymentAging.parse_period(%{"pay_from" => "not-a-date"}) == %{from: nil, to: nil}
+    end
+  end
+
+  describe "badge/1" do
+    test "0 renders as Paid (success)" do
+      badge = PaymentAging.badge(0)
+      assert badge.variant == :success
+      assert badge.label == "Paid"
+    end
+
+    test "N > 0 renders as N unpaid (error)" do
+      badge = PaymentAging.badge(2)
+      assert badge.variant == :error
+      assert badge.label =~ "2"
+      assert badge.label =~ "unpaid"
+    end
+  end
+
+  describe "open_cycles/2" do
+    setup do
+      actor = Mv.Helpers.SystemActor.get_system_actor()
+      ft = create_fee_type(%{interval: :monthly}, actor)
+      %{actor: actor, ft: ft}
+    end
+
+    test "lists in-period unpaid cycles and flags suspended separately; paid excluded",
+         %{actor: actor, ft: ft} do
+      member = member_fixture_with_actor(%{}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2024-02-01], status: :unpaid}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2024-03-01], status: :suspended}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2024-04-01], status: :paid}, actor)
+      # out of period
+      create_cycle(member, ft, %{cycle_start: ~D[2023-01-01], status: :unpaid}, actor)
+
+      member = Ash.load!(member, :membership_fee_cycles, actor: actor)
+      result = PaymentAging.open_cycles(member, %{from: ~D[2024-01-01], to: ~D[2024-12-31]})
+
+      assert length(result.unpaid) == 2
+      assert length(result.suspended) == 1
+      assert Enum.all?(result.unpaid, &(&1.status == :unpaid))
+      assert Enum.all?(result.suspended, &(&1.status == :suspended))
+    end
+
+    test "nil bounds include every unpaid/suspended cycle", %{actor: actor, ft: ft} do
+      member = member_fixture_with_actor(%{}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2020-01-01], status: :unpaid}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2026-01-01], status: :suspended}, actor)
+
+      member = Ash.load!(member, :membership_fee_cycles, actor: actor)
+      result = PaymentAging.open_cycles(member, PaymentAging.default_period())
+
+      assert length(result.unpaid) == 1
+      assert length(result.suspended) == 1
+    end
+  end
+end

From 7d1a71b1fd043b07c46e1457f6df9b7c238183d6 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:15 +0200
Subject: [PATCH 21/30] feat(overview): add period-scoped payment filter and
 field-picker descriptor

---
 .../live/member_live/index/date_filter.ex     |  39 +++++
 .../member_live/index/filter_descriptor.ex    | 140 ++++++++++++++++++
 .../live/member_live/index/overview_query.ex  |  35 +++++
 .../live/member_live/index/payment_aging.ex   |  36 +++++
 priv/gettext/de/LC_MESSAGES/default.po        |  18 +++
 priv/gettext/default.pot                      |  18 +++
 priv/gettext/en/LC_MESSAGES/default.po        |  24 +++
 .../member_live/date_filter_property_test.exs |  68 +++++++++
 .../member_live/index_active_former_test.exs  |  64 ++++++++
 .../member_live/index_field_picker_test.exs   |  82 ++++++++++
 .../member_live/index_payment_filter_test.exs |  77 ++++++++++
 .../member_live/index_payment_period_test.exs |  53 +++++++
 12 files changed, 654 insertions(+)
 create mode 100644 lib/mv_web/live/member_live/index/filter_descriptor.ex
 create mode 100644 test/mv_web/member_live/index_active_former_test.exs
 create mode 100644 test/mv_web/member_live/index_field_picker_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_filter_test.exs

diff --git a/lib/mv_web/live/member_live/index/date_filter.ex b/lib/mv_web/live/member_live/index/date_filter.ex
index b24c2f49..a26abae2 100644
--- a/lib/mv_web/live/member_live/index/date_filter.ex
+++ b/lib/mv_web/live/member_live/index/date_filter.ex
@@ -67,6 +67,45 @@ defmodule MvWeb.MemberLive.Index.DateFilter do
     }
   end
 
+  @typedoc """
+  The three-state active/former quick filter. It is not a stored field but a
+  view onto `exit_date.mode`: `:active` ↔ `:active_only`, `:former` ↔
+  `:inactive_only`, `:all` ↔ `:all`. A detailed `:custom` exit-date selection
+  has no quick equivalent and surfaces as `:custom` (no quick chip selected).
+  """
+  @type quick_state :: :active | :former | :all | :custom
+
+  @quick_to_mode %{active: :active_only, former: :inactive_only, all: :all}
+
+  @doc """
+  Derives the active/former quick-filter state from the single `exit_date`
+  source. Total function; an absent or malformed `exit_date` reads as the
+  default `:active`. This is the only reader — there is no second state to keep
+  in sync (§2.4).
+  """
+  @spec quick_state(map()) :: quick_state()
+  def quick_state(filters) when is_map(filters) do
+    case Map.get(filters, :exit_date, %{}) do
+      %{mode: :active_only} -> :active
+      %{mode: :inactive_only} -> :former
+      %{mode: :all} -> :all
+      %{mode: :custom} -> :custom
+      _ -> :active
+    end
+  end
+
+  @doc """
+  Applies an active/former quick-filter choice onto the date filter state by
+  writing the corresponding `exit_date` mode and clearing its bounds. Only the
+  `exit_date` slice is touched; `join_date` and custom-date entries are left
+  intact, so the quick filter and the detailed control share one source.
+  """
+  @spec set_quick_state(map(), :active | :former | :all) :: map()
+  def set_quick_state(filters, state)
+      when is_map(filters) and state in [:active, :former, :all] do
+    Map.put(filters, :exit_date, %{mode: Map.fetch!(@quick_to_mode, state), from: nil, to: nil})
+  end
+
   @doc """
   Decodes URL params into a date filter state map.
 
diff --git a/lib/mv_web/live/member_live/index/filter_descriptor.ex b/lib/mv_web/live/member_live/index/filter_descriptor.ex
new file mode 100644
index 00000000..96ecd801
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/filter_descriptor.ex
@@ -0,0 +1,140 @@
+defmodule MvWeb.MemberLive.Index.FilterDescriptor do
+  @moduledoc """
+  Data-driven catalog of the filter fields offered by the member-overview
+  add-filter builder.
+
+  Each descriptor is a plain, serializable map describing one pickable field:
+
+      %{
+        key: atom() | String.t(),   # stable identifier (custom fields use their UUID string)
+        group: :quick | :membership | :custom_fields,
+        label: String.t(),          # human-readable, gettext-translated
+        control: atom()             # which type-aware value control the builder renders
+      }
+
+  The catalog is the persistence basis the saved-views work (#549) docks onto:
+  it is derived purely from the field context (groups, fee types, custom fields)
+  and carries no UI or query state.
+
+  Grouping (confirmed taxonomy):
+
+    * `:quick` — Payment, Active/former (common shortcuts)
+    * `:membership` — Group, Fee type, Join date, Exit date
+    * `:custom_fields` — one entry per filterable club-defined custom field
+      (boolean and date fields; other value types are not filtered on the
+      overview)
+
+  A group with no descriptors is omitted entirely (no header) — see
+  `visible_groups/1`.
+  """
+
+  use Gettext, backend: MvWeb.Gettext
+
+  @type group :: :quick | :membership | :custom_fields
+
+  @type t :: %{
+          key: atom() | String.t(),
+          group: group(),
+          label: String.t(),
+          control: atom()
+        }
+
+  # Fixed display order of the groups in the picker.
+  @group_order [:quick, :membership, :custom_fields]
+
+  # Custom-field value types the overview can filter on.
+  @filterable_custom_field_types [:boolean, :date]
+
+  @doc """
+  Returns the ordered list of all descriptors available for the given field
+  context. Recognised context keys (all optional, default empty):
+
+    * `:groups` — list of `%{id: _, name: _}` group structs
+    * `:fee_types` — list of fee-type structs
+    * `:custom_fields` — list of custom-field structs (`:value_type`, `:name`, `:id`)
+  """
+  @spec all(map()) :: [t()]
+  def all(context) when is_map(context) do
+    quick() ++
+      membership(Map.get(context, :groups, []), Map.get(context, :fee_types, [])) ++
+      custom_fields(Map.get(context, :custom_fields, []))
+  end
+
+  @doc "The group an individual descriptor belongs to."
+  @spec group_for(t()) :: group()
+  def group_for(%{group: group}), do: group
+
+  @doc "The fixed display order of the picker groups."
+  @spec group_order() :: [group()]
+  def group_order, do: @group_order
+
+  @doc """
+  Returns `[{group, [descriptor]}]` in display order, including only groups that
+  have at least one descriptor. Groups with no available fields are omitted so
+  the picker renders no empty header (§1.10).
+  """
+  @spec visible_groups([t()]) :: [{group(), [t()]}]
+  def visible_groups(descriptors) when is_list(descriptors) do
+    grouped = Enum.group_by(descriptors, & &1.group)
+
+    @group_order
+    |> Enum.map(fn group -> {group, Map.get(grouped, group, [])} end)
+    |> Enum.reject(fn {_group, ds} -> ds == [] end)
+  end
+
+  # --- static groups --------------------------------------------------------
+
+  defp quick do
+    [
+      %{key: :payment, group: :quick, label: gettext("Payment"), control: :payment_count},
+      %{
+        key: :active_former,
+        group: :quick,
+        label: gettext("Active / former"),
+        control: :active_former
+      }
+    ]
+  end
+
+  defp membership(groups, fee_types) do
+    maybe_group(groups) ++
+      maybe_fee_type(fee_types) ++
+      [
+        %{key: :join_date, group: :membership, label: gettext("Join date"), control: :date_range},
+        %{key: :exit_date, group: :membership, label: gettext("Exit date"), control: :exit_date}
+      ]
+  end
+
+  defp maybe_group([]), do: []
+
+  defp maybe_group(_groups),
+    do: [%{key: :group, group: :membership, label: gettext("Group"), control: :group_membership}]
+
+  defp maybe_fee_type([]), do: []
+
+  defp maybe_fee_type(_fee_types),
+    do: [
+      %{
+        key: :fee_type,
+        group: :membership,
+        label: gettext("Fee type"),
+        control: :fee_type_membership
+      }
+    ]
+
+  defp custom_fields(custom_fields) do
+    custom_fields
+    |> Enum.filter(&(Map.get(&1, :value_type) in @filterable_custom_field_types))
+    |> Enum.map(fn cf ->
+      %{
+        key: to_string(cf.id),
+        group: :custom_fields,
+        label: cf.name,
+        control: control_for_custom_field(cf.value_type)
+      }
+    end)
+  end
+
+  defp control_for_custom_field(:boolean), do: :boolean
+  defp control_for_custom_field(:date), do: :date_range
+end
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index ac3051f0..1afe499b 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -52,6 +52,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
       opts[:show_current_cycle],
       today(opts)
     )
+    |> apply_payment_filter(opts[:payment_filter], payment_period(opts))
     |> apply_sort(opts[:sort_field], opts[:sort_order], opts[:custom_fields] || [])
   end
 
@@ -232,6 +233,40 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     )
   end
 
+  # ---------------------------------------------------------------------------
+  # Payment aging filter (period-scoped unpaid-cycle count)
+  #
+  # `fully_paid` keeps members with zero unpaid cycles whose cycle_end lies in
+  # the active period; `{:has_unpaid, n}` keeps members with at least n such
+  # cycles. Both push to SQL via the `unpaid_cycle_count` calculation (a
+  # correlated aggregate over `membership_fee_cycles`), so no member set is
+  # loaded into memory. Suspended/paid cycles are excluded by the calculation.
+  # ---------------------------------------------------------------------------
+
+  defp payment_period(opts) do
+    case opts[:payment_period] do
+      %{from: _, to: _} = period -> period
+      _ -> %{from: nil, to: nil}
+    end
+  end
+
+  defp apply_payment_filter(query, :fully_paid, %{from: from, to: to}) do
+    Ash.Query.filter(
+      query,
+      expr(unpaid_cycle_count(period_from: ^from, period_to: ^to) == 0)
+    )
+  end
+
+  defp apply_payment_filter(query, {:has_unpaid, n}, %{from: from, to: to})
+       when is_integer(n) and n > 0 do
+    Ash.Query.filter(
+      query,
+      expr(unpaid_cycle_count(period_from: ^from, period_to: ^to) >= ^n)
+    )
+  end
+
+  defp apply_payment_filter(query, _filter, _period), do: query
+
   # ---------------------------------------------------------------------------
   # Built-in date filters (join/exit)
   # ---------------------------------------------------------------------------
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index 18d3163b..9dbe3e0c 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -28,8 +28,11 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   @type period :: %{from: Date.t() | nil, to: Date.t() | nil}
 
+  @type filter :: nil | :fully_paid | {:has_unpaid, 1..3}
+
   @payment_period_from_param Constants.payment_period_from_param()
   @payment_period_to_param Constants.payment_period_to_param()
+  @payment_filter_param Constants.payment_filter_param()
 
   @doc """
   The default period: all outstanding cycles, all time (both bounds nil).
@@ -62,6 +65,39 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   def to_params(_), do: %{}
 
+  @doc """
+  Decodes the payment-count filter param.
+
+    * `"fully_paid"` → `:fully_paid` (exactly 0 unpaid cycles in the period)
+    * `"unpaid_1"` / `"unpaid_2"` / `"unpaid_3"` → `{:has_unpaid, N}`
+      (at least N unpaid cycles in the period)
+    * anything else → `nil` (no payment-count filter)
+  """
+  @spec parse_filter(term()) :: filter()
+  def parse_filter("fully_paid"), do: :fully_paid
+  def parse_filter("unpaid_1"), do: {:has_unpaid, 1}
+  def parse_filter("unpaid_2"), do: {:has_unpaid, 2}
+  def parse_filter("unpaid_3"), do: {:has_unpaid, 3}
+  def parse_filter(_), do: nil
+
+  @doc """
+  Encodes a payment-count filter into URL params. `nil` yields the empty map.
+  """
+  @spec filter_to_params(filter()) :: %{optional(String.t()) => String.t()}
+  def filter_to_params(:fully_paid), do: %{@payment_filter_param => "fully_paid"}
+
+  def filter_to_params({:has_unpaid, n}) when n in 1..3,
+    do: %{@payment_filter_param => "unpaid_#{n}"}
+
+  def filter_to_params(_), do: %{}
+
+  @doc """
+  Decodes the payment-count filter from a full params map.
+  """
+  @spec parse_filter_params(map()) :: filter()
+  def parse_filter_params(params) when is_map(params),
+    do: parse_filter(Map.get(params, @payment_filter_param))
+
   @doc """
   Badge descriptor for an unpaid-cycle count. A count of 0 reads "Paid"
   (success); a positive count reads "N unpaid" (error).
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index cc8dae08..8749a6a5 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -1297,6 +1297,7 @@ msgid "Exit Date"
 msgstr "Austrittsdatum"
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Exit date"
@@ -1470,6 +1471,7 @@ msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitrag
 msgstr "Beitragsstatus-Spalten (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) werden immer ignoriert und können nicht importiert werden."
 
 #: lib/mv_web/live/import_live/components.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee type"
@@ -1906,6 +1908,7 @@ msgid "Join confirmation"
 msgstr "Beitrittsbestätigung"
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Join date"
 msgstr "Beitrittsdatum"
@@ -4219,3 +4222,18 @@ msgstr "Keine Adresse"
 #, elixir-autogen, elixir-format
 msgid "%{count} unpaid"
 msgstr "%{count} unbezahlt"
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format
+msgid "Active / former"
+msgstr "Aktiv / ehemalig"
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Group"
+msgstr "Gruppen"
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Payment"
+msgstr "Zahlungen"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 34772344..2e1df9f5 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -1298,6 +1298,7 @@ msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Exit date"
@@ -1471,6 +1472,7 @@ msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitrag
 msgstr ""
 
 #: lib/mv_web/live/import_live/components.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee type"
@@ -1907,6 +1909,7 @@ msgid "Join confirmation"
 msgstr ""
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Join date"
 msgstr ""
@@ -4219,3 +4222,18 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "%{count} unpaid"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format
+msgid "Active / former"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format
+msgid "Group"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format
+msgid "Payment"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index fe871774..faec9b03 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -1298,6 +1298,7 @@ msgid "Exit Date"
 msgstr ""
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Exit date"
@@ -1471,6 +1472,7 @@ msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitrag
 msgstr ""
 
 #: lib/mv_web/live/import_live/components.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Fee type"
@@ -1907,6 +1909,7 @@ msgid "Join confirmation"
 msgstr ""
 
 #: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Join date"
 msgstr ""
@@ -2697,6 +2700,7 @@ msgstr ""
 #: lib/mv/membership/members_pdf.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -4213,3 +4217,23 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "No address"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{count} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format
+msgid "Active / former"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Group"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/filter_descriptor.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Payment"
+msgstr ""
diff --git a/test/mv_web/live/member_live/date_filter_property_test.exs b/test/mv_web/live/member_live/date_filter_property_test.exs
index 8844f911..7160262f 100644
--- a/test/mv_web/live/member_live/date_filter_property_test.exs
+++ b/test/mv_web/live/member_live/date_filter_property_test.exs
@@ -113,6 +113,74 @@ defmodule MvWeb.MemberLive.Index.DateFilterPropertyTest do
     end
   end
 
+  # §2.4 — single-source exit-date state (quick ↔ detail) ----------------
+  #
+  # The active/former quick filter is a shortcut onto the very same
+  # `exit_date` state the detailed control writes: there is no separate
+  # quick-filter field. This property drives interleaved sequences of quick
+  # and detailed changes and asserts that `quick_state/1` is always a pure
+  # function of the single `exit_date` source — i.e. the two views can never
+  # diverge.
+
+  defp quick_choice_gen, do: member_of([:active, :former, :all])
+
+  defp command_gen do
+    one_of([
+      gen(all(s <- quick_choice_gen()), do: {:quick, s}),
+      gen all(
+            mode <- exit_date_mode_gen(),
+            from <- optional_date_gen(),
+            to <- optional_date_gen()
+          ) do
+        {:detail, %{mode: mode, from: from, to: to}}
+      end
+    ])
+  end
+
+  defp apply_command(filters, {:quick, s}), do: DateFilter.set_quick_state(filters, s)
+  defp apply_command(filters, {:detail, exit_date}), do: Map.put(filters, :exit_date, exit_date)
+
+  defp expected_quick_for(:active_only), do: :active
+  defp expected_quick_for(:inactive_only), do: :former
+  defp expected_quick_for(:all), do: :all
+  defp expected_quick_for(:custom), do: :custom
+
+  property "quick filter is a single-source shortcut onto exit_date, never divergent" do
+    check all(commands <- list_of(command_gen(), max_length: 12)) do
+      final =
+        Enum.reduce(commands, DateFilter.default(), fn command, filters ->
+          next = apply_command(filters, command)
+
+          # Invariant at every step: quick_state is derived solely from the
+          # exit_date mode — one consistent value, no second source.
+          assert DateFilter.quick_state(next) == expected_quick_for(next.exit_date.mode)
+
+          # A quick command resolves to exactly the chosen state and clears bounds.
+          case command do
+            {:quick, s} ->
+              assert DateFilter.quick_state(next) == s
+              assert next.exit_date.from == nil
+              assert next.exit_date.to == nil
+
+            _ ->
+              :ok
+          end
+
+          next
+        end)
+
+      # join_date is untouched by any exit_date command (no cross-contamination).
+      assert final.join_date == DateFilter.default().join_date
+    end
+  end
+
+  property "set_quick_state ∘ quick_state round-trips for the three quick states" do
+    check all(s <- quick_choice_gen(), exit_date <- exit_date_state_gen()) do
+      filters = Map.put(DateFilter.default(), :exit_date, exit_date)
+      assert filters |> DateFilter.set_quick_state(s) |> DateFilter.quick_state() == s
+    end
+  end
+
   property "encoding then decoding built-in date filter state is identity" do
     check all(
             join_date <- join_date_state_gen(),
diff --git a/test/mv_web/member_live/index_active_former_test.exs b/test/mv_web/member_live/index_active_former_test.exs
new file mode 100644
index 00000000..55093117
--- /dev/null
+++ b/test/mv_web/member_live/index_active_former_test.exs
@@ -0,0 +1,64 @@
+defmodule MvWeb.MemberLive.IndexActiveFormerTest do
+  @moduledoc """
+  §1.7 — the active/former quick filter is a three-state shortcut onto the
+  shared `exit_date` state:
+
+    * "Former" → members with a past exit date (`ed_mode=inactive_only`)
+    * "Active" → members with no or a future exit date (default / `active_only`)
+    * "All"    → every member (`ed_mode=all`)
+
+  These assert the *result semantics* through the live overview and its URL
+  contract, which the quick-filter UI drives; they are independent of the
+  particular chip control and survive the builder rework.
+  """
+  use MvWeb.ConnCase, async: false
+  import Phoenix.LiveViewTest
+
+  alias Mv.Fixtures
+
+  setup %{conn: conn} do
+    conn = conn_with_oidc_user(conn)
+
+    active = Fixtures.member_fixture(%{first_name: "Ava", last_name: "Active", exit_date: nil})
+
+    future =
+      Fixtures.member_fixture(%{
+        first_name: "Finn",
+        last_name: "Future",
+        exit_date: Date.add(Date.utc_today(), 30)
+      })
+
+    former =
+      Fixtures.member_fixture(%{
+        first_name: " Former",
+        last_name: "Past",
+        exit_date: Date.add(Date.utc_today(), -30)
+      })
+
+    %{conn: conn, active: active, future: future, former: former}
+  end
+
+  test "Former shows only members with a past exit date", ctx do
+    {:ok, view, _html} = live(ctx.conn, "/members?ed_mode=inactive_only")
+
+    assert has_element?(view, "#row-#{ctx.former.id}")
+    refute has_element?(view, "#row-#{ctx.active.id}")
+    refute has_element?(view, "#row-#{ctx.future.id}")
+  end
+
+  test "Active shows members with no or a future exit date", ctx do
+    {:ok, view, _html} = live(ctx.conn, "/members")
+
+    assert has_element?(view, "#row-#{ctx.active.id}")
+    assert has_element?(view, "#row-#{ctx.future.id}")
+    refute has_element?(view, "#row-#{ctx.former.id}")
+  end
+
+  test "All shows every member regardless of exit date", ctx do
+    {:ok, view, _html} = live(ctx.conn, "/members?ed_mode=all")
+
+    assert has_element?(view, "#row-#{ctx.active.id}")
+    assert has_element?(view, "#row-#{ctx.future.id}")
+    assert has_element?(view, "#row-#{ctx.former.id}")
+  end
+end
diff --git a/test/mv_web/member_live/index_field_picker_test.exs b/test/mv_web/member_live/index_field_picker_test.exs
new file mode 100644
index 00000000..6f208d8c
--- /dev/null
+++ b/test/mv_web/member_live/index_field_picker_test.exs
@@ -0,0 +1,82 @@
+defmodule MvWeb.MemberLive.IndexFieldPickerTest do
+  @moduledoc """
+  §1.10 / §3.5 — the FilterDescriptor catalog behind the field picker.
+
+  Fields are grouped Quick / Membership / Custom fields; a group with no
+  available fields is omitted (renders no header). The catalog is derived
+  purely from the field context and is serializable (the persistence basis for
+  saved views, #549).
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.FilterDescriptor
+
+  defp group_keys(descriptors, group) do
+    descriptors
+    |> Enum.filter(&(&1.group == group))
+    |> Enum.map(& &1.key)
+  end
+
+  test "groups are ordered Quick / Membership / Custom fields" do
+    context = %{
+      groups: [%{id: Ecto.UUID.generate(), name: "Board"}],
+      fee_types: [%{id: Ecto.UUID.generate(), name: "Standard"}],
+      custom_fields: [%{id: Ecto.UUID.generate(), name: "Newsletter", value_type: :boolean}]
+    }
+
+    descriptors = FilterDescriptor.all(context)
+
+    assert Enum.map(FilterDescriptor.visible_groups(descriptors), &elem(&1, 0)) ==
+             [:quick, :membership, :custom_fields]
+  end
+
+  test "quick and membership fields are present with type-aware controls" do
+    descriptors = FilterDescriptor.all(%{groups: [%{id: Ecto.UUID.generate(), name: "G"}]})
+
+    assert group_keys(descriptors, :quick) == [:payment, :active_former]
+    assert :group in group_keys(descriptors, :membership)
+    assert :join_date in group_keys(descriptors, :membership)
+    assert :exit_date in group_keys(descriptors, :membership)
+
+    payment = Enum.find(descriptors, &(&1.key == :payment))
+    assert payment.control == :payment_count
+  end
+
+  test "empty custom-fields group is omitted (no header)" do
+    descriptors = FilterDescriptor.all(%{custom_fields: []})
+
+    groups = Enum.map(FilterDescriptor.visible_groups(descriptors), &elem(&1, 0))
+    refute :custom_fields in groups
+  end
+
+  test "membership omits Group/Fee type when the club has none" do
+    descriptors = FilterDescriptor.all(%{groups: [], fee_types: []})
+
+    membership_keys = group_keys(descriptors, :membership)
+    refute :group in membership_keys
+    refute :fee_type in membership_keys
+    # Join/exit date are always available.
+    assert :join_date in membership_keys
+    assert :exit_date in membership_keys
+  end
+
+  test "one custom-fields descriptor per filterable field; non-filterable types dropped" do
+    date_id = Ecto.UUID.generate()
+    bool_id = Ecto.UUID.generate()
+
+    context = %{
+      custom_fields: [
+        %{id: date_id, name: "Birthday", value_type: :date},
+        %{id: bool_id, name: "Consent", value_type: :boolean},
+        %{id: Ecto.UUID.generate(), name: "Phone", value_type: :string}
+      ]
+    }
+
+    custom = Enum.filter(FilterDescriptor.all(context), &(&1.group == :custom_fields))
+
+    assert Enum.map(custom, & &1.key) == [to_string(date_id), to_string(bool_id)]
+    # Keys are plain strings — serializable for #549.
+    assert Enum.all?(custom, &is_binary(&1.key))
+    assert Enum.find(custom, &(&1.key == to_string(date_id))).control == :date_range
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_filter_test.exs b/test/mv_web/member_live/index_payment_filter_test.exs
new file mode 100644
index 00000000..f1b09fea
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_filter_test.exs
@@ -0,0 +1,77 @@
+defmodule MvWeb.MemberLive.IndexPaymentFilterTest do
+  @moduledoc """
+  §1.16 / §2.2 / §3.3 — the payment-count filter in OverviewQuery.
+
+  `fully_paid` selects members with 0 unpaid cycles in the active period;
+  `{:has_unpaid, N}` selects members with at least N — consistent with the
+  aging count (§2.5). All filtering resolves DB-side via the
+  `unpaid_cycle_count` calculation.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  @period %{from: ~D[2024-01-01], to: ~D[2024-12-31]}
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    ft = create_fee_type(%{interval: :monthly}, actor)
+
+    # Wipe the seeded/other members so id sets are deterministic.
+    Mv.Membership.Member
+    |> Ash.read!(actor: actor)
+    |> Enum.each(&Ash.destroy!(&1, actor: actor))
+
+    %{actor: actor, ft: ft}
+  end
+
+  defp member_with_unpaid(n, actor, ft) do
+    member = member_fixture_with_actor(%{}, actor)
+
+    Enum.each(1..max(n, 0)//1, fn i ->
+      create_cycle(member, ft, %{cycle_start: Date.new!(2024, i, 1), status: :unpaid}, actor)
+    end)
+
+    member
+  end
+
+  defp ids(filter, actor) do
+    %{payment_filter: filter, payment_period: @period}
+    |> OverviewQuery.build()
+    |> Ash.read!(actor: actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  test "fully_paid selects members with zero in-period unpaid cycles", %{actor: actor, ft: ft} do
+    paid = member_with_unpaid(0, actor, ft)
+    create_cycle(paid, ft, %{cycle_start: ~D[2024-05-01], status: :paid}, actor)
+    one = member_with_unpaid(1, actor, ft)
+
+    result = ids(:fully_paid, actor)
+    assert MapSet.member?(result, paid.id)
+    refute MapSet.member?(result, one.id)
+  end
+
+  test "has-unpaid thresholds select members with count >= N", %{actor: actor, ft: ft} do
+    zero = member_with_unpaid(0, actor, ft)
+    one = member_with_unpaid(1, actor, ft)
+    two = member_with_unpaid(2, actor, ft)
+    three = member_with_unpaid(3, actor, ft)
+
+    assert ids({:has_unpaid, 1}, actor) == MapSet.new([one.id, two.id, three.id])
+    assert ids({:has_unpaid, 2}, actor) == MapSet.new([two.id, three.id])
+    assert ids({:has_unpaid, 3}, actor) == MapSet.new([three.id])
+    refute MapSet.member?(ids({:has_unpaid, 1}, actor), zero.id)
+  end
+
+  test "suspended cycles do not count toward has-unpaid", %{actor: actor, ft: ft} do
+    member = member_fixture_with_actor(%{}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :suspended}, actor)
+    create_cycle(member, ft, %{cycle_start: ~D[2024-02-01], status: :suspended}, actor)
+
+    refute MapSet.member?(ids({:has_unpaid, 1}, actor), member.id)
+    assert MapSet.member?(ids(:fully_paid, actor), member.id)
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
index 7b56240e..1cf7c0ce 100644
--- a/test/mv_web/member_live/index_payment_period_test.exs
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -5,6 +5,7 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
   backs the badge tooltip (unpaid cycles for the period; suspended shown apart).
   """
   use Mv.DataCase, async: false
+  use ExUnitProperties
 
   import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
 
@@ -39,6 +40,58 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
     end
   end
 
+  describe "payment-count filter codec" do
+    test "round-trips fully_paid and has-unpaid thresholds" do
+      for state <- [:fully_paid, {:has_unpaid, 1}, {:has_unpaid, 2}, {:has_unpaid, 3}] do
+        params = PaymentAging.filter_to_params(state)
+        assert PaymentAging.parse_filter_params(params) == state
+      end
+    end
+
+    test "nil filter serializes to no params and unknown values parse to nil" do
+      assert PaymentAging.filter_to_params(nil) == %{}
+      assert PaymentAging.parse_filter_params(%{}) == nil
+      assert PaymentAging.parse_filter_params(%{"pay_filter" => "bogus"}) == nil
+    end
+
+    test "serializes to stable string tokens" do
+      assert PaymentAging.filter_to_params(:fully_paid) == %{"pay_filter" => "fully_paid"}
+      assert PaymentAging.filter_to_params({:has_unpaid, 2}) == %{"pay_filter" => "unpaid_2"}
+    end
+  end
+
+  describe "payment URL round-trip (§2.1, payment keys)" do
+    @dates [nil, ~D[2020-01-01], ~D[2024-06-30], ~D[2025-12-31]]
+    @filters [nil, :fully_paid, {:has_unpaid, 1}, {:has_unpaid, 2}, {:has_unpaid, 3}]
+
+    property "decode∘encode is canonical and idempotent for period + payment filter" do
+      check all(
+              from <- StreamData.member_of(@dates),
+              to <- StreamData.member_of(@dates),
+              filter <- StreamData.member_of(@filters)
+            ) do
+        period = %{from: from, to: to}
+
+        params =
+          period
+          |> PaymentAging.to_params()
+          |> Map.merge(PaymentAging.filter_to_params(filter))
+
+        assert PaymentAging.parse_period(params) == period
+        assert PaymentAging.parse_filter_params(params) == filter
+
+        # Idempotence: re-encoding the decoded state yields the same params.
+        reencoded =
+          params
+          |> PaymentAging.parse_period()
+          |> PaymentAging.to_params()
+          |> Map.merge(PaymentAging.filter_to_params(PaymentAging.parse_filter_params(params)))
+
+        assert reencoded == params
+      end
+    end
+  end
+
   describe "badge/1" do
     test "0 renders as Paid (success)" do
       badge = PaymentAging.badge(0)

From c547ca19af3ac1fe7cb084b939d212eeec5f481a Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:15 +0200
Subject: [PATCH 22/30] feat(overview): replace filter panel with add-filter
 builder and aging column

Swaps the unbounded vertical filter panel for a Polaris-style add-filter
builder (searchable grouped field picker, type-aware value control, applied
chips) and colour-codes the fees column with each member's period-scoped
unpaid-cycle count.
---
 .../add_filter_builder_component.ex           | 1032 +++++++++++++++++
 .../components/member_filter_component.ex     | 1016 ----------------
 lib/mv_web/live/member_live/index.ex          |  168 +--
 lib/mv_web/live/member_live/index.html.heex   |  147 +--
 .../live/member_live/index/date_filter.ex     |    9 +-
 .../live/member_live/index/export_payload.ex  |   13 +-
 .../member_live/index/filter_descriptor.ex    |    2 +-
 .../live/member_live/index/overview_query.ex  |   56 -
 .../live/member_live/index/payment_aging.ex   |  132 ++-
 lib/mv_web/live/member_live/show.ex           |   12 +-
 priv/gettext/de/LC_MESSAGES/default.po        |  426 ++++---
 priv/gettext/default.pot                      |  393 ++++---
 priv/gettext/en/LC_MESSAGES/default.po        |  422 ++++---
 .../member_filter_component_test.exs          |  660 -----------
 .../member_live/index/export_payload_test.exs |    7 +-
 .../overview_query_cycle_status_test.exs      |   78 --
 .../index_add_filter_flow_test.exs            |   88 ++
 .../member_live/index_column_manager_test.exs |    6 +-
 .../member_live/index_date_presets_test.exs   |   39 +
 .../index_default_columns_test.exs            |    4 +-
 .../member_live/index_filter_chips_test.exs   |   92 ++
 .../index_filter_height_property_test.exs     |   50 +
 .../member_live/index_filter_panel_test.exs   |   79 --
 .../index_filter_parity_property_test.exs     |   46 +-
 .../index_groups_accessibility_test.exs       |   35 +-
 .../member_live/index_groups_filter_test.exs  |   15 +-
 .../index_groups_integration_test.exs         |   28 +-
 .../index_groups_performance_test.exs         |    8 +-
 .../index_groups_url_params_test.exs          |    8 +-
 .../index_membership_fee_status_test.exs      |  280 +----
 .../member_live/index_payment_period_test.exs |   43 +-
 .../member_live/index_payment_wiring_test.exs |   72 ++
 test/mv_web/member_live/index_test.exs        |  416 ++-----
 test/support/conn_case.ex                     |    1 +
 test/support/filter_builder_helpers.ex        |   83 ++
 35 files changed, 2817 insertions(+), 3149 deletions(-)
 create mode 100644 lib/mv_web/live/components/add_filter_builder_component.ex
 delete mode 100644 lib/mv_web/live/components/member_filter_component.ex
 delete mode 100644 test/mv_web/components/member_filter_component_test.exs
 delete mode 100644 test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
 create mode 100644 test/mv_web/member_live/index_add_filter_flow_test.exs
 create mode 100644 test/mv_web/member_live/index_date_presets_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_chips_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_height_property_test.exs
 delete mode 100644 test/mv_web/member_live/index_filter_panel_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_wiring_test.exs
 create mode 100644 test/support/filter_builder_helpers.ex

diff --git a/lib/mv_web/live/components/add_filter_builder_component.ex b/lib/mv_web/live/components/add_filter_builder_component.ex
new file mode 100644
index 00000000..f4d2dc15
--- /dev/null
+++ b/lib/mv_web/live/components/add_filter_builder_component.ex
@@ -0,0 +1,1032 @@
+defmodule MvWeb.Components.AddFilterBuilderComponent do
+  @moduledoc """
+  The member-overview add-filter builder (replaces the vertical
+  `MemberFilterComponent`).
+
+  It follows the Polaris-style add-filter flow (Option C, append-right):
+
+    * a "+ Add filter" trigger opens a combobox **field picker** grouped
+      Quick / Membership / Custom fields (see `FilterDescriptor`);
+    * picking a field closes the picker and opens a focused, type-aware **value
+      control** to the right of the existing chips (no detail "Add" button);
+    * a valid value selection **commits** an applied-filter chip and re-loads the
+      list; dismissing the pending control without a selection **drops** it with
+      no re-load;
+    * applied filters render as **one compact chip per value**, each a real
+      remove button (`aria-label="Remove filter: …"`, ≥24px target);
+    * a **Clear all** control removes every active filter in one re-load.
+
+  Filter state itself lives in the parent LiveView assigns; this component is a
+  pure input layer. It emits the parent's existing filter messages unchanged:
+
+    * `{:group_filter_changed, id_str, :in | :not_in | nil}`
+    * `{:fee_type_filter_changed, id_str, :in | :not_in | nil}`
+    * `{:boolean_filter_changed, id_str, true | false | nil}`
+    * `{:date_filters_changed, date_filters}`
+
+  plus the period-scoped payment messages (§3.3):
+
+    * `{:payment_filter_changed, nil | :fully_paid | {:has_unpaid, 1..3}}`
+    * `{:payment_period_changed, %{from: Date.t() | nil, to: Date.t() | nil}}`
+
+  and `{:clear_all_filters}` for Clear all.
+  """
+  use MvWeb, :live_component
+
+  alias Mv.Constants
+  alias MvWeb.MemberLive.Index.DateFilter
+  alias MvWeb.MemberLive.Index.FilterDescriptor
+  alias MvWeb.MemberLive.Index.FilterParams
+  alias MvWeb.MemberLive.Index.PaymentAging
+
+  @group_filter_prefix Constants.group_filter_prefix()
+  @fee_type_filter_prefix Constants.fee_type_filter_prefix()
+  @custom_date_filter_prefix Constants.custom_date_filter_prefix()
+
+  @impl true
+  def mount(socket) do
+    {:ok,
+     socket
+     |> assign(:open_picker, false)
+     |> assign(:picker_query, "")
+     |> assign(:pending, nil)}
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(:id, assigns.id)
+     |> assign_membership_inputs(assigns)
+     |> assign_extra_inputs(assigns)}
+  end
+
+  defp assign_membership_inputs(socket, assigns) do
+    socket
+    |> assign(:groups, assigns[:groups] || [])
+    |> assign(:group_filters, assigns[:group_filters] || %{})
+    |> assign(:fee_types, assigns[:fee_types] || [])
+    |> assign(:fee_type_filters, assigns[:fee_type_filters] || %{})
+    |> assign(:group_filter_prefix, @group_filter_prefix)
+    |> assign(:fee_type_filter_prefix, @fee_type_filter_prefix)
+  end
+
+  defp assign_extra_inputs(socket, assigns) do
+    socket
+    |> assign(:boolean_custom_fields, assigns[:boolean_custom_fields] || [])
+    |> assign(:boolean_filters, assigns[:boolean_filters] || %{})
+    |> assign(:date_custom_fields, assigns[:date_custom_fields] || [])
+    |> assign(:date_filters, assigns[:date_filters] || DateFilter.default())
+    |> assign(:payment_filter, assigns[:payment_filter])
+    |> assign(:payment_period, assigns[:payment_period] || PaymentAging.default_period())
+  end
+
+  # --------------------------------------------------------------------------
+  # Render
+  # --------------------------------------------------------------------------
+
+  @impl true
+  def render(assigns) do
+    assigns =
+      assigns
+      |> assign(:chips, applied_chips(assigns))
+      |> assign(:descriptors, descriptors(assigns))
+
+    ~H"""
+    <div
+      id={@id}
+      class="flex flex-wrap items-center gap-2"
+      phx-click-away={(@open_picker || @pending) && "dismiss"}
+      phx-window-keydown={(@open_picker || @pending) && "dismiss"}
+      phx-key="Escape"
+      phx-target={@myself}
+      data-testid="add-filter-builder"
+    >
+      <div class="relative">
+        <button
+          type="button"
+          class="badge badge-secondary badge-outline gap-1 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+          phx-click="toggle_picker"
+          phx-target={@myself}
+          aria-haspopup="listbox"
+          aria-expanded={to_string(@open_picker)}
+          data-testid="add-filter-trigger"
+        >
+          <.icon name="hero-plus" class="size-3.5" />
+          <span class="text-xs">{gettext("Add filter")}</span>
+        </button>
+
+        <%!-- Field picker: an anchored dropdown (absolute, top-layer via z-index)
+        so opening it never reflows the toolbar. Sized to content — narrow and
+        tall, capped at 70vh with the option list scrolling internally. --%>
+        <div
+          :if={@open_picker}
+          class="absolute left-0 top-full z-[100] mt-2 flex max-h-[70vh] w-64 flex-col rounded-box border border-base-300 bg-base-100 p-2 shadow-xl"
+          role="dialog"
+          aria-label={gettext("Add filter")}
+        >
+          <input
+            type="text"
+            id={"#{@id}-field-combobox"}
+            role="combobox"
+            aria-expanded="true"
+            aria-controls={"#{@id}-field-listbox"}
+            aria-autocomplete="list"
+            autocomplete="off"
+            phx-hook="ComboBox"
+            phx-change="filter_fields"
+            phx-debounce="120"
+            phx-target={@myself}
+            name="picker_query"
+            value={@picker_query}
+            placeholder={gettext("Filter by …")}
+            class="input input-sm input-bordered w-full mb-2 shrink-0"
+            data-testid="field-combobox"
+          />
+          <ul
+            id={"#{@id}-field-listbox"}
+            role="listbox"
+            aria-label={gettext("Available filters")}
+            class="min-h-0 flex-1 overflow-y-auto"
+          >
+            <template :if={FilterDescriptor.visible_groups(@descriptors) == []}></template>
+            <li
+              :for={{group, descs} <- FilterDescriptor.visible_groups(@descriptors)}
+              class="p-0 m-0"
+              role="presentation"
+            >
+              <div
+                class="px-2 pt-2 pb-1 text-xs font-semibold uppercase tracking-wider opacity-60"
+                data-testid="field-group-header"
+              >
+                {group_label(group)}
+              </div>
+              <ul class="p-0 m-0 list-none" role="presentation">
+                <li :for={d <- descs} class="p-0 m-0" role="presentation">
+                  <button
+                    type="button"
+                    id={"#{@id}-field-opt-#{d.key}"}
+                    role="option"
+                    aria-selected="false"
+                    class="btn btn-ghost btn-sm btn-block justify-start font-normal"
+                    phx-click="pick_field"
+                    phx-value-key={to_string(d.key)}
+                    phx-target={@myself}
+                    data-testid="field-option"
+                  >
+                    {d.label}
+                  </button>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <ul class="flex flex-wrap items-center gap-2 p-0 m-0 list-none" data-testid="filter-chips">
+        <li :for={chip <- @chips} class="p-0 m-0">
+          <span class="badge badge-primary badge-outline gap-1 pr-0.5" data-testid="filter-chip">
+            <span class="text-xs">{chip.label}</span>
+            <%!-- Subtle remove control: a ≥24px hit target (WCAG 2.5.8) wrapping a
+            small glyph whose only hover feedback is a minimal rounded tint around
+            the × itself, so the interaction stays quiet and no tooltip is used. --%>
+            <button
+              type="button"
+              class="group inline-flex size-6 min-h-0 items-center justify-center rounded-full p-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+              phx-click="remove_chip"
+              phx-value-kind={chip.kind}
+              phx-value-id={chip.id}
+              phx-target={@myself}
+              aria-label={gettext("Remove filter: %{label}", label: chip.label)}
+              data-testid="filter-chip-remove"
+            >
+              <span class="inline-flex rounded-full p-0.5 opacity-50 transition group-hover:bg-base-content/10 group-hover:opacity-100">
+                <.icon name="hero-x-mark" class="size-3.5" />
+              </span>
+            </button>
+          </span>
+        </li>
+      </ul>
+
+      <%!-- Pending filter: the picked field renders a chip anchor and its
+      type-aware value control opens as an anchored dropdown below it (absolute,
+      top-layer), so the toolbar never reflows while choosing a value. Clicking
+      the chip (or Escape / click-away) dismisses without committing (§1.3). --%>
+      <div :if={@pending} class="relative" data-testid="pending-filter">
+        <button
+          type="button"
+          class="badge badge-primary badge-outline gap-1 h-7 cursor-pointer"
+          phx-click="dismiss"
+          phx-target={@myself}
+          aria-haspopup="dialog"
+          aria-expanded="true"
+          data-testid="pending-chip"
+        >
+          <span class="text-xs">{@pending.label}</span>
+          <.icon name="hero-chevron-down" class="size-3" />
+        </button>
+        <div class="absolute left-0 top-full z-[100] mt-2">
+          {render_value_control(assigns)}
+        </div>
+      </div>
+
+      <button
+        :if={@chips != []}
+        type="button"
+        class="badge badge-ghost cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+        phx-click="clear_all"
+        phx-target={@myself}
+        data-testid="clear-all-filters"
+      >
+        <span class="text-xs">{gettext("Clear all")}</span>
+      </button>
+    </div>
+    """
+  end
+
+  # --- value controls -------------------------------------------------------
+
+  defp render_value_control(%{pending: %{control: :payment_count}} = assigns) do
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="flex flex-wrap items-end gap-2 rounded-box border border-base-300 bg-base-100 p-2 shadow"
+      data-testid="value-control-payment"
+    >
+      <fieldset class="border-0 p-0 m-0">
+        <legend class="text-xs font-medium mb-1">{gettext("Payment")}</legend>
+        <select
+          name="pay"
+          class="select select-sm select-bordered"
+          aria-label={gettext("Payment status")}
+        >
+          <option value="all" selected={@payment_filter == nil}>{gettext("All")}</option>
+          <option value="fully_paid" selected={@payment_filter == :fully_paid}>
+            {gettext("Fully paid")}
+          </option>
+          <option value="unpaid_1" selected={@payment_filter == {:has_unpaid, 1}}>
+            {gettext("Has unpaid ≥ 1")}
+          </option>
+          <option value="unpaid_2" selected={@payment_filter == {:has_unpaid, 2}}>
+            {gettext("Has unpaid ≥ 2")}
+          </option>
+          <option value="unpaid_3" selected={@payment_filter == {:has_unpaid, 3}}>
+            {gettext("Has unpaid ≥ 3")}
+          </option>
+        </select>
+      </fieldset>
+      <.input
+        type="date"
+        name="pay_from"
+        label={gettext("Period from")}
+        class="input input-sm input-bordered"
+        value={date_iso(@payment_period[:from])}
+      />
+      <.input
+        type="date"
+        name="pay_to"
+        label={gettext("Period to")}
+        class="input input-sm input-bordered"
+        value={date_iso(@payment_period[:to])}
+      />
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :active_former}} = assigns) do
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
+      data-testid="value-control-active-former"
+    >
+      <fieldset class="border-0 p-0 m-0">
+        <legend class="text-xs font-medium mb-1">{gettext("Active / former")}</legend>
+        <div class="join">
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name="quick"
+              value="active"
+              class="hidden"
+              checked={quick(@date_filters) == :active}
+            />
+            {gettext("Active")}
+          </label>
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name="quick"
+              value="former"
+              class="hidden"
+              checked={quick(@date_filters) == :former}
+            />
+            {gettext("Former")}
+          </label>
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name="quick"
+              value="all"
+              class="hidden"
+              checked={quick(@date_filters) == :all}
+            />
+            {gettext("All")}
+          </label>
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :group_membership}} = assigns) do
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow max-h-[70vh] overflow-y-auto min-w-[16rem]"
+      data-testid="value-control-group"
+    >
+      <fieldset
+        :for={group <- @groups}
+        class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+      >
+        <legend class="text-sm col-start-1 float-left w-auto">{group.name}</legend>
+        <div class="join col-start-2">
+          <.in_not_in_radios
+            name={"#{@group_filter_prefix}#{group.id}"}
+            current={Map.get(@group_filters, to_string(group.id))}
+          />
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :fee_type_membership}} = assigns) do
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow max-h-[70vh] overflow-y-auto min-w-[16rem]"
+      data-testid="value-control-fee-type"
+    >
+      <fieldset
+        :for={ft <- @fee_types}
+        class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+      >
+        <legend class="text-sm col-start-1 float-left w-auto">{ft.name}</legend>
+        <div class="join col-start-2">
+          <.in_not_in_radios
+            name={"#{@fee_type_filter_prefix}#{ft.id}"}
+            current={Map.get(@fee_type_filters, to_string(ft.id))}
+          />
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :boolean, key: key}} = assigns) do
+    assigns = assign(assigns, :field_id, to_string(key))
+
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
+      data-testid="value-control-boolean"
+    >
+      <fieldset class="border-0 p-0 m-0">
+        <legend class="text-xs font-medium mb-1">{@pending.label}</legend>
+        <div class="join">
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name={"custom_boolean[#{@field_id}]"}
+              value="all"
+              class="hidden"
+              checked={Map.get(@boolean_filters, @field_id) == nil}
+            />
+            {gettext("All")}
+          </label>
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name={"custom_boolean[#{@field_id}]"}
+              value="true"
+              class="hidden"
+              checked={Map.get(@boolean_filters, @field_id) == true}
+            />
+            {gettext("Yes")}
+          </label>
+          <label class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name={"custom_boolean[#{@field_id}]"}
+              value="false"
+              class="hidden"
+              checked={Map.get(@boolean_filters, @field_id) == false}
+            />
+            {gettext("No")}
+          </label>
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :exit_date}} = assigns) do
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
+      data-testid="value-control-exit-date"
+    >
+      <fieldset class="border-0 p-0 m-0">
+        <legend class="text-xs font-medium mb-1">{gettext("Exit date")}</legend>
+        <div class="join">
+          <label :for={{mode, label} <- exit_modes()} class="join-item btn btn-sm">
+            <input
+              type="radio"
+              name="ed_mode"
+              value={mode}
+              class="hidden"
+              checked={exit_mode(@date_filters) == String.to_existing_atom(mode)}
+            />
+            {label}
+          </label>
+        </div>
+        <div :if={exit_mode(@date_filters) == :custom} class="mt-2 flex gap-2 items-end flex-wrap">
+          <.input
+            type="date"
+            name="ed_from"
+            label={gettext("From")}
+            class="input input-sm input-bordered"
+            value={date_for(@date_filters, :exit_date, :from)}
+          />
+          <.input
+            type="date"
+            name="ed_to"
+            label={gettext("To")}
+            class="input input-sm input-bordered"
+            value={date_for(@date_filters, :exit_date, :to)}
+          />
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(%{pending: %{control: :date_range, key: key}} = assigns) do
+    {from_name, to_name, from_val, to_val} = date_range_binding(assigns, key)
+
+    assigns =
+      assigns
+      |> assign(:from_name, from_name)
+      |> assign(:to_name, to_name)
+      |> assign(:from_val, from_val)
+      |> assign(:to_val, to_val)
+
+    ~H"""
+    <form
+      phx-change="commit"
+      phx-target={@myself}
+      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
+      data-testid="value-control-date-range"
+    >
+      <fieldset class="border-0 p-0 m-0">
+        <legend class="text-xs font-medium mb-1">{@pending.label}</legend>
+        <div class="flex flex-wrap gap-1 mb-2" data-testid="date-presets">
+          <button
+            :for={{preset, label} <- date_presets()}
+            type="button"
+            class="btn btn-xs"
+            phx-click="apply_preset"
+            phx-value-preset={preset}
+            phx-value-key={to_string(@pending.key)}
+            phx-target={@myself}
+            data-testid={"date-preset-#{preset}"}
+          >
+            {label}
+          </button>
+        </div>
+        <div class="flex gap-2 items-end flex-wrap">
+          <.input
+            type="date"
+            name={@from_name}
+            label={gettext("From")}
+            class="input input-sm input-bordered"
+            value={@from_val}
+          />
+          <.input
+            type="date"
+            name={@to_name}
+            label={gettext("To")}
+            class="input input-sm input-bordered"
+            value={@to_val}
+          />
+        </div>
+      </fieldset>
+    </form>
+    """
+  end
+
+  defp render_value_control(assigns), do: ~H""
+
+  # --------------------------------------------------------------------------
+  # Events
+  # --------------------------------------------------------------------------
+
+  @impl true
+  def handle_event("toggle_picker", _params, socket) do
+    # Toggle so a second click on the trigger closes the open picker (matching the
+    # standard daisyUI dropdown behaviour). Opening it also clears any pending
+    # value control and resets the query.
+    if socket.assigns.open_picker do
+      {:noreply, assign(socket, :open_picker, false)}
+    else
+      {:noreply,
+       socket |> assign(:open_picker, true) |> assign(:pending, nil) |> assign(:picker_query, "")}
+    end
+  end
+
+  @impl true
+  def handle_event("dismiss", _params, socket) do
+    # Drop-on-dismiss (§1.3): closing the picker or a pending value control
+    # without a selection adds no chip and triggers no re-load.
+    {:noreply, socket |> assign(:open_picker, false) |> assign(:pending, nil)}
+  end
+
+  @impl true
+  def handle_event("filter_fields", %{"picker_query" => q}, socket) do
+    {:noreply, assign(socket, :picker_query, q)}
+  end
+
+  @impl true
+  def handle_event("pick_field", %{"key" => key}, socket) do
+    descriptor = Enum.find(descriptors(socket.assigns), &(to_string(&1.key) == key))
+
+    {:noreply,
+     socket
+     |> assign(:open_picker, false)
+     |> assign(:picker_query, "")
+     |> assign(:pending, descriptor)}
+  end
+
+  @impl true
+  def handle_event("apply_preset", %{"preset" => preset, "key" => key}, socket) do
+    case preset_range(preset) do
+      nil ->
+        {:noreply, socket}
+
+      {from, to} ->
+        new_filters = put_date_range(socket.assigns.date_filters, key, from, to)
+
+        maybe_send(
+          new_filters != socket.assigns.date_filters,
+          {:date_filters_changed, new_filters}
+        )
+
+        {:noreply, assign(socket, :pending, nil)}
+    end
+  end
+
+  @impl true
+  def handle_event("commit", params, socket) do
+    dispatch_payment(socket, params)
+    dispatch_quick(socket, params)
+
+    dispatch_prefix(
+      socket,
+      params,
+      @group_filter_prefix,
+      :group_filter_changed,
+      socket.assigns.groups
+    )
+
+    dispatch_prefix(
+      socket,
+      params,
+      @fee_type_filter_prefix,
+      :fee_type_filter_changed,
+      socket.assigns.fee_types
+    )
+
+    dispatch_boolean(socket, params)
+    dispatch_dates(socket, params)
+
+    {:noreply, assign(socket, :pending, nil)}
+  end
+
+  @impl true
+  def handle_event("remove_chip", %{"kind" => kind, "id" => id}, socket) do
+    remove_chip(kind, id, socket)
+    {:noreply, socket}
+  end
+
+  @impl true
+  def handle_event("clear_all", _params, socket) do
+    send(self(), {:clear_all_filters})
+    {:noreply, socket |> assign(:open_picker, false) |> assign(:pending, nil)}
+  end
+
+  # --- dispatch helpers -----------------------------------------------------
+
+  defp dispatch_payment(socket, params) do
+    case Map.get(params, "pay") do
+      nil ->
+        :ok
+
+      value ->
+        filter = PaymentAging.parse_filter(value)
+        maybe_send(filter != socket.assigns.payment_filter, {:payment_filter_changed, filter})
+
+        period = %{
+          from: parse_date(Map.get(params, "pay_from")),
+          to: parse_date(Map.get(params, "pay_to"))
+        }
+
+        maybe_send(period != socket.assigns.payment_period, {:payment_period_changed, period})
+    end
+  end
+
+  defp dispatch_quick(socket, params) do
+    case Map.get(params, "quick") do
+      q when q in ["active", "former", "all"] ->
+        new_filters =
+          DateFilter.set_quick_state(socket.assigns.date_filters, String.to_existing_atom(q))
+
+        maybe_send(
+          new_filters != socket.assigns.date_filters,
+          {:date_filters_changed, new_filters}
+        )
+
+      _ ->
+        :ok
+    end
+  end
+
+  defp dispatch_prefix(socket, params, prefix, message, valid_records) do
+    if Enum.any?(params, fn {k, _} -> String.starts_with?(k, prefix) end) do
+      dispatch_prefix_entries(socket, params, prefix, message, valid_records)
+    end
+  end
+
+  defp dispatch_prefix_entries(socket, params, prefix, message, valid_records) do
+    current = current_for(socket, message)
+    valid_ids = MapSet.new(Enum.map(valid_records, &to_string(&1.id)))
+
+    params
+    |> FilterParams.parse_prefix_filters(prefix, &FilterParams.parse_in_not_in_value/1)
+    |> Enum.each(&maybe_send_prefix(&1, current, valid_ids, message))
+  end
+
+  defp maybe_send_prefix({id_str, value}, current, valid_ids, message) do
+    if MapSet.member?(valid_ids, id_str) and Map.get(current, id_str) != value do
+      send(self(), {message, id_str, value})
+    end
+  end
+
+  defp current_for(socket, :group_filter_changed), do: socket.assigns.group_filters
+  defp current_for(socket, :fee_type_filter_changed), do: socket.assigns.fee_type_filters
+
+  defp dispatch_boolean(socket, params) do
+    case Map.get(params, "custom_boolean") do
+      map when is_map(map) ->
+        Enum.each(map, &maybe_send_boolean(&1, socket.assigns.boolean_filters))
+
+      _ ->
+        :ok
+    end
+  end
+
+  defp maybe_send_boolean({id_str, value_str}, current) do
+    value = parse_tri_state(value_str)
+
+    if Map.get(current, id_str) != value do
+      send(self(), {:boolean_filter_changed, id_str, value})
+    end
+  end
+
+  defp dispatch_dates(socket, params) do
+    if has_date_param?(params) do
+      new_filters = DateFilter.from_params(params, socket.assigns.date_custom_fields)
+      maybe_send(new_filters != socket.assigns.date_filters, {:date_filters_changed, new_filters})
+    end
+  end
+
+  defp has_date_param?(params) do
+    Enum.any?(params, fn {k, _} ->
+      k in ["ed_mode", "ed_from", "ed_to", "jd_from", "jd_to"] or
+        String.starts_with?(k, @custom_date_filter_prefix)
+    end)
+  end
+
+  defp remove_chip("payment", _id, socket) do
+    maybe_send(socket.assigns.payment_filter != nil, {:payment_filter_changed, nil})
+  end
+
+  defp remove_chip("payment_period", _id, _socket) do
+    send(self(), {:payment_period_changed, PaymentAging.default_period()})
+  end
+
+  defp remove_chip("group", id, _socket), do: send(self(), {:group_filter_changed, id, nil})
+  defp remove_chip("fee_type", id, _socket), do: send(self(), {:fee_type_filter_changed, id, nil})
+  defp remove_chip("boolean", id, _socket), do: send(self(), {:boolean_filter_changed, id, nil})
+
+  defp remove_chip("date", id, socket) do
+    new_filters = clear_date_field(socket.assigns.date_filters, id)
+    send(self(), {:date_filters_changed, new_filters})
+  end
+
+  defp remove_chip(_kind, _id, _socket), do: :ok
+
+  defp maybe_send(true, message), do: send(self(), message)
+  defp maybe_send(false, _message), do: :ok
+
+  # --------------------------------------------------------------------------
+  # Chips
+  # --------------------------------------------------------------------------
+
+  defp applied_chips(assigns) do
+    group_chips(assigns) ++
+      fee_type_chips(assigns) ++
+      boolean_chips(assigns) ++
+      date_chips(assigns) ++
+      payment_chips(assigns)
+  end
+
+  defp group_chips(assigns) do
+    names = id_name_map(assigns.groups)
+
+    for {id, value} <- assigns.group_filters do
+      label =
+        case value do
+          :in -> gettext("Group: %{name}", name: Map.get(names, id, id))
+          :not_in -> gettext("Group: not %{name}", name: Map.get(names, id, id))
+        end
+
+      %{kind: "group", id: id, label: label}
+    end
+  end
+
+  defp fee_type_chips(assigns) do
+    names = id_name_map(assigns.fee_types)
+
+    for {id, value} <- assigns.fee_type_filters do
+      label =
+        case value do
+          :in -> gettext("Fee type: %{name}", name: Map.get(names, id, id))
+          :not_in -> gettext("Fee type: not %{name}", name: Map.get(names, id, id))
+        end
+
+      %{kind: "fee_type", id: id, label: label}
+    end
+  end
+
+  defp boolean_chips(assigns) do
+    names = id_name_map(assigns.boolean_custom_fields)
+
+    for {id, value} <- assigns.boolean_filters do
+      state = if value, do: gettext("Yes"), else: gettext("No")
+      %{kind: "boolean", id: id, label: "#{Map.get(names, id, id)}: #{state}"}
+    end
+  end
+
+  defp date_chips(assigns) do
+    filters = assigns.date_filters
+
+    exit_chip(filters) ++
+      builtin_range_chip(filters, :join_date, gettext("Joined")) ++
+      custom_date_chips(assigns)
+  end
+
+  defp exit_chip(filters) do
+    # :active_only is the default exit-date state, so it is not a user-applied
+    # filter and renders no chip; only the non-default states do.
+    case DateFilter.quick_state(filters) do
+      :active -> []
+      :former -> [%{kind: "date", id: "exit_date", label: gettext("Former")}]
+      :custom -> range_chip("date", "exit_date", gettext("Exited"), Map.get(filters, :exit_date))
+      :all -> [%{kind: "date", id: "exit_date", label: gettext("All (incl. former)")}]
+    end
+  end
+
+  defp builtin_range_chip(filters, field, prefix) do
+    range_chip("date", to_string(field), prefix, Map.get(filters, field))
+  end
+
+  defp custom_date_chips(assigns) do
+    names = id_name_map(assigns.date_custom_fields)
+
+    assigns.date_filters
+    |> Enum.flat_map(fn
+      {k, %{} = bounds} when is_binary(k) ->
+        range_chip("date", k, Map.get(names, k, k), bounds)
+
+      _ ->
+        []
+    end)
+  end
+
+  defp range_chip(kind, id, prefix, %{} = bounds) do
+    from = bounds[:from]
+    to = bounds[:to]
+
+    if from || to do
+      [%{kind: kind, id: id, label: "#{prefix}: #{date_iso(from) || "…"}–#{date_iso(to) || "…"}"}]
+    else
+      []
+    end
+  end
+
+  defp range_chip(_kind, _id, _prefix, _), do: []
+
+  defp payment_chips(assigns) do
+    filter_chip =
+      case assigns.payment_filter do
+        :fully_paid ->
+          [%{kind: "payment", id: "payment", label: gettext("Fully paid")}]
+
+        {:has_unpaid, n} ->
+          [%{kind: "payment", id: "payment", label: gettext("≥ %{n} unpaid", n: n)}]
+
+        _ ->
+          []
+      end
+
+    period = assigns.payment_period || %{}
+
+    period_chip =
+      if period[:from] || period[:to] do
+        label =
+          "#{gettext("Period")}: #{date_iso(period[:from]) || "…"}–#{date_iso(period[:to]) || "…"}"
+
+        [%{kind: "payment_period", id: "payment_period", label: label}]
+      else
+        []
+      end
+
+    filter_chip ++ period_chip
+  end
+
+  # --------------------------------------------------------------------------
+  # Helpers
+  # --------------------------------------------------------------------------
+
+  defp descriptors(assigns) do
+    FilterDescriptor.all(%{
+      groups: assigns.groups,
+      fee_types: assigns.fee_types,
+      custom_fields: assigns.boolean_custom_fields ++ assigns.date_custom_fields
+    })
+    |> filter_by_query(assigns[:picker_query])
+  end
+
+  defp filter_by_query(descriptors, q) when is_binary(q) and q != "" do
+    down = String.downcase(q)
+    Enum.filter(descriptors, &String.contains?(String.downcase(&1.label), down))
+  end
+
+  defp filter_by_query(descriptors, _q), do: descriptors
+
+  defp id_name_map(records) do
+    Map.new(records, fn r -> {to_string(r.id), r.name} end)
+  end
+
+  attr :name, :string, required: true
+  attr :current, :atom, default: nil
+
+  defp in_not_in_radios(assigns) do
+    ~H"""
+    <label class="join-item btn btn-sm">
+      <input type="radio" name={@name} value="all" class="hidden" checked={@current == nil} />
+      {gettext("All")}
+    </label>
+    <label class="join-item btn btn-sm">
+      <input type="radio" name={@name} value="in" class="hidden" checked={@current == :in} />
+      {gettext("Yes")}
+    </label>
+    <label class="join-item btn btn-sm">
+      <input type="radio" name={@name} value="not_in" class="hidden" checked={@current == :not_in} />
+      {gettext("No")}
+    </label>
+    """
+  end
+
+  defp group_label(:quick), do: gettext("Quick")
+  defp group_label(:membership), do: gettext("Membership")
+  defp group_label(:custom_fields), do: gettext("Custom fields")
+
+  defp exit_modes do
+    [
+      {"active_only", gettext("Active only")},
+      {"all", gettext("All")},
+      {"inactive_only", gettext("Former only")},
+      {"custom", gettext("Range")}
+    ]
+  end
+
+  defp exit_mode(%{exit_date: %{mode: mode}}), do: mode
+  defp exit_mode(_), do: :active_only
+
+  defp quick(filters), do: DateFilter.quick_state(filters)
+
+  defp parse_tri_state("true"), do: true
+  defp parse_tri_state("false"), do: false
+  defp parse_tri_state(_), do: nil
+
+  defp date_iso(%Date{} = d), do: Date.to_iso8601(d)
+  defp date_iso(_), do: nil
+
+  defp date_for(filters, field, bound) do
+    case filters do
+      %{^field => %{^bound => %Date{} = d}} -> Date.to_iso8601(d)
+      _ -> ""
+    end
+  end
+
+  # Builds the {from_name, to_name, from_val, to_val} tuple for a date_range
+  # control keyed by a built-in field (:join_date) or a custom date field UUID.
+  defp date_range_binding(assigns, :join_date) do
+    {"jd_from", "jd_to", date_for(assigns.date_filters, :join_date, :from),
+     date_for(assigns.date_filters, :join_date, :to)}
+  end
+
+  defp date_range_binding(assigns, key) do
+    id = to_string(key)
+    bounds = Map.get(assigns.date_filters, id, %{})
+
+    {"#{@custom_date_filter_prefix}#{id}_from", "#{@custom_date_filter_prefix}#{id}_to",
+     date_iso(bounds[:from]) || "", date_iso(bounds[:to]) || ""}
+  end
+
+  # --- date presets ---------------------------------------------------------
+
+  defp date_presets do
+    [
+      {"this_year", gettext("This year")},
+      {"last_year", gettext("Last year")},
+      {"this_month", gettext("This month")},
+      {"last_30_days", gettext("Last 30 days")}
+    ]
+  end
+
+  defp preset_range("this_year") do
+    y = Date.utc_today().year
+    {Date.new!(y, 1, 1), Date.new!(y, 12, 31)}
+  end
+
+  defp preset_range("last_year") do
+    y = Date.utc_today().year - 1
+    {Date.new!(y, 1, 1), Date.new!(y, 12, 31)}
+  end
+
+  defp preset_range("this_month") do
+    today = Date.utc_today()
+    {Date.beginning_of_month(today), Date.end_of_month(today)}
+  end
+
+  defp preset_range("last_30_days") do
+    today = Date.utc_today()
+    {Date.add(today, -30), today}
+  end
+
+  defp preset_range(_), do: nil
+
+  # Writes a from/to range for a built-in or custom date field into the date
+  # filter map, matching DateFilter's internal shape.
+  defp put_date_range(filters, "join_date", from, to) do
+    Map.put(filters, :join_date, %{from: from, to: to})
+  end
+
+  defp put_date_range(filters, "exit_date", from, to) do
+    Map.put(filters, :exit_date, %{mode: :custom, from: from, to: to})
+  end
+
+  defp put_date_range(filters, key, from, to) when is_binary(key) do
+    Map.put(filters, key, %{from: from, to: to})
+  end
+
+  defp clear_date_field(filters, "join_date"),
+    do: Map.put(filters, :join_date, %{from: nil, to: nil})
+
+  defp clear_date_field(filters, "exit_date") do
+    Map.put(filters, :exit_date, %{mode: :active_only, from: nil, to: nil})
+  end
+
+  defp clear_date_field(filters, key) when is_binary(key), do: Map.delete(filters, key)
+
+  defp parse_date(value) when is_binary(value) do
+    case Date.from_iso8601(String.trim(value)) do
+      {:ok, date} -> date
+      _ -> nil
+    end
+  end
+
+  defp parse_date(_), do: nil
+end
diff --git a/lib/mv_web/live/components/member_filter_component.ex b/lib/mv_web/live/components/member_filter_component.ex
deleted file mode 100644
index a0753387..00000000
--- a/lib/mv_web/live/components/member_filter_component.ex
+++ /dev/null
@@ -1,1016 +0,0 @@
-defmodule MvWeb.Components.MemberFilterComponent do
-  @moduledoc """
-  Provides the MemberFilter Live-Component.
-
-  A DaisyUI dropdown filter for filtering members by payment status and boolean custom fields.
-  Uses radio inputs in a segmented control pattern (join + btn) for tri-state boolean filters.
-
-  ## Design Decisions
-
-  - Uses `div` panel instead of `ul.menu/li` structure to avoid DaisyUI menu styles
-    (padding, display, hover, font sizes) that would interfere with form controls.
-  - Filter controls are form elements (fieldset with legend, radio inputs), not menu items.
-    Uses semantic `<fieldset>` and `<legend>` for proper accessibility and form structure.
-  - Dropdown stays open when clicking filter segments to allow multiple filter changes.
-  - Uses `phx-change` on form for radio inputs instead of individual `phx-click` events.
-
-  ## Props
-  - `:cycle_status_filter` - Current payment filter state: `nil` (all), `:paid`, or `:unpaid`
-  - `:groups` - List of groups (for per-group filter rows)
-  - `:group_filters` - Map of active group filters: `%{group_id => :in | :not_in}` (nil = All for that group).
-    Multiple active filters combine with AND (member must match all selected group conditions).
-  - `:fee_types` - List of membership fee types (for per-fee-type filter rows)
-  - `:fee_type_filters` - Map of active fee type filters: `%{fee_type_id => :in | :not_in}` (nil = All).
-  - `:boolean_custom_fields` - List of boolean custom fields to display
-  - `:boolean_filters` - Map of active boolean filters: `%{custom_field_id => true | false}`
-  - `:date_custom_fields` - List of date-typed custom fields rendered in the
-    "Custom date fields" section (each with `:id`, `:name`, `:value_type`).
-  - `:date_filters` - Date filter state map (see `MvWeb.MemberLive.Index.DateFilter`):
-    built-in `:join_date` / `:exit_date` bounds and mode, plus optional
-    UUID-keyed custom date field bound entries.
-  - `:id` - Component ID (required)
-  - `:member_count` - Number of filtered members to display in badge (optional, default: 0)
-
-  ## Events
-  - Sends `{:payment_filter_changed, filter}` to parent when payment filter changes
-  - Sends `{:group_filter_changed, group_id_str, value}` to parent when a group filter changes (value: nil | :in | :not_in)
-  - Sends `{:fee_type_filter_changed, fee_type_id_str, value}` to parent when a fee type filter changes (value: nil | :in | :not_in)
-  - Sends `{:boolean_filter_changed, custom_field_id, filter_value}` to parent when boolean filter changes
-  - Sends `{:date_filters_changed, new_filters}` to parent when any date
-    filter input changes (built-in date bounds, exit_date mode, or custom
-    date field bounds).
-  """
-  use MvWeb, :live_component
-
-  alias MvWeb.MemberLive.Index.DateFilter
-  alias MvWeb.MemberLive.Index.FilterParams
-
-  @group_filter_prefix Mv.Constants.group_filter_prefix()
-  @fee_type_filter_prefix Mv.Constants.fee_type_filter_prefix()
-  @custom_date_filter_prefix Mv.Constants.custom_date_filter_prefix()
-
-  @impl true
-  def mount(socket) do
-    {:ok, assign(socket, :open, false)}
-  end
-
-  @impl true
-  def update(assigns, socket) do
-    socket =
-      socket
-      |> assign(:id, assigns.id)
-      |> assign(:cycle_status_filter, assigns[:cycle_status_filter])
-      |> assign_group_assigns(assigns)
-      |> assign_fee_type_assigns(assigns)
-      |> assign_boolean_assigns(assigns)
-      |> assign_date_assigns(assigns)
-      |> assign(:member_count, assigns[:member_count] || 0)
-
-    {:ok, socket}
-  end
-
-  defp assign_group_assigns(socket, assigns) do
-    socket
-    |> assign(:groups, assigns[:groups] || [])
-    |> assign(:group_filters, assigns[:group_filters] || %{})
-    |> assign(:group_filter_prefix, @group_filter_prefix)
-  end
-
-  defp assign_fee_type_assigns(socket, assigns) do
-    socket
-    |> assign(:fee_types, assigns[:fee_types] || [])
-    |> assign(:fee_type_filters, assigns[:fee_type_filters] || %{})
-    |> assign(:fee_type_filter_prefix, @fee_type_filter_prefix)
-  end
-
-  defp assign_boolean_assigns(socket, assigns) do
-    socket
-    |> assign(:boolean_custom_fields, assigns[:boolean_custom_fields] || [])
-    |> assign(:boolean_filters, assigns[:boolean_filters] || %{})
-  end
-
-  defp assign_date_assigns(socket, assigns) do
-    socket
-    |> assign(:date_custom_fields, assigns[:date_custom_fields] || [])
-    |> assign(:date_filters, assigns[:date_filters] || DateFilter.default())
-    |> assign(:custom_date_filter_prefix, @custom_date_filter_prefix)
-  end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div
-      class="relative member-filter-dropdown"
-      id={@id}
-      phx-click-away={if @open, do: "close_dropdown", else: nil}
-      phx-window-keydown={@open && "close_dropdown"}
-      phx-key="Escape"
-      phx-target={@myself}
-    >
-      <.button
-        type="button"
-        variant="secondary"
-        class={[
-          "gap-2",
-          (@cycle_status_filter || map_size(@group_filters) > 0 ||
-             map_size(@fee_type_filters) > 0 ||
-             active_boolean_filters_count(@boolean_filters) > 0 ||
-             date_filters_active?(@date_filters)) &&
-            "btn-active"
-        ]}
-        phx-click="toggle_dropdown"
-        phx-target={@myself}
-        aria-haspopup="true"
-        aria-expanded={to_string(@open)}
-        aria-label={gettext("Filter members")}
-      >
-        <.icon name="hero-funnel" class="h-5 w-5" />
-        <span class="hidden sm:inline">
-          {button_label(
-            @cycle_status_filter,
-            @groups,
-            @group_filters,
-            @fee_types,
-            @fee_type_filters,
-            @boolean_custom_fields,
-            @boolean_filters,
-            @date_filters
-          )}
-        </span>
-        <.badge
-          :if={active_boolean_filters_count(@boolean_filters) > 0}
-          variant="primary"
-          size="sm"
-        >
-          {active_boolean_filters_count(@boolean_filters)}
-        </.badge>
-        <.badge
-          :if={
-            (@cycle_status_filter || map_size(@group_filters) > 0 ||
-               map_size(@fee_type_filters) > 0 ||
-               date_filters_active?(@date_filters)) &&
-              active_boolean_filters_count(@boolean_filters) == 0
-          }
-          variant="primary"
-          size="sm"
-        >
-          {@member_count}
-        </.badge>
-        <.icon name="hero-chevron-down" class="size-4" />
-      </.button>
-      
-    <!--
-        NOTE: We use a div panel instead of ul.menu/li structure to avoid DaisyUI menu styles
-        (padding, display, hover, font sizes) that would interfere with our form controls.
-        Filter controls are form elements (fieldset with legend, radio inputs), not menu items.
-        We use semantic fieldset/legend structure for proper accessibility.
-        We use relative/absolute positioning instead of DaisyUI dropdown classes to have
-        full control over the open/close state via LiveView.
-      -->
-      <div
-        :if={@open}
-        tabindex="0"
-        class="absolute left-0 mt-2 w-[28rem] rounded-box border border-base-300 bg-base-100 p-4 shadow-xl z-[100]"
-        role="dialog"
-        aria-label={gettext("Member filter")}
-      >
-        <form phx-change="update_filters" phx-target={@myself} data-testid="member-filter-form">
-          <!-- Payment Filter Group -->
-          <div class="mb-4">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Payments")}
-            </div>
-            <fieldset class="grid grid-cols-[1fr_auto] items-center gap-3 py-2 border-0 p-0 m-0 min-w-0">
-              <legend class="text-sm font-medium col-start-1 float-left w-auto">
-                {gettext("Payment Status")}
-              </legend>
-              <div class="join col-start-2">
-                <label
-                  class={"#{payment_filter_label_class(@cycle_status_filter, nil)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="payment-filter-all"
-                >
-                  <input
-                    type="radio"
-                    id="payment-filter-all"
-                    name="payment_filter"
-                    value="all"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={@cycle_status_filter == nil}
-                  />
-                  <span class="text-xs">{gettext("All")}</span>
-                </label>
-                <label
-                  class={"#{payment_filter_label_class(@cycle_status_filter, :paid)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="payment-filter-paid"
-                >
-                  <input
-                    type="radio"
-                    id="payment-filter-paid"
-                    name="payment_filter"
-                    value="paid"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={@cycle_status_filter == :paid}
-                  />
-                  <.icon name="hero-check-circle" class="h-5 w-5" />
-                  <span class="text-xs">{gettext("Paid")}</span>
-                </label>
-                <label
-                  class={"#{payment_filter_label_class(@cycle_status_filter, :unpaid)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="payment-filter-unpaid"
-                >
-                  <input
-                    type="radio"
-                    id="payment-filter-unpaid"
-                    name="payment_filter"
-                    value="unpaid"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={@cycle_status_filter == :unpaid}
-                  />
-                  <.icon name="hero-x-circle" class="h-5 w-5" />
-                  <span class="text-xs">{gettext("Unpaid")}</span>
-                </label>
-              </div>
-            </fieldset>
-          </div>
-          
-    <!-- Groups: one row per group with All / Yes / No (like Custom Fields) -->
-          <div :if={length(@groups) > 0} class="mb-4">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Groups")}
-            </div>
-            <div class="max-h-60 overflow-y-auto pr-2">
-              <fieldset
-                :for={group <- @groups}
-                class="grid grid-cols-[1fr_auto] items-center gap-3 py-2 border-0 border-b border-base-200 last:border-b-0 p-0 m-0 min-w-0"
-              >
-                <legend class="text-sm font-medium col-start-1 float-left w-auto">
-                  {group.name}
-                </legend>
-                <div class="join col-start-2">
-                  <label
-                    class={"#{group_filter_label_class(@group_filters, group.id, nil)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"group-filter-#{group.id}-all"}
-                  >
-                    <input
-                      type="radio"
-                      id={"group-filter-#{group.id}-all"}
-                      name={"#{@group_filter_prefix}#{group.id}"}
-                      value="all"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@group_filters, to_string(group.id)) == nil}
-                    />
-                    <span class="text-xs">{gettext("All")}</span>
-                  </label>
-                  <label
-                    class={"#{group_filter_label_class(@group_filters, group.id, :in)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"group-filter-#{group.id}-in"}
-                    aria-label={gettext("Yes")}
-                    title={gettext("Yes")}
-                  >
-                    <input
-                      type="radio"
-                      id={"group-filter-#{group.id}-in"}
-                      name={"#{@group_filter_prefix}#{group.id}"}
-                      value="in"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@group_filters, to_string(group.id)) == :in}
-                    />
-                    <.icon name="hero-check-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("Yes")}</span>
-                  </label>
-                  <label
-                    class={"#{group_filter_label_class(@group_filters, group.id, :not_in)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"group-filter-#{group.id}-not-in"}
-                    aria-label={gettext("No")}
-                    title={gettext("No")}
-                  >
-                    <input
-                      type="radio"
-                      id={"group-filter-#{group.id}-not-in"}
-                      name={"#{@group_filter_prefix}#{group.id}"}
-                      value="not_in"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@group_filters, to_string(group.id)) == :not_in}
-                    />
-                    <.icon name="hero-x-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("No")}</span>
-                  </label>
-                </div>
-              </fieldset>
-            </div>
-          </div>
-          
-    <!-- Fee Types: one row per fee type with All / Yes / No (same style as Groups) -->
-          <div :if={length(@fee_types) > 0} class="mb-4">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Fee types")}
-            </div>
-            <div class="max-h-60 overflow-y-auto pr-2">
-              <fieldset
-                :for={fee_type <- @fee_types}
-                class="grid grid-cols-[1fr_auto] items-center gap-3 py-2 border-0 border-b border-base-200 last:border-b-0 p-0 m-0 min-w-0"
-              >
-                <legend class="text-sm font-medium col-start-1 float-left w-auto">
-                  {fee_type.name}
-                </legend>
-                <div class="join col-start-2">
-                  <label
-                    class={"#{fee_type_filter_label_class(@fee_type_filters, fee_type.id, nil)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"fee-type-filter-#{fee_type.id}-all"}
-                  >
-                    <input
-                      type="radio"
-                      id={"fee-type-filter-#{fee_type.id}-all"}
-                      name={"#{@fee_type_filter_prefix}#{fee_type.id}"}
-                      value="all"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@fee_type_filters, to_string(fee_type.id)) == nil}
-                    />
-                    <span class="text-xs">{gettext("All")}</span>
-                  </label>
-                  <label
-                    class={"#{fee_type_filter_label_class(@fee_type_filters, fee_type.id, :in)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"fee-type-filter-#{fee_type.id}-in"}
-                    aria-label={gettext("Yes")}
-                    title={gettext("Yes")}
-                  >
-                    <input
-                      type="radio"
-                      id={"fee-type-filter-#{fee_type.id}-in"}
-                      name={"#{@fee_type_filter_prefix}#{fee_type.id}"}
-                      value="in"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@fee_type_filters, to_string(fee_type.id)) == :in}
-                    />
-                    <.icon name="hero-check-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("Yes")}</span>
-                  </label>
-                  <label
-                    class={"#{fee_type_filter_label_class(@fee_type_filters, fee_type.id, :not_in)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"fee-type-filter-#{fee_type.id}-not-in"}
-                    aria-label={gettext("No")}
-                    title={gettext("No")}
-                  >
-                    <input
-                      type="radio"
-                      id={"fee-type-filter-#{fee_type.id}-not-in"}
-                      name={"#{@fee_type_filter_prefix}#{fee_type.id}"}
-                      value="not_in"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@fee_type_filters, to_string(fee_type.id)) == :not_in}
-                    />
-                    <.icon name="hero-x-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("No")}</span>
-                  </label>
-                </div>
-              </fieldset>
-            </div>
-          </div>
-          
-    <!-- Dates Group (built-in fields: exit_date with mode selector, join_date range) -->
-          <div class="mb-4">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Dates")}
-            </div>
-            <fieldset class="border-0 p-0 m-0 min-w-0 mb-3">
-              <legend class="text-sm font-medium mb-1">
-                {gettext("Exit date")}
-              </legend>
-              <div class="join w-full">
-                <label
-                  class={"#{exit_mode_label_class(@date_filters, :active_only)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="ed-mode-active-only"
-                >
-                  <input
-                    type="radio"
-                    id="ed-mode-active-only"
-                    name="ed_mode"
-                    value="active_only"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={exit_mode(@date_filters) == :active_only}
-                  />
-                  <span class="text-xs">{gettext("Active only")}</span>
-                </label>
-                <label
-                  class={"#{exit_mode_label_class(@date_filters, :all)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="ed-mode-all"
-                >
-                  <input
-                    type="radio"
-                    id="ed-mode-all"
-                    name="ed_mode"
-                    value="all"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={exit_mode(@date_filters) == :all}
-                  />
-                  <span class="text-xs">{gettext("All")}</span>
-                </label>
-                <label
-                  class={"#{exit_mode_label_class(@date_filters, :inactive_only)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="ed-mode-inactive-only"
-                >
-                  <input
-                    type="radio"
-                    id="ed-mode-inactive-only"
-                    name="ed_mode"
-                    value="inactive_only"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={exit_mode(@date_filters) == :inactive_only}
-                  />
-                  <span class="text-xs">{gettext("Inactive only")}</span>
-                </label>
-                <label
-                  class={"#{exit_mode_label_class(@date_filters, :custom)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                  for="ed-mode-custom"
-                >
-                  <input
-                    type="radio"
-                    id="ed-mode-custom"
-                    name="ed_mode"
-                    value="custom"
-                    class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                    checked={exit_mode(@date_filters) == :custom}
-                  />
-                  <span class="text-xs">{gettext("Range")}</span>
-                </label>
-              </div>
-              <div
-                :if={exit_mode(@date_filters) == :custom}
-                class="mt-2 flex gap-3 items-end flex-wrap"
-              >
-                <.input
-                  type="date"
-                  id="ed-from"
-                  name="ed_from"
-                  label={gettext("From")}
-                  class="input input-sm input-bordered"
-                  aria-label={gettext("Exit date from")}
-                  value={date_value_for_input(@date_filters, :exit_date, :from)}
-                />
-                <.input
-                  type="date"
-                  id="ed-to"
-                  name="ed_to"
-                  label={gettext("To")}
-                  class="input input-sm input-bordered"
-                  aria-label={gettext("Exit date to")}
-                  value={date_value_for_input(@date_filters, :exit_date, :to)}
-                />
-              </div>
-            </fieldset>
-            <fieldset class="border-0 p-0 m-0 min-w-0">
-              <legend class="text-sm font-medium mb-1">
-                {gettext("Join date")}
-              </legend>
-              <div class="flex gap-3 items-end flex-wrap">
-                <.input
-                  type="date"
-                  id="jd-from"
-                  name="jd_from"
-                  label={gettext("From")}
-                  class="input input-sm input-bordered"
-                  aria-label={gettext("Join date from")}
-                  value={date_value_for_input(@date_filters, :join_date, :from)}
-                />
-                <.input
-                  type="date"
-                  id="jd-to"
-                  name="jd_to"
-                  label={gettext("To")}
-                  class="input input-sm input-bordered"
-                  aria-label={gettext("Join date to")}
-                  value={date_value_for_input(@date_filters, :join_date, :to)}
-                />
-              </div>
-            </fieldset>
-          </div>
-          
-    <!-- Custom Date Fields Group (in-memory filter; one row per :date custom field) -->
-          <div :if={length(@date_custom_fields) > 0} class="mb-4">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Custom date fields")}
-            </div>
-            <div class={
-              if length(@date_custom_fields) > 5, do: "max-h-60 overflow-y-auto pr-2", else: ""
-            }>
-              <fieldset
-                :for={field <- @date_custom_fields}
-                class="border-0 border-b border-base-200 last:border-b-0 p-0 m-0 min-w-0 py-2"
-              >
-                <legend class="text-sm font-medium mb-1">
-                  {field.name}
-                </legend>
-                <div class="flex gap-3 items-end flex-wrap">
-                  <.input
-                    type="date"
-                    id={"cdf-#{field.id}-from"}
-                    name={"#{@custom_date_filter_prefix}#{field.id}_from"}
-                    label={gettext("From")}
-                    class="input input-sm input-bordered"
-                    aria-label={gettext("%{field} from", field: field.name)}
-                    value={custom_date_value_for_input(@date_filters, field.id, :from)}
-                  />
-                  <.input
-                    type="date"
-                    id={"cdf-#{field.id}-to"}
-                    name={"#{@custom_date_filter_prefix}#{field.id}_to"}
-                    label={gettext("To")}
-                    class="input input-sm input-bordered"
-                    aria-label={gettext("%{field} to", field: field.name)}
-                    value={custom_date_value_for_input(@date_filters, field.id, :to)}
-                  />
-                </div>
-              </fieldset>
-            </div>
-          </div>
-          
-    <!-- Custom Fields Group -->
-          <div :if={length(@boolean_custom_fields) > 0} class="mb-2">
-            <div class="text-xs font-semibold opacity-70 mb-2 uppercase tracking-wider">
-              {gettext("Individual datafields")}
-            </div>
-            <div class="max-h-60 overflow-y-auto pr-2">
-              <fieldset
-                :for={custom_field <- @boolean_custom_fields}
-                class="grid grid-cols-[1fr_auto] items-center gap-3 py-2 border-0 border-b border-base-200 last:border-b-0 p-0 m-0 min-w-0"
-              >
-                <legend class="text-sm font-medium col-start-1 float-left w-auto">
-                  {custom_field.name}
-                </legend>
-                <div class="join col-start-2">
-                  <label
-                    class={"#{boolean_filter_label_class(@boolean_filters, custom_field.id, nil)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"custom-boolean-filter-#{custom_field.id}-all"}
-                  >
-                    <input
-                      type="radio"
-                      id={"custom-boolean-filter-#{custom_field.id}-all"}
-                      name={"custom_boolean[#{custom_field.id}]"}
-                      value="all"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@boolean_filters, to_string(custom_field.id)) == nil}
-                    />
-                    <span class="text-xs">{gettext("All")}</span>
-                  </label>
-                  <label
-                    class={"#{boolean_filter_label_class(@boolean_filters, custom_field.id, true)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"custom-boolean-filter-#{custom_field.id}-true"}
-                    aria-label={gettext("Yes")}
-                    title={gettext("Yes")}
-                  >
-                    <input
-                      type="radio"
-                      id={"custom-boolean-filter-#{custom_field.id}-true"}
-                      name={"custom_boolean[#{custom_field.id}]"}
-                      value="true"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@boolean_filters, to_string(custom_field.id)) == true}
-                    />
-                    <.icon name="hero-check-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("Yes")}</span>
-                  </label>
-                  <label
-                    class={"#{boolean_filter_label_class(@boolean_filters, custom_field.id, false)} has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-primary"}
-                    for={"custom-boolean-filter-#{custom_field.id}-false"}
-                    aria-label={gettext("No")}
-                    title={gettext("No")}
-                  >
-                    <input
-                      type="radio"
-                      id={"custom-boolean-filter-#{custom_field.id}-false"}
-                      name={"custom_boolean[#{custom_field.id}]"}
-                      value="false"
-                      class="absolute opacity-0 w-0 h-0 pointer-events-none"
-                      checked={Map.get(@boolean_filters, to_string(custom_field.id)) == false}
-                    />
-                    <.icon name="hero-x-circle" class="h-5 w-5" />
-                    <span class="text-xs">{gettext("No")}</span>
-                  </label>
-                </div>
-              </fieldset>
-            </div>
-          </div>
-          
-    <!-- Footer -->
-          <div class="mt-4 flex justify-between pt-3 border-t border-base-200">
-            <.button
-              type="button"
-              variant="neutral"
-              size="sm"
-              phx-click="reset_filters"
-              phx-target={@myself}
-            >
-              {gettext("Clear filters")}
-            </.button>
-            <.button
-              type="button"
-              variant="primary"
-              size="sm"
-              phx-click="close_dropdown"
-              phx-target={@myself}
-            >
-              {gettext("Close")}
-            </.button>
-          </div>
-        </form>
-      </div>
-    </div>
-    """
-  end
-
-  @impl true
-  def handle_event("toggle_dropdown", _params, socket) do
-    {:noreply, assign(socket, :open, !socket.assigns.open)}
-  end
-
-  @impl true
-  def handle_event("close_dropdown", _params, socket) do
-    {:noreply, assign(socket, :open, false)}
-  end
-
-  @impl true
-  def handle_event("update_filters", params, socket) do
-    payment_filter = parse_payment_filter(params)
-
-    group_filters_parsed =
-      FilterParams.parse_prefix_filters(
-        params,
-        @group_filter_prefix,
-        &FilterParams.parse_in_not_in_value/1
-      )
-
-    fee_type_filters_parsed =
-      FilterParams.parse_prefix_filters(
-        params,
-        @fee_type_filter_prefix,
-        &FilterParams.parse_in_not_in_value/1
-      )
-
-    custom_boolean_filters_parsed = parse_custom_boolean_filters(params)
-    new_date_filters = DateFilter.from_params(params, socket.assigns.date_custom_fields)
-
-    dispatch_payment_filter_change(socket, payment_filter)
-    dispatch_group_filter_changes(socket, group_filters_parsed)
-    dispatch_fee_type_filter_changes(socket, fee_type_filters_parsed)
-    dispatch_boolean_filter_changes(socket, custom_boolean_filters_parsed)
-    dispatch_date_filters_change(socket, new_date_filters)
-
-    {:noreply, socket}
-  end
-
-  @impl true
-  def handle_event("reset_filters", _params, socket) do
-    # Send single message to reset all filters at once (performance optimization)
-    # This avoids N×2 load_members() calls when resetting multiple filters
-    send(
-      self(),
-      {:reset_all_filters,
-       %{
-         cycle_status_filter: nil,
-         boolean_filters: %{},
-         group_filters: %{},
-         fee_type_filters: %{}
-       }}
-    )
-
-    # Close dropdown after reset
-    {:noreply, assign(socket, :open, false)}
-  end
-
-  # Parse tri-state filter value: "all" | "true" | "false" -> nil | true | false
-  defp parse_tri_state("true"), do: true
-  defp parse_tri_state("false"), do: false
-  defp parse_tri_state("all"), do: nil
-  defp parse_tri_state(_), do: nil
-
-  defp parse_payment_filter(params) do
-    case Map.get(params, "payment_filter") do
-      "paid" -> :paid
-      "unpaid" -> :unpaid
-      _ -> nil
-    end
-  end
-
-  defp parse_custom_boolean_filters(params) do
-    params
-    |> Map.get("custom_boolean", %{})
-    |> Enum.reduce(%{}, fn {id_str, value_str}, acc ->
-      Map.put(acc, id_str, parse_tri_state(value_str))
-    end)
-  end
-
-  defp dispatch_payment_filter_change(socket, payment_filter) do
-    if payment_filter != socket.assigns.cycle_status_filter do
-      send(self(), {:payment_filter_changed, payment_filter})
-    end
-  end
-
-  defp dispatch_group_filter_changes(socket, group_filters_parsed) do
-    current = socket.assigns.group_filters
-    valid_ids = MapSet.new(Enum.map(socket.assigns.groups, &to_string(&1.id)))
-
-    Enum.each(group_filters_parsed, fn {id_str, new_value} ->
-      if MapSet.member?(valid_ids, id_str) and Map.get(current, id_str) != new_value do
-        send(self(), {:group_filter_changed, id_str, new_value})
-      end
-    end)
-  end
-
-  defp dispatch_fee_type_filter_changes(socket, fee_type_filters_parsed) do
-    current = socket.assigns.fee_type_filters
-    valid_ids = MapSet.new(Enum.map(socket.assigns.fee_types, &to_string(&1.id)))
-
-    Enum.each(fee_type_filters_parsed, fn {id_str, new_value} ->
-      if MapSet.member?(valid_ids, id_str) and Map.get(current, id_str) != new_value do
-        send(self(), {:fee_type_filter_changed, id_str, new_value})
-      end
-    end)
-  end
-
-  defp dispatch_boolean_filter_changes(socket, custom_boolean_filters_parsed) do
-    current = socket.assigns.boolean_filters
-
-    Enum.each(custom_boolean_filters_parsed, fn {id_str, new_value} ->
-      if Map.get(current, id_str) != new_value do
-        send(self(), {:boolean_filter_changed, id_str, new_value})
-      end
-    end)
-  end
-
-  defp dispatch_date_filters_change(socket, new_date_filters) do
-    if new_date_filters != socket.assigns.date_filters do
-      send(self(), {:date_filters_changed, new_date_filters})
-    end
-  end
-
-  # Get display label for button
-  defp button_label(
-         cycle_status_filter,
-         groups,
-         group_filters,
-         fee_types,
-         fee_type_filters,
-         boolean_custom_fields,
-         boolean_filters,
-         date_filters
-       ) do
-    active_count =
-      count_active_filter_categories(
-        cycle_status_filter,
-        group_filters,
-        fee_type_filters,
-        boolean_filters,
-        date_filters
-      )
-
-    if active_count >= 2 do
-      ngettext("%{count} filter active", "%{count} filters active", active_count,
-        count: active_count
-      )
-    else
-      cond do
-        cycle_status_filter ->
-          payment_filter_label(cycle_status_filter)
-
-        map_size(group_filters) > 0 ->
-          group_filters_label(groups, group_filters)
-
-        map_size(fee_type_filters) > 0 ->
-          fee_type_filters_label(fee_types, fee_type_filters)
-
-        map_size(boolean_filters) > 0 ->
-          boolean_filter_label(boolean_custom_fields, boolean_filters)
-
-        date_filters_active?(date_filters) ->
-          gettext("Dates")
-
-        true ->
-          gettext("Apply filters")
-      end
-    end
-  end
-
-  defp count_active_filter_categories(
-         cycle_status_filter,
-         group_filters,
-         fee_type_filters,
-         boolean_filters,
-         date_filters
-       ) do
-    [
-      cycle_status_filter,
-      map_size(group_filters) > 0,
-      map_size(fee_type_filters) > 0,
-      map_size(boolean_filters) > 0,
-      date_filters_active?(date_filters)
-    ]
-    |> Enum.count(& &1)
-  end
-
-  # Date filter is "active" when its state differs from the default — i.e. the
-  # user selected something other than active-only with no custom date bounds.
-  defp date_filters_active?(date_filters) when is_map(date_filters) do
-    date_filters != DateFilter.default()
-  end
-
-  defp date_filters_active?(_), do: false
-
-  defp group_filters_label(_groups, group_filters) when map_size(group_filters) == 0,
-    do: gettext("All")
-
-  defp group_filters_label(groups, group_filters) do
-    groups_by_id = Map.new(groups, fn g -> {to_string(g.id), g.name} end)
-
-    names =
-      group_filters
-      |> Enum.map(fn {group_id_str, _} -> Map.get(groups_by_id, group_id_str) end)
-      |> Enum.reject(&is_nil/1)
-
-    label = Enum.join(names, ", ")
-    truncate_label(label, 30)
-  end
-
-  defp fee_type_filters_label(_fee_types, fee_type_filters) when map_size(fee_type_filters) == 0,
-    do: gettext("All")
-
-  defp fee_type_filters_label(fee_types, fee_type_filters) do
-    fee_types_by_id = Map.new(fee_types, fn ft -> {to_string(ft.id), ft.name} end)
-
-    parts =
-      fee_type_filters
-      |> Enum.map(fn {fee_type_id_str, value} ->
-        fee_type_filter_part(Map.get(fee_types_by_id, fee_type_id_str), value)
-      end)
-      |> Enum.reject(&is_nil/1)
-
-    label = Enum.join(parts, ", ")
-    truncate_label(label, 30)
-  end
-
-  defp fee_type_filter_part(nil, _value), do: nil
-
-  defp fee_type_filter_part(name, :not_in), do: gettext("without %{name}", name: name)
-  defp fee_type_filter_part(name, _), do: name
-
-  # Get payment filter label
-  defp payment_filter_label(nil), do: gettext("All")
-  defp payment_filter_label(:paid), do: gettext("Paid")
-  defp payment_filter_label(:unpaid), do: gettext("Unpaid")
-
-  # Get boolean filter label (comma-separated list of active filter names)
-  defp boolean_filter_label(_boolean_custom_fields, boolean_filters)
-       when map_size(boolean_filters) == 0 do
-    gettext("All")
-  end
-
-  defp boolean_filter_label(boolean_custom_fields, boolean_filters) do
-    # Get names of active boolean filters
-    active_filter_names =
-      boolean_filters
-      |> Enum.map(fn {custom_field_id_str, _value} ->
-        Enum.find(boolean_custom_fields, fn cf -> to_string(cf.id) == custom_field_id_str end)
-      end)
-      |> Enum.filter(&(&1 != nil))
-      |> Enum.map(& &1.name)
-
-    # Join with comma and truncate if too long
-    label = Enum.join(active_filter_names, ", ")
-    truncate_label(label, 30)
-  end
-
-  # Truncate label if longer than max_length
-  defp truncate_label(label, max_length) when byte_size(label) <= max_length, do: label
-
-  defp truncate_label(label, max_length) do
-    String.slice(label, 0, max_length) <> "..."
-  end
-
-  # Count active boolean filters
-  defp active_boolean_filters_count(boolean_filters) do
-    map_size(boolean_filters)
-  end
-
-  # Get CSS classes for payment filter label based on current state
-  defp payment_filter_label_class(current_filter, expected_value) do
-    base_classes = "join-item btn btn-sm"
-    is_active = current_filter == expected_value
-
-    cond do
-      # All button (nil expected)
-      expected_value == nil ->
-        if is_active do
-          "#{base_classes} btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      # Paid button
-      expected_value == :paid ->
-        if is_active do
-          "#{base_classes} btn-success btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      # Unpaid button
-      expected_value == :unpaid ->
-        if is_active do
-          "#{base_classes} btn-error btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      true ->
-        "#{base_classes} btn-outline"
-    end
-  end
-
-  # Shared CSS classes for in/not_in filter labels (groups and fee types)
-  defp in_not_in_filter_label_class(filters, id, expected_value) do
-    base_classes = "join-item btn btn-sm"
-    current_value = Map.get(filters, to_string(id))
-    is_active = current_value == expected_value
-
-    case {expected_value, is_active} do
-      {_, false} -> "#{base_classes} btn"
-      {nil, true} -> "#{base_classes} btn-active"
-      {:in, true} -> "#{base_classes} btn-success btn-active"
-      {:not_in, true} -> "#{base_classes} btn-error btn-active"
-    end
-  end
-
-  defp group_filter_label_class(group_filters, group_id, expected_value) do
-    in_not_in_filter_label_class(group_filters, group_id, expected_value)
-  end
-
-  defp fee_type_filter_label_class(fee_type_filters, fee_type_id, expected_value) do
-    in_not_in_filter_label_class(fee_type_filters, fee_type_id, expected_value)
-  end
-
-  # Get CSS classes for boolean filter label based on current state
-  defp boolean_filter_label_class(boolean_filters, custom_field_id, expected_value) do
-    base_classes = "join-item btn btn-sm"
-    current_value = Map.get(boolean_filters, to_string(custom_field_id))
-    is_active = current_value == expected_value
-
-    cond do
-      # All button (nil expected)
-      expected_value == nil ->
-        if is_active do
-          "#{base_classes} btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      # True button
-      expected_value == true ->
-        if is_active do
-          "#{base_classes} btn-success btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      # False button
-      expected_value == false ->
-        if is_active do
-          "#{base_classes} btn-error btn-active"
-        else
-          "#{base_classes} btn"
-        end
-
-      true ->
-        "#{base_classes} btn-outline"
-    end
-  end
-
-  # --- Date filter helpers ----------------------------------------------
-
-  defp exit_mode(%{exit_date: %{mode: mode}}), do: mode
-  defp exit_mode(_), do: :active_only
-
-  defp exit_mode_label_class(date_filters, expected) do
-    base_classes = "join-item btn btn-sm"
-
-    if exit_mode(date_filters) == expected do
-      "#{base_classes} btn-active"
-    else
-      "#{base_classes} btn"
-    end
-  end
-
-  defp date_value_for_input(date_filters, field, bound) do
-    case date_filters do
-      %{^field => %{^bound => %Date{} = d}} -> Date.to_iso8601(d)
-      _ -> ""
-    end
-  end
-
-  defp custom_date_value_for_input(date_filters, field_id, bound) do
-    key = to_string(field_id)
-
-    case Map.get(date_filters, key) do
-      %{^bound => %Date{} = d} -> Date.to_iso8601(d)
-      _ -> ""
-    end
-  end
-end
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 6933e005..b519aa2d 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -24,14 +24,14 @@ defmodule MvWeb.MemberLive.Index do
   - `select_row_and_navigate` - open a member's show page
   - `load_more` - fetch and append the next keyset page (infinite scroll)
   - `sort` - change the active sort column/direction
-  - `toggle_cycle_view` - switch the payment-status view between current and last cycle
   - `copy_emails` - copy emails of the selected members, or of the whole filtered set when none are selected
 
   ## Messages (`handle_info`, from the filter/search/view-settings components)
   - `search_changed`, `view_setting_toggled`, `field_toggled`, `fields_selected`,
-    `fields_reset`, `reset_all_filters`, and the per-filter change messages
-    (`group_filter_changed`, `fee_type_filter_changed`, `boolean_filter_changed`,
-    `date_filters_changed`, `payment_filter_changed`)
+    `fields_reset`, `reset_all_filters`, `clear_all_filters`, and the per-filter
+    change messages (`group_filter_changed`, `fee_type_filter_changed`,
+    `boolean_filter_changed`, `date_filters_changed`, `payment_filter_changed`,
+    `payment_period_changed`)
 
   ## Implementation Notes
   - Filtering/sorting/pagination run in PostgreSQL via Ash; the socket holds only
@@ -58,6 +58,7 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.MemberLive.Index.Formatter
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
   alias MvWeb.MemberLive.Index.OverviewQuery
+  alias MvWeb.MemberLive.Index.PaymentAging
   alias MvWeb.MemberLive.Index.ViewSettings
 
   require Ash.Query
@@ -174,7 +175,8 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:query, "")
       |> assign_new(:sort_field, fn -> :first_name end)
       |> assign_new(:sort_order, fn -> :asc end)
-      |> assign(:cycle_status_filter, nil)
+      |> assign(:payment_filter, nil)
+      |> assign(:payment_period, PaymentAging.default_period())
       |> assign(:group_filters, %{})
       |> assign(:groups, groups)
       |> assign(:fee_type_filters, %{})
@@ -203,8 +205,6 @@ defmodule MvWeb.MemberLive.Index do
         :member_fields_visible_computed,
         FieldVisibility.get_visible_member_fields_computed(initial_selection)
       )
-      |> assign(:show_current_cycle, false)
-      |> assign(:membership_fee_status_filter, nil)
       |> assign(:page, nil)
       |> assign(:after_cursor, nil)
       |> assign(:more?, false)
@@ -309,29 +309,6 @@ defmodule MvWeb.MemberLive.Index do
      |> update_selection_assigns()}
   end
 
-  @impl true
-  def handle_event("toggle_cycle_view", _params, socket) do
-    new_show_current = !socket.assigns.show_current_cycle
-
-    socket =
-      socket
-      |> assign(:show_current_cycle, new_show_current)
-      |> load_members()
-      |> scroll_list_to_top()
-      |> update_selection_assigns()
-
-    query_params =
-      build_query_params(opts_for_query_params(socket, %{show_current_cycle: new_show_current}))
-      |> maybe_add_field_selection(
-        socket.assigns[:user_field_selection],
-        socket.assigns[:fields_in_url?] || false
-      )
-
-    new_path = ~p"/members?#{query_params}"
-
-    {:noreply, push_reload(socket, new_path)}
-  end
-
   @impl true
   def handle_event("copy_emails", _params, socket) do
     # Recipients follow the current scope, re-queried from the DB so a no-selection
@@ -449,13 +426,13 @@ defmodule MvWeb.MemberLive.Index do
   def handle_info({:payment_filter_changed, filter}, socket) do
     socket =
       socket
-      |> assign(:cycle_status_filter, filter)
+      |> assign(:payment_filter, filter)
       |> load_members()
       |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
-      build_query_params(opts_for_query_params(socket, %{cycle_status_filter: filter}))
+      build_query_params(opts_for_query_params(socket, %{payment_filter: filter}))
       |> maybe_add_field_selection(
         socket.assigns[:user_field_selection],
         socket.assigns[:fields_in_url?] || false
@@ -465,6 +442,42 @@ defmodule MvWeb.MemberLive.Index do
     {:noreply, push_reload(socket, new_path)}
   end
 
+  @impl true
+  def handle_info({:payment_period_changed, period}, socket) do
+    socket =
+      socket
+      |> assign(:payment_period, period)
+      |> load_members()
+      |> scroll_list_to_top()
+      |> update_selection_assigns()
+
+    query_params =
+      build_query_params(opts_for_query_params(socket, %{payment_period: period}))
+      |> maybe_add_field_selection(
+        socket.assigns[:user_field_selection],
+        socket.assigns[:fields_in_url?] || false
+      )
+
+    new_path = ~p"/members?#{query_params}"
+    {:noreply, push_reload(socket, new_path)}
+  end
+
+  @impl true
+  def handle_info({:clear_all_filters}, socket) do
+    handle_info(
+      {:reset_all_filters,
+       %{
+         payment_filter: nil,
+         payment_period: PaymentAging.default_period(),
+         group_filters: %{},
+         fee_type_filters: %{},
+         boolean_filters: %{},
+         date_filters: DateFilter.default()
+       }},
+      socket
+    )
+  end
+
   @impl true
   def handle_info({:boolean_filter_changed, custom_field_id_str, filter_value}, socket) do
     updated_filters =
@@ -573,7 +586,8 @@ defmodule MvWeb.MemberLive.Index do
   def handle_info({:reset_all_filters, %{} = opts}, socket) do
     socket =
       socket
-      |> assign(:cycle_status_filter, Map.get(opts, :cycle_status_filter))
+      |> assign(:payment_filter, Map.get(opts, :payment_filter))
+      |> assign(:payment_period, Map.get(opts, :payment_period, PaymentAging.default_period()))
       |> assign(:group_filters, Map.get(opts, :group_filters, %{}))
       |> assign(:fee_type_filters, Map.get(opts, :fee_type_filters, %{}))
       |> assign(:boolean_custom_field_filters, Map.get(opts, :boolean_filters, %{}))
@@ -663,12 +677,12 @@ defmodule MvWeb.MemberLive.Index do
       socket
       |> maybe_update_search(params)
       |> maybe_update_sort(params)
-      |> maybe_update_cycle_status_filter(params)
+      |> maybe_update_payment_filter(params)
+      |> maybe_update_payment_period(params)
       |> maybe_update_group_filters(params)
       |> maybe_update_fee_type_filters(params)
       |> maybe_update_boolean_filters(params)
       |> maybe_update_date_filters(params)
-      |> maybe_update_show_current_cycle(params)
       |> assign(:fields_in_url?, fields_in_url?)
       |> assign(:query, params["query"])
       |> assign_visibility_derivations(final_selection)
@@ -712,10 +726,10 @@ defmodule MvWeb.MemberLive.Index do
       socket.assigns.query,
       socket.assigns.sort_field,
       socket.assigns.sort_order,
-      socket.assigns.cycle_status_filter,
+      socket.assigns.payment_filter,
+      socket.assigns.payment_period,
       socket.assigns[:group_filters],
       socket.assigns[:fee_type_filters],
-      socket.assigns.show_current_cycle,
       socket.assigns.boolean_custom_field_filters,
       socket.assigns.user_field_selection,
       socket.assigns[:visible_custom_field_ids] || [],
@@ -866,14 +880,21 @@ defmodule MvWeb.MemberLive.Index do
 
   defp build_query_params(opts) when is_map(opts) do
     base_params = build_base_params(opts.query, opts.sort_field, opts.sort_order)
-    base_params = add_cycle_status_filter(base_params, opts.cycle_status_filter)
     base_params = add_group_filters(base_params, opts.group_filters || %{})
     base_params = add_fee_type_filters(base_params, opts.fee_type_filters || %{})
-    base_params = add_show_current_cycle(base_params, opts.show_current_cycle)
+    base_params = add_payment_params(base_params, opts.payment_filter, opts.payment_period)
     base_params = add_boolean_filters(base_params, opts.boolean_filters || %{})
     add_date_filters(base_params, opts.date_filters)
   end
 
+  # Period-scoped payment model (§3.3): the payment-count filter and the active
+  # period both serialize into the flat URL contract (pay_filter/pay_from/pay_to).
+  defp add_payment_params(params, payment_filter, payment_period) do
+    params
+    |> Map.merge(PaymentAging.filter_to_params(payment_filter))
+    |> Map.merge(PaymentAging.to_params(payment_period || PaymentAging.default_period()))
+  end
+
   defp add_date_filters(params, date_filters) do
     Map.merge(params, DateFilter.to_params(date_filters))
   end
@@ -883,9 +904,9 @@ defmodule MvWeb.MemberLive.Index do
       query: socket.assigns.query,
       sort_field: socket.assigns.sort_field,
       sort_order: socket.assigns.sort_order,
-      cycle_status_filter: socket.assigns.cycle_status_filter,
+      payment_filter: socket.assigns.payment_filter,
+      payment_period: socket.assigns.payment_period,
       group_filters: socket.assigns[:group_filters] || %{},
-      show_current_cycle: socket.assigns.show_current_cycle,
       boolean_filters: socket.assigns.boolean_custom_field_filters || %{},
       fee_type_filters: socket.assigns[:fee_type_filters] || %{},
       date_filters: socket.assigns.date_filters
@@ -1187,17 +1208,6 @@ defmodule MvWeb.MemberLive.Index do
     end)
   end
 
-  defp add_cycle_status_filter(params, nil), do: params
-  defp add_cycle_status_filter(params, :paid), do: Map.put(params, "cycle_status_filter", "paid")
-
-  defp add_cycle_status_filter(params, :unpaid),
-    do: Map.put(params, "cycle_status_filter", "unpaid")
-
-  defp add_cycle_status_filter(params, _), do: params
-
-  defp add_show_current_cycle(params, true), do: Map.put(params, "show_current_cycle", "true")
-  defp add_show_current_cycle(params, _), do: params
-
   defp add_boolean_filters(params, boolean_filters) do
     Enum.reduce(boolean_filters, params, &add_boolean_filter/2)
   end
@@ -1319,10 +1329,19 @@ defmodule MvWeb.MemberLive.Index do
     |> Ash.Query.select(@overview_fields)
     |> load_custom_field_values(compute_ids_to_load(socket))
     |> MembershipFeeStatus.load_cycles_for_members()
+    |> load_unpaid_cycle_count(socket)
     |> Ash.Query.load(groups: [:id, :name, :slug])
     |> maybe_load_fee_type(socket)
   end
 
+  # Loads the period-scoped unpaid-cycle count for the overview payment column
+  # (§1.13, §3.3). The count is a DB aggregate over `membership_fee_cycles`
+  # (denormalized `cycle_end`), scoped to the active period.
+  defp load_unpaid_cycle_count(query, socket) do
+    %{from: from, to: to} = socket.assigns.payment_period || PaymentAging.default_period()
+    Ash.Query.load(query, unpaid_cycle_count: %{period_from: from, period_to: to})
+  end
+
   defp maybe_load_fee_type(query, socket) do
     if :membership_fee_type in socket.assigns.member_fields_visible or
          socket.assigns.sort_field in [:membership_fee_type, "membership_fee_type"] do
@@ -1345,8 +1364,8 @@ defmodule MvWeb.MemberLive.Index do
       boolean_custom_fields: socket.assigns.boolean_custom_fields,
       date_filters: socket.assigns.date_filters,
       date_custom_fields: socket.assigns[:date_custom_fields],
-      cycle_status_filter: socket.assigns.cycle_status_filter,
-      show_current_cycle: socket.assigns.show_current_cycle,
+      payment_filter: socket.assigns.payment_filter,
+      payment_period: socket.assigns.payment_period,
       sort_field: socket.assigns.sort_field,
       sort_order: socket.assigns.sort_order,
       custom_fields: socket.assigns.all_custom_fields
@@ -1550,13 +1569,14 @@ defmodule MvWeb.MemberLive.Index do
 
   defp maybe_update_search(socket, _params), do: socket
 
-  defp maybe_update_cycle_status_filter(socket, %{"cycle_status_filter" => filter_str}) do
-    filter = determine_cycle_status_filter(filter_str)
-    assign(socket, :cycle_status_filter, filter)
-  end
+  # Period-scoped payment model (§3.3): a payment-count filter plus the active
+  # period, both driven purely from the URL so `handle_params` stays the source
+  # of truth. Absent params fall back to no filter / the all-outstanding period.
+  defp maybe_update_payment_filter(socket, params),
+    do: assign(socket, :payment_filter, PaymentAging.parse_filter_params(params))
 
-  defp maybe_update_cycle_status_filter(socket, _params),
-    do: assign(socket, :cycle_status_filter, nil)
+  defp maybe_update_payment_period(socket, params),
+    do: assign(socket, :payment_period, PaymentAging.parse_period(params))
 
   defp maybe_update_group_filters(socket, params) when is_map(params) do
     prefix = @group_filter_prefix
@@ -1652,10 +1672,6 @@ defmodule MvWeb.MemberLive.Index do
 
   defp normalize_uuid_string(_), do: nil
 
-  defp determine_cycle_status_filter("paid"), do: :paid
-  defp determine_cycle_status_filter("unpaid"), do: :unpaid
-  defp determine_cycle_status_filter(_), do: nil
-
   defp maybe_update_boolean_filters(socket, params) do
     boolean_custom_fields =
       socket.assigns.all_custom_fields
@@ -1728,11 +1744,6 @@ defmodule MvWeb.MemberLive.Index do
   defp determine_boolean_filter("false"), do: false
   defp determine_boolean_filter(_), do: nil
 
-  defp maybe_update_show_current_cycle(socket, %{"show_current_cycle" => "true"}),
-    do: assign(socket, :show_current_cycle, true)
-
-  defp maybe_update_show_current_cycle(socket, _params), do: socket
-
   # URL params are the source of truth for filter state on every navigation.
   # When no date filter params are present, this falls through to the
   # active_only default — exactly the spec behavior for fresh load (§1.1).
@@ -1820,6 +1831,23 @@ defmodule MvWeb.MemberLive.Index do
 
   def format_date(date), do: DateFormatter.format_date(date)
 
+  @doc """
+  The payment column header, naming the active aging period (§1.17). The
+  all-outstanding default (both bounds nil) reads just "Payment"; a bounded
+  period appends the range so the scope is always legible.
+  """
+  def payment_column_label(%{from: nil, to: nil}), do: gettext("Fees")
+
+  def payment_column_label(%{from: from, to: to}) do
+    range = "#{payment_bound(from)}–#{payment_bound(to)}"
+    gettext("Fees · %{range}", range: range)
+  end
+
+  def payment_column_label(_), do: gettext("Fees")
+
+  defp payment_bound(%Date{} = d), do: Date.to_iso8601(d)
+  defp payment_bound(_), do: "…"
+
   defp update_selection_assigns(socket) do
     selected_members = socket.assigns.selected_members
     # The selection may span members beyond the loaded page (after select-all),
@@ -1939,7 +1967,7 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   defp selection_filters_active?(assigns) do
-    not is_nil(assigns[:cycle_status_filter]) or
+    not is_nil(assigns[:payment_filter]) or
       map_size(assigns[:group_filters] || %{}) > 0 or
       map_size(assigns[:fee_type_filters] || %{}) > 0 or
       map_size(assigns[:boolean_custom_field_filters] || %{}) > 0
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 7709c2cb..5a56e922 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -21,17 +21,38 @@
     </:actions>
   </.header>
 
-  <div class="flex flex-wrap gap-4 items-center">
+  <%!-- Two-row overview toolbar (Option C): row 1 is search + column/view
+  controls; row 2 is the dedicated filter row (add-filter + applied chips). --%>
+  <div class="flex flex-col gap-3">
+    <div class="flex flex-wrap gap-4 items-center">
+      <.live_component
+        module={MvWeb.Components.SearchBarComponent}
+        id="search-bar"
+        query={@query}
+        placeholder={gettext("Search...")}
+      />
+      <div class="ml-auto flex items-center gap-4">
+        <.live_component
+          module={MvWeb.Components.FieldVisibilityDropdownComponent}
+          id="field-visibility-dropdown"
+          all_fields={@all_available_fields}
+          custom_fields={@all_custom_fields}
+          selected_fields={@user_field_selection}
+        />
+        <.live_component
+          module={MvWeb.Components.ViewSettingsDropdownComponent}
+          id="view-settings-dropdown"
+          density={@density}
+          compact_member={@compact_member}
+          member_include_email={@member_include_email}
+          compact_address={@compact_address}
+        />
+      </div>
+    </div>
+
     <.live_component
-      module={MvWeb.Components.SearchBarComponent}
-      id="search-bar"
-      query={@query}
-      placeholder={gettext("Search...")}
-    />
-    <.live_component
-      module={MvWeb.Components.MemberFilterComponent}
+      module={MvWeb.Components.AddFilterBuilderComponent}
       id="member-filter"
-      cycle_status_filter={@cycle_status_filter}
       groups={@groups}
       group_filters={@group_filters}
       fee_types={@fee_types}
@@ -40,57 +61,9 @@
       boolean_filters={@boolean_custom_field_filters}
       date_custom_fields={@date_custom_fields}
       date_filters={@date_filters}
-      member_count={@total_count}
+      payment_filter={@payment_filter}
+      payment_period={@payment_period}
     />
-    <.tooltip
-      content={
-        gettext(
-          "Sets whether the payment status filter and the membership fee status column use the last completed or the current payment cycle."
-        )
-      }
-      position="top"
-    >
-      <.button
-        type="button"
-        variant="secondary"
-        class="gap-2"
-        active={@show_current_cycle}
-        aria-pressed={to_string(@show_current_cycle)}
-        phx-click="toggle_cycle_view"
-        data-testid="toggle-cycle-view"
-        aria-label={
-          if(@show_current_cycle,
-            do: gettext("Current payment cycle"),
-            else: gettext("Last payment cycle")
-          )
-        }
-      >
-        <.icon name="hero-arrow-path" class="h-5 w-5" />
-        <span class="hidden sm:inline">
-          {if(@show_current_cycle,
-            do: gettext("Current payment cycle"),
-            else: gettext("Last payment cycle")
-          )}
-        </span>
-      </.button>
-    </.tooltip>
-    <div class="ml-auto flex items-center gap-4">
-      <.live_component
-        module={MvWeb.Components.FieldVisibilityDropdownComponent}
-        id="field-visibility-dropdown"
-        all_fields={@all_available_fields}
-        custom_fields={@all_custom_fields}
-        selected_fields={@user_field_selection}
-      />
-      <.live_component
-        module={MvWeb.Components.ViewSettingsDropdownComponent}
-        id="view-settings-dropdown"
-        density={@density}
-        compact_member={@compact_member}
-        member_include_email={@member_include_email}
-        compact_address={@compact_address}
-      />
-    </div>
   </div>
 
   <%!-- Polite live region: present on first render (before it is filled) so
@@ -131,7 +104,6 @@
           JS.push("select_row_and_navigate", value: %{id: member.id})
         end
       }
-      row_tooltip={gettext("Click for member details")}
       row_selected?={fn member -> MapSet.member?(@selected_members, member.id) end}
       dynamic_cols={@dynamic_cols}
       sort_field={@sort_field}
@@ -484,17 +456,52 @@
       <:col
         :let={member}
         :if={:membership_fee_status in @member_fields_visible}
-        label={gettext("Membership Fee Status")}
+        label={MvWeb.MemberLive.Index.payment_column_label(@payment_period)}
       >
-        <%= if badge = MembershipFeeStatus.format_cycle_status_badge(
-        MembershipFeeStatus.get_cycle_status_for_member(member, @show_current_cycle)
-      ) do %>
-          <.badge variant={badge.variant}>
-            <.icon name={badge.icon} class="size-4" />
-            {badge.label}
-          </.badge>
-        <% else %>
-          <.empty_cell sr_text={gettext("No cycle")} />
+        <% count = member.unpaid_cycle_count || 0 %>
+        <% badge = PaymentAging.badge(count) %>
+        <% tip_id = "payment-tip-#{member.id}" %>
+        <button
+          type="button"
+          class={["badge badge-soft badge-md cursor-pointer", badge.color_class]}
+          data-variant={badge.variant}
+          phx-hook={count > 0 && "SortTooltip"}
+          id={"payment-badge-#{member.id}"}
+          data-tooltip-id={count > 0 && tip_id}
+          phx-click={JS.navigate(~p"/members/#{member.id}?tab=membership_fees")}
+          aria-label={gettext("%{label} — open payment history", label: badge.label)}
+          data-testid="payment-badge"
+        >
+          <.icon name={badge.icon} class="size-4" />
+          {badge.label}
+        </button>
+        <%= if count > 0 do %>
+          <% cycles = PaymentAging.open_cycles(member, @payment_period) %>
+          <% {shown, overflow} = PaymentAging.tooltip_cycles(cycles) %>
+          <div
+            id={tip_id}
+            popover="manual"
+            role="tooltip"
+            class="m-0 w-fit rounded-box border border-base-300 bg-base-100 p-2 text-sm shadow-xl"
+            data-testid="payment-tooltip"
+          >
+            <ul class="m-0 flex list-none flex-col items-stretch gap-1 p-0">
+              <li :for={cycle <- shown} class="flex">
+                <span class={[
+                  "badge badge-soft badge-sm w-full justify-start",
+                  PaymentAging.cycle_color_class(cycle.status)
+                ]}>
+                  <.icon name={PaymentAging.cycle_icon(cycle.status)} class="size-3.5" />
+                  {PaymentAging.short_period(cycle)}
+                </span>
+              </li>
+              <li :if={overflow > 0} class="flex">
+                <span class="badge badge-soft badge-sm badge-ghost w-full justify-start">
+                  {gettext("+%{count} more", count: overflow)}
+                </span>
+              </li>
+            </ul>
+          </div>
         <% end %>
       </:col>
       <:col
diff --git a/lib/mv_web/live/member_live/index/date_filter.ex b/lib/mv_web/live/member_live/index/date_filter.ex
index a26abae2..ca6ed704 100644
--- a/lib/mv_web/live/member_live/index/date_filter.ex
+++ b/lib/mv_web/live/member_live/index/date_filter.ex
@@ -100,7 +100,14 @@ defmodule MvWeb.MemberLive.Index.DateFilter do
   `exit_date` slice is touched; `join_date` and custom-date entries are left
   intact, so the quick filter and the detailed control share one source.
   """
-  @spec set_quick_state(map(), :active | :former | :all) :: map()
+  @spec set_quick_state(map(), :active | :former | :all) :: %{
+          :exit_date => %{
+            from: nil,
+            mode: :active_only | :inactive_only | :all,
+            to: nil
+          },
+          optional(any()) => any()
+        }
   def set_quick_state(filters, state)
       when is_map(filters) and state in [:active, :former, :all] do
     Map.put(filters, :exit_date, %{mode: Map.fetch!(@quick_to_mode, state), from: nil, to: nil})
diff --git a/lib/mv_web/live/member_live/index/export_payload.ex b/lib/mv_web/live/member_live/index/export_payload.ex
index 3c15c611..637da8a4 100644
--- a/lib/mv_web/live/member_live/index/export_payload.ex
+++ b/lib/mv_web/live/member_live/index/export_payload.ex
@@ -68,8 +68,12 @@ defmodule MvWeb.MemberLive.Index.ExportPayload do
       query: assigns[:query] || nil,
       sort_field: sort_field(assigns[:sort_field]),
       sort_order: sort_order(assigns[:sort_order]),
-      show_current_cycle: assigns[:show_current_cycle] || false,
-      cycle_status_filter: cycle_status_filter(assigns[:cycle_status_filter]),
+      # Decoupled from the removed overview current/last cycle toggle (§3.3): the
+      # export's fee-status column always uses the current cycle as its basis and
+      # applies no cycle-status row filter (the overview now filters payment via
+      # the period-scoped aging model, which the export does not mirror).
+      show_current_cycle: true,
+      cycle_status_filter: nil,
       boolean_filters: assigns[:boolean_custom_field_filters] || %{}
     }
   end
@@ -87,11 +91,6 @@ defmodule MvWeb.MemberLive.Index.ExportPayload do
   def sort_order(:desc), do: "desc"
   def sort_order(o) when is_binary(o), do: o
 
-  defp cycle_status_filter(nil), do: nil
-  defp cycle_status_filter(:paid), do: "paid"
-  defp cycle_status_filter(:unpaid), do: "unpaid"
-  defp cycle_status_filter(_), do: nil
-
   defp build_member_fields_list(ordered_db, member_fields_visible) do
     member_fields_visible = member_fields_visible || []
 
diff --git a/lib/mv_web/live/member_live/index/filter_descriptor.ex b/lib/mv_web/live/member_live/index/filter_descriptor.ex
index 96ecd801..0e80dc5a 100644
--- a/lib/mv_web/live/member_live/index/filter_descriptor.ex
+++ b/lib/mv_web/live/member_live/index/filter_descriptor.ex
@@ -65,7 +65,7 @@ defmodule MvWeb.MemberLive.Index.FilterDescriptor do
   def group_for(%{group: group}), do: group
 
   @doc "The fixed display order of the picker groups."
-  @spec group_order() :: [group()]
+  @spec group_order() :: [group(), ...]
   def group_order, do: @group_order
 
   @doc """
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index 1afe499b..a45dd077 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -47,17 +47,10 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     )
     |> apply_date_filters(opts[:date_filters])
     |> apply_custom_date_filters(opts[:date_filters], opts[:date_custom_fields])
-    |> apply_cycle_status_filter(
-      opts[:cycle_status_filter],
-      opts[:show_current_cycle],
-      today(opts)
-    )
     |> apply_payment_filter(opts[:payment_filter], payment_period(opts))
     |> apply_sort(opts[:sort_field], opts[:sort_order], opts[:custom_fields] || [])
   end
 
-  defp today(opts), do: opts[:today] || Date.utc_today()
-
   # ---------------------------------------------------------------------------
   # Search
   # ---------------------------------------------------------------------------
@@ -184,55 +177,6 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
 
   defp apply_one_boolean_filter(query, _uuid, _bool), do: query
 
-  # ---------------------------------------------------------------------------
-  # Cycle-status filter (paid/unpaid, current or last-completed cycle)
-  #
-  # Backed by the DB cycle-status aggregates (denormalized `cycle_end`). A member
-  # matches only when its selected-cycle status equals the requested status;
-  # members with no matching cycle (nil aggregate) are excluded — exactly as the
-  # previous in-memory classifier behaved.
-  # ---------------------------------------------------------------------------
-
-  defp apply_cycle_status_filter(query, status, _show_current, _today)
-       when status not in [:paid, :unpaid],
-       do: query
-
-  defp apply_cycle_status_filter(query, status, true = _show_current, today) do
-    # Current cycle: contains today; when several would, the one with the latest
-    # cycle_start wins. Keep members whose winning current cycle has `status`.
-    Ash.Query.filter(
-      query,
-      expr(
-        exists(
-          membership_fee_cycles,
-          cycle_start <= ^today and cycle_end >= ^today and status == ^status and
-            not exists(
-              member.membership_fee_cycles,
-              cycle_start <= ^today and cycle_end >= ^today and
-                cycle_start > parent(cycle_start)
-            )
-        )
-      )
-    )
-  end
-
-  defp apply_cycle_status_filter(query, status, _show_current, today) do
-    # Last completed cycle: most recent cycle that has ended (cycle_end < today).
-    Ash.Query.filter(
-      query,
-      expr(
-        exists(
-          membership_fee_cycles,
-          cycle_end < ^today and status == ^status and
-            not exists(
-              member.membership_fee_cycles,
-              cycle_end < ^today and cycle_start > parent(cycle_start)
-            )
-        )
-      )
-    )
-  end
-
   # ---------------------------------------------------------------------------
   # Payment aging filter (period-scoped unpaid-cycle count)
   #
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index 9dbe3e0c..e6154aa7 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -24,6 +24,7 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
   use Gettext, backend: MvWeb.Gettext
 
   alias Mv.Constants
+  alias MvWeb.Helpers.DateFormatter
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @type period :: %{from: Date.t() | nil, to: Date.t() | nil}
@@ -99,40 +100,111 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
     do: parse_filter(Map.get(params, @payment_filter_param))
 
   @doc """
-  Badge descriptor for an unpaid-cycle count. A count of 0 reads "Paid"
-  (success); a positive count reads "N unpaid" (error).
+  Badge descriptor for an unpaid-cycle count. A count of 0 reads "Alle bezahlt"
+  (success/green); a positive count reads "N offen" (error/red). Reuses the
+  established cycle-status color and hero-icon codes so the overview badge reads
+  consistently with the member show page.
   """
   @spec badge(non_neg_integer()) :: %{
           variant: atom(),
+          color_class: String.t(),
+          icon: String.t(),
           label: String.t(),
           count: non_neg_integer()
         }
-  def badge(0), do: %{variant: :success, label: gettext("Paid"), count: 0}
+  def badge(0) do
+    %{
+      variant: :success,
+      color_class: cycle_color_class(:paid),
+      icon: MembershipFeeHelpers.status_icon(:paid),
+      label: gettext("All paid"),
+      count: 0
+    }
+  end
 
   def badge(count) when is_integer(count) and count > 0 do
     %{
       variant: MembershipFeeHelpers.status_variant(:unpaid),
-      label: gettext("%{count} unpaid", count: count),
+      color_class: cycle_color_class(:unpaid),
+      icon: MembershipFeeHelpers.status_icon(:unpaid),
+      label: gettext("%{count} open", count: count),
       count: count
     }
   end
 
   @doc """
-  Splits a member's loaded cycles into the open (unpaid) and suspended cycles
-  whose `cycle_end` falls inside `period`, both sorted by `cycle_end`. Paid
-  cycles and cycles outside the period are dropped. Used to render the badge
-  tooltip. Expects `membership_fee_cycles` to be loaded on the member.
+  A member's open cycles for the badge tooltip: the unpaid and suspended cycles
+  whose `cycle_end` falls inside `period`, merged into a single list sorted
+  chronologically by `cycle_start`. Paid cycles and cycles outside the period
+  are dropped. Expects `membership_fee_cycles` to be loaded on the member.
   """
-  @spec open_cycles(map(), period()) :: %{unpaid: [map()], suspended: [map()]}
+  @spec open_cycles(map(), period()) :: [map()]
   def open_cycles(member, %{from: from, to: to}) do
-    cycles = in_period_cycles(member, from, to)
-
-    %{
-      unpaid: cycles |> Enum.filter(&(&1.status == :unpaid)) |> sort_by_end(),
-      suspended: cycles |> Enum.filter(&(&1.status == :suspended)) |> sort_by_end()
-    }
+    member
+    |> in_period_cycles(from, to)
+    |> Enum.filter(&(&1.status in [:unpaid, :suspended]))
+    |> Enum.sort_by(& &1.cycle_start, Date)
   end
 
+  @tooltip_slots 5
+
+  @doc """
+  Partitions open cycles into the tooltip's fixed five-slot budget: at most
+  five badges total. Five or fewer cycles show in full with no overflow. More
+  than five collapse to the first four chronological cycles plus a single
+  overflow count (total − 4), so the tooltip renders four cycle badges and one
+  grey overflow badge — five items.
+  """
+  @spec tooltip_cycles([map()]) :: {[map()], non_neg_integer()}
+  def tooltip_cycles(cycles) when is_list(cycles) do
+    if length(cycles) > @tooltip_slots do
+      {Enum.take(cycles, @tooltip_slots - 1), length(cycles) - (@tooltip_slots - 1)}
+    else
+      {cycles, 0}
+    end
+  end
+
+  @doc """
+  Static daisyUI badge color token for a cycle status, matching the codes used
+  on the member show page. Literal strings so Tailwind's content scanner keeps
+  them in the bundle (a runtime `badge-\#{status}` would be tree-shaken).
+  """
+  @spec cycle_color_class(:paid | :unpaid | :suspended) :: String.t()
+  def cycle_color_class(:paid), do: "badge-success"
+  def cycle_color_class(:unpaid), do: "badge-error"
+  def cycle_color_class(:suspended), do: "badge-warning"
+
+  @doc """
+  Hero-icon name for a cycle status (reuses the established status icons).
+  """
+  @spec cycle_icon(:paid | :unpaid | :suspended) :: String.t()
+  def cycle_icon(status), do: MembershipFeeHelpers.status_icon(status)
+
+  @doc """
+  Short, human-readable period label for a cycle, derived from its `cycle_start`
+  and the fee-type interval:
+
+    * yearly → `"2025"`
+    * quarterly → `"Q1 2026"`
+    * half-yearly → `"H1 2026"`
+    * monthly → `"März 2026"`
+
+  Falls back to a `dd.MM.yyyy–dd.MM.yyyy` date range when the interval is not
+  loaded/known.
+  """
+  @spec short_period(map()) :: String.t()
+  def short_period(%{cycle_start: %Date{} = start} = cycle) do
+    case cycle_interval(cycle) do
+      :yearly -> Integer.to_string(start.year)
+      :quarterly -> "Q#{quarter(start.month)} #{start.year}"
+      :half_yearly -> "H#{half(start.month)} #{start.year}"
+      :monthly -> "#{month_name(start.month)} #{start.year}"
+      _ -> cycle_date_range(cycle)
+    end
+  end
+
+  def short_period(cycle), do: cycle_date_range(cycle)
+
   defp in_period_cycles(member, from, to) do
     case Map.get(member, :membership_fee_cycles) do
       cycles when is_list(cycles) -> Enum.filter(cycles, &in_period?(&1.cycle_end, from, to))
@@ -147,7 +219,35 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   defp in_period?(_, _, _), do: false
 
-  defp sort_by_end(cycles), do: Enum.sort_by(cycles, & &1.cycle_end, Date)
+  defp cycle_interval(%{membership_fee_type: %{interval: interval}})
+       when interval in [:monthly, :quarterly, :half_yearly, :yearly],
+       do: interval
+
+  defp cycle_interval(_), do: nil
+
+  defp cycle_date_range(%{cycle_start: %Date{} = s, cycle_end: %Date{} = e}),
+    do: "#{DateFormatter.format_date(s)}–#{DateFormatter.format_date(e)}"
+
+  defp cycle_date_range(%{cycle_start: %Date{} = s}), do: DateFormatter.format_date(s)
+  defp cycle_date_range(_), do: ""
+
+  defp quarter(month), do: div(month - 1, 3) + 1
+
+  defp half(month) when month <= 6, do: 1
+  defp half(_month), do: 2
+
+  defp month_name(1), do: gettext("January")
+  defp month_name(2), do: gettext("February")
+  defp month_name(3), do: gettext("March")
+  defp month_name(4), do: gettext("April")
+  defp month_name(5), do: gettext("May")
+  defp month_name(6), do: gettext("June")
+  defp month_name(7), do: gettext("July")
+  defp month_name(8), do: gettext("August")
+  defp month_name(9), do: gettext("September")
+  defp month_name(10), do: gettext("October")
+  defp month_name(11), do: gettext("November")
+  defp month_name(12), do: gettext("December")
 
   defp maybe_put_date(params, _key, nil), do: params
 
diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex
index f1748591..d3979f46 100644
--- a/lib/mv_web/live/member_live/show.ex
+++ b/lib/mv_web/live/member_live/show.ex
@@ -424,7 +424,7 @@ defmodule MvWeb.MemberLive.Show do
   end
 
   @impl true
-  def handle_params(%{"id" => id}, _, socket) do
+  def handle_params(%{"id" => id} = params, _, socket) do
     actor = current_actor(socket)
 
     # Load custom fields once using assign_new to avoid repeated queries
@@ -463,9 +463,17 @@ defmodule MvWeb.MemberLive.Show do
     {:noreply,
      socket
      |> Layouts.assign_page_title(content_title)
-     |> assign(:member, member)}
+     |> assign(:member, member)
+     |> maybe_assign_tab(params)}
   end
 
+  # Deep-link support: the overview payment badge drills into the fees history
+  # via `?tab=membership_fees` (§1.15).
+  defp maybe_assign_tab(socket, %{"tab" => "membership_fees"}),
+    do: assign(socket, :active_tab, :membership_fees)
+
+  defp maybe_assign_tab(socket, _params), do: socket
+
   @impl true
   def handle_event("switch_tab", %{"tab" => "contact"}, socket) do
     {:noreply, assign(socket, :active_tab, :contact)}
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 8749a6a5..a8243b50 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -20,13 +20,6 @@ msgstr " (Datenfeld: %{field})"
 msgid "%{count} failed"
 msgstr "%{count} fehlgeschlagen"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{count} filter active"
-msgid_plural "%{count} filters active"
-msgstr[0] "%{count} Filter aktiv"
-msgstr[1] "%{count} Filter aktiv"
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{count} member has a value assigned for this datafield."
@@ -39,16 +32,6 @@ msgstr[1] "%{count} Mitglieder haben Werte für dieses benutzerdefinierte Feld z
 msgid "%{count} synced"
 msgstr "%{count} synchronisiert"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} from"
-msgstr "%{field} von"
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} to"
-msgstr "%{field} bis"
-
 #: lib/mv/membership/import/member_csv.ex
 #, elixir-autogen, elixir-format
 msgid "(ISO-8601 format: YYYY-MM-DD)"
@@ -106,7 +89,7 @@ msgstr "Aktionen"
 msgid "Active members"
 msgstr "Aktive Mitglieder"
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Active only"
 msgstr "Nur aktive"
@@ -149,7 +132,7 @@ msgid "Administration"
 msgstr "Administration"
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -210,11 +193,6 @@ msgstr "App-URL (Link zur Kontaktansicht)"
 msgid "Applicant data"
 msgstr "Angaben des Antragstellers"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Apply filters"
-msgstr "Filter auswählen"
-
 #: lib/mv_web/live/join_request_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Approve"
@@ -489,11 +467,6 @@ msgstr "CSV-Datei auswählen"
 msgid "City"
 msgstr "Stadt"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Clear filters"
-msgstr "Filter zurücksetzen"
-
 #: lib/mv_web/live/join_request_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Click for details"
@@ -504,11 +477,6 @@ msgstr "Klicken für Details"
 msgid "Click for group details"
 msgstr "Klicke für Gruppen-Details"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Click for member details"
-msgstr "Klicke für Mitglieds-Details"
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Click for role details"
@@ -550,11 +518,6 @@ msgstr "Client-ID"
 msgid "Client Secret"
 msgstr "Client-Geheimnis"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Close"
-msgstr "Schließen"
-
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Close sidebar"
@@ -816,11 +779,6 @@ msgstr "Aktueller Zyklus"
 msgid "Current amount"
 msgstr "Aktueller Betrag"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Current payment cycle"
-msgstr "Aktueller Zahlungszyklus"
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Custom"
@@ -831,11 +789,6 @@ msgstr "Benutzerdefiniert"
 msgid "Custom Fields"
 msgstr "Benutzerdefinierte Felder"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Custom date fields"
-msgstr "Benutzerdefinierte Datumsfelder"
-
 #: lib/mv_web/live/import_live/components.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -915,11 +868,6 @@ msgstr "Datenfelder"
 msgid "Date"
 msgstr "Datum"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Dates"
-msgstr "Daten"
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Deactivate"
@@ -1296,23 +1244,13 @@ msgstr "Beispiele"
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Exit date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Exit date from"
-msgstr "Austrittsdatum von"
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Exit date to"
-msgstr "Austrittsdatum bis"
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Exits"
@@ -1487,11 +1425,6 @@ msgstr "Beitragsart '%{name}' nicht gefunden; Standard-Beitragsart wird verwende
 msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
 msgstr "Beitragsart-Spalte (erkannte Spaltennamen): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unbekannte Beitragsarten erhalten die Standard-Beitragsart."
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fee types"
-msgstr "Beitragsarten"
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee types could not be loaded."
@@ -1508,11 +1441,6 @@ msgstr "Feld"
 msgid "Fields on the join form"
 msgstr "Felder im Beitrittsformular"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Filter members"
-msgstr "Mitglieder filtern"
-
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -1532,7 +1460,7 @@ msgstr "Vorname"
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr "Festgelegt nach der Erstellung. Mitglieder können nur zwischen Beitragsarten mit gleichem Intervall wechseln."
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "From"
 msgstr "Von"
@@ -1659,7 +1587,6 @@ msgid "Group saved successfully."
 msgstr "Gruppe erfolgreich gespeichert."
 
 #: lib/mv_web/components/layouts/sidebar.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
 #: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
@@ -1774,11 +1701,6 @@ msgstr "Import-Status fehlt. Chunk %{idx} kann nicht verarbeitet werden."
 msgid "Inactive members"
 msgstr "Inaktive Mitglieder"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Inactive only"
-msgstr "Nur ehemalige"
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
@@ -1814,7 +1736,6 @@ msgstr "Falsche E-Mail oder Passwort"
 msgid "Individual Datafields"
 msgstr "Individuelle Datenfelder"
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Individual datafields"
@@ -1907,22 +1828,11 @@ msgstr "Beitrittsformular"
 msgid "Join confirmation"
 msgstr "Beitrittsbestätigung"
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Join date"
 msgstr "Beitrittsdatum"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Join date from"
-msgstr "Beitrittsdatum von"
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Join date to"
-msgstr "Beitrittsdatum bis"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Join form enabled"
@@ -2012,11 +1922,6 @@ msgstr "Nachname"
 msgid "Last name"
 msgstr "Nachname"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Last payment cycle"
-msgstr "Letzter Zahlungszyklus"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Last sync result:"
@@ -2111,6 +2016,7 @@ msgstr "Als ausgesetzt markieren"
 msgid "Mark as unpaid"
 msgstr "Als unbezahlt markieren"
 
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "May"
@@ -2157,11 +2063,6 @@ msgstr "Mitgliedsfeld"
 msgid "Member field %{action} successfully"
 msgstr "Mitgliedsfeld wurde erfolgreich %{action}"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Member filter"
-msgstr "Mitgliedsfilter"
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Member is not in this group."
@@ -2247,7 +2148,6 @@ msgstr "Mitgliedsbeitrag"
 msgid "Membership Fee Start Date"
 msgstr "Startdatum Mitgliedsbeitrag"
 
-#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership Fee Status"
@@ -2411,7 +2311,7 @@ msgid "New amount"
 msgstr "Neuer Betrag"
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -2433,11 +2333,6 @@ msgstr "Für dieses Mitglied existiert kein Vereinfacht-Kontakt."
 msgid "No approved or rejected requests yet"
 msgstr "Noch keine genehmigten oder abgelehnten Anträge"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "No cycle"
-msgstr "Kein Zyklus"
-
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No cycles"
@@ -2697,9 +2592,7 @@ msgid "Options"
 msgstr "Optionen"
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
-#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -2734,16 +2627,6 @@ msgstr "Beitragsdaten"
 msgid "Payment Interval"
 msgstr "Zahlungsintervall"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Payment Status"
-msgstr "Bezahlstatus"
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Payments"
-msgstr "Zahlungen"
-
 #: lib/mv_web/live/join_request_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "Pending confirmation"
@@ -2842,7 +2725,7 @@ msgstr "Vierteljährlich"
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Zeitraum"
@@ -3266,11 +3149,6 @@ msgstr "Server nicht erreichbar. Host und Port prüfen."
 msgid "Set Password"
 msgstr "Passwort setzen"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Sets whether the payment status filter and the membership fee status column use the last completed or the current payment cycle."
-msgstr "Legt fest, ob Bezahlstatusfilter und Mitgliedsbeitragsstatus-Spalte den letzten abgeschlossenen oder den aktuellen Zahlungszyklus verwenden."
-
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Settings saved successfully."
@@ -3600,7 +3478,7 @@ msgstr "Diese*r Benutzer*in ist über SSO (Single Sign-On) verbunden. Ein hier f
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr "Tipp: E-Mail-Adressen ins BCC-Feld einfügen, für Datenschutzkonformität"
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "To"
 msgstr "Bis"
@@ -3700,7 +3578,6 @@ msgid "Unlinking scheduled"
 msgstr "Aufhebung der Verknüpfung geplant"
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
@@ -3906,7 +3783,7 @@ msgid "Yearly Interval - Joining Cycle Included"
 msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -4129,11 +4006,6 @@ msgstr "aktualisiert"
 msgid "updated"
 msgstr "aktualisiert"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "without %{name}"
-msgstr "ohne %{name}"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgctxt "action"
@@ -4218,22 +4090,284 @@ msgstr "Klicke, um nach Nachname zu sortieren"
 msgid "No address"
 msgstr "Keine Adresse"
 
-#: lib/mv_web/live/member_live/index/payment_aging.ex
-#, elixir-autogen, elixir-format
-msgid "%{count} unpaid"
-msgstr "%{count} unbezahlt"
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Active / former"
 msgstr "Aktiv / ehemalig"
 
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Group"
-msgstr "Gruppen"
+msgstr "Gruppe"
 
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Payment"
-msgstr "Zahlungen"
+msgstr "Zahlung"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{label} — open payment history"
+msgstr "%{label} — Zahlungsverlauf öffnen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active"
+msgstr "Aktiv"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Add filter"
+msgstr "Filter hinzufügen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "All (incl. former)"
+msgstr "Alle (inkl. ehemalige)"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Available filters"
+msgstr "Verfügbare Filter"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear all"
+msgstr "Alle löschen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Custom fields"
+msgstr "Eigene Felder"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Exited"
+msgstr "Ausgetreten"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: %{name}"
+msgstr "Beitragsart: %{name}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: not %{name}"
+msgstr "Beitragsart: nicht %{name}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter by …"
+msgstr "Filtern nach …"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former"
+msgstr "Ehemalig"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former only"
+msgstr "Nur ehemalige"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fully paid"
+msgstr "Vollständig bezahlt"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: %{name}"
+msgstr "Gruppe: %{name}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: not %{name}"
+msgstr "Gruppe: nicht %{name}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 1"
+msgstr "Offen ≥ 1"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 2"
+msgstr "Offen ≥ 2"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 3"
+msgstr "Offen ≥ 3"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Joined"
+msgstr "Beigetreten"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 30 days"
+msgstr "Letzte 30 Tage"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last year"
+msgstr "Letztes Jahr"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Membership"
+msgstr "Mitgliedschaft"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Payment status"
+msgstr "Zahlungsstatus"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period"
+msgstr "Zeitraum"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period from"
+msgstr "Zeitraum von"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period to"
+msgstr "Zeitraum bis"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Quick"
+msgstr "Schnellfilter"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Remove filter: %{label}"
+msgstr "Filter entfernen: %{label}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This month"
+msgstr "Dieser Monat"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This year"
+msgstr "Dieses Jahr"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "≥ %{n} unpaid"
+msgstr "≥ %{n} offen"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} open"
+msgstr "%{count} offen"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "+%{count} more"
+msgstr "+%{count} weitere"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "All paid"
+msgstr "Alle bezahlt"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "April"
+msgstr "April"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "August"
+msgstr "August"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "December"
+msgstr "Dezember"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "February"
+msgstr "Februar"
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees"
+msgstr "Beiträge"
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees · %{range}"
+msgstr "Beiträge · %{range}"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "January"
+msgstr "Januar"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "July"
+msgstr "Juli"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "June"
+msgstr "Juni"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "March"
+msgstr "März"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "November"
+msgstr "November"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "October"
+msgstr "Oktober"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "September"
+msgstr "September"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Click for member details"
+#~ msgstr "Klicke für Mitglieds-Details"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "No open cycles for this period"
+#~ msgstr "Keine offenen Zyklen in diesem Zeitraum"
+
+#~ #: lib/mv_web/live/member_live/index.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Payment · %{range}"
+#~ msgstr "Zahlung · %{range}"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Suspended: %{date}"
+#~ msgstr "Ausgesetzt: %{date}"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid until %{date}"
+#~ msgstr "Offen bis %{date}"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 2e1df9f5..9de292e9 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -21,13 +21,6 @@ msgstr ""
 msgid "%{count} failed"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{count} filter active"
-msgid_plural "%{count} filters active"
-msgstr[0] ""
-msgstr[1] ""
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format
 msgid "%{count} member has a value assigned for this datafield."
@@ -40,16 +33,6 @@ msgstr[1] ""
 msgid "%{count} synced"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} to"
-msgstr ""
-
 #: lib/mv/membership/import/member_csv.ex
 #, elixir-autogen, elixir-format
 msgid "(ISO-8601 format: YYYY-MM-DD)"
@@ -107,7 +90,7 @@ msgstr ""
 msgid "Active members"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Active only"
 msgstr ""
@@ -150,7 +133,7 @@ msgid "Administration"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -211,11 +194,6 @@ msgstr ""
 msgid "Applicant data"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Apply filters"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Approve"
@@ -490,11 +468,6 @@ msgstr ""
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Clear filters"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Click for details"
@@ -505,11 +478,6 @@ msgstr ""
 msgid "Click for group details"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Click for member details"
-msgstr ""
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Click for role details"
@@ -551,11 +519,6 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Close"
-msgstr ""
-
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Close sidebar"
@@ -817,11 +780,6 @@ msgstr ""
 msgid "Current amount"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Current payment cycle"
-msgstr ""
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Custom"
@@ -832,11 +790,6 @@ msgstr ""
 msgid "Custom Fields"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Custom date fields"
-msgstr ""
-
 #: lib/mv_web/live/import_live/components.ex
 #, elixir-autogen, elixir-format
 msgid "Custom field"
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Dates"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Deactivate"
@@ -1297,23 +1245,13 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Exit date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Exit date from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Exit date to"
-msgstr ""
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Exits"
@@ -1488,11 +1426,6 @@ msgstr ""
 msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fee types"
-msgstr ""
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee types could not be loaded."
@@ -1509,11 +1442,6 @@ msgstr ""
 msgid "Fields on the join form"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Filter members"
-msgstr ""
-
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -1533,7 +1461,7 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "From"
 msgstr ""
@@ -1660,7 +1588,6 @@ msgid "Group saved successfully."
 msgstr ""
 
 #: lib/mv_web/components/layouts/sidebar.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
 #: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
@@ -1775,11 +1702,6 @@ msgstr ""
 msgid "Inactive members"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Inactive only"
-msgstr ""
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
@@ -1815,7 +1737,6 @@ msgstr ""
 msgid "Individual Datafields"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Individual datafields"
@@ -1908,22 +1829,11 @@ msgstr ""
 msgid "Join confirmation"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Join date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Join date from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Join date to"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Join form enabled"
@@ -2013,11 +1923,6 @@ msgstr ""
 msgid "Last name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Last payment cycle"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Last sync result:"
@@ -2112,6 +2017,7 @@ msgstr ""
 msgid "Mark as unpaid"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "May"
@@ -2158,11 +2064,6 @@ msgstr ""
 msgid "Member field %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Member filter"
-msgstr ""
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Member is not in this group."
@@ -2248,7 +2149,6 @@ msgstr ""
 msgid "Membership Fee Start Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format
 msgid "Membership Fee Status"
@@ -2412,7 +2312,7 @@ msgid "New amount"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -2434,11 +2334,6 @@ msgstr ""
 msgid "No approved or rejected requests yet"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "No cycle"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No cycles"
@@ -2698,9 +2593,7 @@ msgid "Options"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
-#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -2735,16 +2628,6 @@ msgstr ""
 msgid "Payment Interval"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Payment Status"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Payments"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "Pending confirmation"
@@ -2843,7 +2726,7 @@ msgstr ""
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -3267,11 +3150,6 @@ msgstr ""
 msgid "Set Password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Sets whether the payment status filter and the membership fee status column use the last completed or the current payment cycle."
-msgstr ""
-
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings saved successfully."
@@ -3601,7 +3479,7 @@ msgstr ""
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "To"
 msgstr ""
@@ -3701,7 +3579,6 @@ msgid "Unlinking scheduled"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
@@ -3906,7 +3783,7 @@ msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -4129,11 +4006,6 @@ msgstr ""
 msgid "updated"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "without %{name}"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgctxt "action"
@@ -4218,11 +4090,7 @@ msgstr ""
 msgid "No address"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index/payment_aging.ex
-#, elixir-autogen, elixir-format
-msgid "%{count} unpaid"
-msgstr ""
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Active / former"
@@ -4233,7 +4101,248 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Payment"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{label} — open payment history"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Add filter"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "All (incl. former)"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Available filters"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear all"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Custom fields"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Exited"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: not %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter by …"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former only"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fully paid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: not %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 1"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 2"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 3"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Joined"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 30 days"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last year"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Membership"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Payment status"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period from"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period to"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Quick"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Remove filter: %{label}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This month"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This year"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "≥ %{n} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "%{count} open"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "+%{count} more"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "All paid"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "April"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "August"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "December"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "February"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees · %{range}"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "January"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "July"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "June"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "March"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "November"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "October"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "September"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index faec9b03..427fb998 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -21,13 +21,6 @@ msgstr ""
 msgid "%{count} failed"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{count} filter active"
-msgid_plural "%{count} filters active"
-msgstr[0] "%{count} filter active"
-msgstr[1] "%{count} filters active"
-
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{count} member has a value assigned for this datafield."
@@ -40,16 +33,6 @@ msgstr[1] ""
 msgid "%{count} synced"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "%{field} to"
-msgstr ""
-
 #: lib/mv/membership/import/member_csv.ex
 #, elixir-autogen, elixir-format
 msgid "(ISO-8601 format: YYYY-MM-DD)"
@@ -107,7 +90,7 @@ msgstr ""
 msgid "Active members"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Active only"
 msgstr ""
@@ -150,7 +133,7 @@ msgid "Administration"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -211,11 +194,6 @@ msgstr ""
 msgid "Applicant data"
 msgstr "Applicant data"
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Apply filters"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Approve"
@@ -490,11 +468,6 @@ msgstr ""
 msgid "City"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Clear filters"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Click for details"
@@ -505,11 +478,6 @@ msgstr "Click for details"
 msgid "Click for group details"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Click for member details"
-msgstr ""
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "Click for role details"
@@ -551,11 +519,6 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Close"
-msgstr ""
-
 #: lib/mv_web/components/layouts/sidebar.ex
 #, elixir-autogen, elixir-format
 msgid "Close sidebar"
@@ -817,11 +780,6 @@ msgstr ""
 msgid "Current amount"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Current payment cycle"
-msgstr "Current payment cycle"
-
 #: lib/mv_web/live/role_live/index.html.heex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom"
@@ -832,11 +790,6 @@ msgstr ""
 msgid "Custom Fields"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Custom date fields"
-msgstr ""
-
 #: lib/mv_web/live/import_live/components.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Custom field"
@@ -916,11 +869,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Dates"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Deactivate"
@@ -1297,23 +1245,13 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Exit date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Exit date from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Exit date to"
-msgstr ""
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Exits"
@@ -1488,11 +1426,6 @@ msgstr ""
 msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fee types"
-msgstr "Fee types"
-
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee types could not be loaded."
@@ -1509,11 +1442,6 @@ msgstr ""
 msgid "Fields on the join form"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Filter members"
-msgstr ""
-
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -1533,7 +1461,7 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "From"
 msgstr ""
@@ -1660,7 +1588,6 @@ msgid "Group saved successfully."
 msgstr ""
 
 #: lib/mv_web/components/layouts/sidebar.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
 #: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
@@ -1775,11 +1702,6 @@ msgstr ""
 msgid "Inactive members"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Inactive only"
-msgstr ""
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "Include both letters and numbers"
@@ -1815,7 +1737,6 @@ msgstr ""
 msgid "Individual Datafields"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Individual datafields"
@@ -1908,22 +1829,11 @@ msgstr ""
 msgid "Join confirmation"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Join date"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Join date from"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Join date to"
-msgstr ""
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Join form enabled"
@@ -2013,11 +1923,6 @@ msgstr ""
 msgid "Last name"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Last payment cycle"
-msgstr "Last payment cycle"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Last sync result:"
@@ -2112,6 +2017,7 @@ msgstr ""
 msgid "Mark as unpaid"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #, elixir-autogen, elixir-format
 msgid "May"
@@ -2158,11 +2064,6 @@ msgstr ""
 msgid "Member field %{action} successfully"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Member filter"
-msgstr ""
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Member is not in this group."
@@ -2248,7 +2149,6 @@ msgstr ""
 msgid "Membership Fee Start Date"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/translations/member_fields.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Membership Fee Status"
@@ -2412,7 +2312,7 @@ msgid "New amount"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -2434,11 +2334,6 @@ msgstr ""
 msgid "No approved or rejected requests yet"
 msgstr "No approved or rejected requests yet"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "No cycle"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "No cycles"
@@ -2698,9 +2593,7 @@ msgid "Options"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
-#: lib/mv_web/live/member_live/index/payment_aging.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
 #: lib/mv_web/live/statistics_live.ex
@@ -2735,16 +2628,6 @@ msgstr ""
 msgid "Payment Interval"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Payment Status"
-msgstr ""
-
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "Payments"
-msgstr ""
-
 #: lib/mv_web/live/join_request_live/helpers.ex
 #, elixir-autogen, elixir-format
 msgid "Pending confirmation"
@@ -2843,7 +2726,7 @@ msgstr ""
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -3267,11 +3150,6 @@ msgstr ""
 msgid "Set Password"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "Sets whether the payment status filter and the membership fee status column use the last completed or the current payment cycle."
-msgstr "Sets whether the payment status filter and the membership fee status column use the last completed or the current payment cycle."
-
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Settings saved successfully."
@@ -3601,7 +3479,7 @@ msgstr ""
 msgid "Tip: Paste email addresses into the BCC field for privacy compliance"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "To"
 msgstr ""
@@ -3701,7 +3579,6 @@ msgid "Unlinking scheduled"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
-#: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
@@ -3906,7 +3783,7 @@ msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
 
 #: lib/mv_web/components/core_components.ex
-#: lib/mv_web/live/components/member_filter_component.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/join_request_live/show.ex
 #: lib/mv_web/live/member_field_live/index_component.ex
@@ -4129,11 +4006,6 @@ msgstr ""
 msgid "updated"
 msgstr ""
 
-#: lib/mv_web/live/components/member_filter_component.ex
-#, elixir-autogen, elixir-format
-msgid "without %{name}"
-msgstr "without %{name}"
-
 #: lib/mv_web/live/global_settings_live.ex
 #, elixir-autogen, elixir-format
 msgctxt "action"
@@ -4218,22 +4090,284 @@ msgstr ""
 msgid "No address"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index/payment_aging.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "%{count} unpaid"
-msgstr ""
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Active / former"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Group"
 msgstr ""
 
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Payment"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{label} — open payment history"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Add filter"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "All (incl. former)"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Available filters"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Clear all"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Custom fields"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Exited"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type: not %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter by …"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Former only"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Fully paid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Group: not %{name}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 1"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 2"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Has unpaid ≥ 3"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Joined"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 30 days"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last year"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Membership"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Payment status"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period from"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Period to"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Quick"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Remove filter: %{label}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This month"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This year"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "≥ %{n} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{count} open"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "+%{count} more"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "All paid"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "April"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "August"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "December"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "February"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.ex
+#, elixir-autogen, elixir-format
+msgid "Fees · %{range}"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "January"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "July"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "June"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "March"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "November"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "October"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "September"
+msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Click for member details"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "No open cycles for this period"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Payment · %{range}"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Suspended: %{date}"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Unpaid until %{date}"
+#~ msgstr ""
diff --git a/test/mv_web/components/member_filter_component_test.exs b/test/mv_web/components/member_filter_component_test.exs
deleted file mode 100644
index b93acccb..00000000
--- a/test/mv_web/components/member_filter_component_test.exs
+++ /dev/null
@@ -1,660 +0,0 @@
-defmodule MvWeb.Components.MemberFilterComponentTest do
-  @moduledoc """
-  Unit tests for the MemberFilterComponent.
-
-  Tests cover:
-  - Rendering Payment Filter and Boolean Custom Fields
-  - Boolean filter selection and event emission
-  - Button label and badge logic
-  - Filtering to show only boolean custom fields
-  """
-  # Kept async: false. The deferrable-FK migration removed the concurrent
-  # create_member deadlock, but this file additionally showed an async-isolation
-  # failure under load (filtered members from a parallel test leaking in), so it
-  # is not trivially async-safe; resolving that is a separate follow-up.
-  use MvWeb.ConnCase, async: false
-
-  use Gettext, backend: MvWeb.Gettext
-
-  import Phoenix.LiveViewTest
-
-  alias Mv.Membership.CustomField
-
-  # Helper to create a boolean custom field (uses system_actor - only admin can create)
-  defp create_boolean_custom_field(attrs \\ %{}) do
-    system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-    default_attrs = %{
-      name: "test_boolean_#{System.unique_integer([:positive])}",
-      value_type: :boolean
-    }
-
-    attrs = Map.merge(default_attrs, attrs)
-
-    CustomField
-    |> Ash.Changeset.for_create(:create, attrs)
-    |> Ash.create!(actor: system_actor)
-  end
-
-  # Helper to create a non-boolean custom field (uses system_actor - only admin can create)
-  defp create_string_custom_field(attrs \\ %{}) do
-    system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-    default_attrs = %{
-      name: "test_string_#{System.unique_integer([:positive])}",
-      value_type: :string
-    }
-
-    attrs = Map.merge(default_attrs, attrs)
-
-    CustomField
-    |> Ash.Changeset.for_create(:create, attrs)
-    |> Ash.create!(actor: system_actor)
-  end
-
-  describe "rendering" do
-    test "trigger carries a trailing chevron affordance", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, _view, html} = live(conn, "/members")
-
-      # Mirror the shared dropdown affordance: a trailing chevron inside the
-      # bespoke filter trigger button.
-      chevron =
-        html
-        |> LazyHTML.from_fragment()
-        |> LazyHTML.query(~s(#member-filter button[aria-haspopup="true"] .hero-chevron-down))
-
-      assert Enum.count(chevron) == 1
-    end
-
-    test "renders boolean custom fields when present", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field = create_boolean_custom_field(%{name: "Active Member"})
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Should show the boolean custom field name in the dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      html = render(view)
-      assert html =~ boolean_field.name
-    end
-
-    test "renders payment and custom fields groups when boolean fields exist", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      _boolean_field = create_boolean_custom_field()
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      html = render(view)
-      # Should have both "Payments" and "Custom Fields" group labels
-      assert html =~ gettext("Payments") || html =~ "Payment"
-      assert html =~ gettext("Individual datafields")
-    end
-
-    test "renders only payment filter when no boolean custom fields exist", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      # Create a non-boolean field to ensure it's not shown
-      _string_field = create_string_custom_field()
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Component should exist with correct ID
-      assert has_element?(view, "#member-filter")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      html = render(view)
-
-      # Should show payment filter options (check both English and translated)
-      assert html =~ "All" || html =~ gettext("All")
-      assert html =~ "Paid" || html =~ gettext("Paid")
-      assert html =~ "Unpaid" || html =~ gettext("Unpaid")
-
-      # Should not show any boolean field names (since none exist)
-      # We can't easily check this without knowing field names, but the structure should be correct
-    end
-  end
-
-  describe "boolean filter selection" do
-    test "selecting boolean filter sends correct event", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field = create_boolean_custom_field(%{name: "Newsletter"})
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      # Select "True" option for the boolean field using radio input
-      # Radio inputs trigger phx-change on the form, so we use render_change on the form
-      view
-      |> form("#member-filter form", %{
-        "custom_boolean" => %{to_string(boolean_field.id) => "true"}
-      })
-      |> render_change()
-
-      # The event should be sent to the parent LiveView
-      # We verify this by checking that the URL is updated
-      assert_patch(view)
-    end
-
-    test "payment filter still works after component extension", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      _boolean_field = create_boolean_custom_field()
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      # Select "Paid" option using radio input
-      # Radio inputs trigger phx-change on the form, so we use render_change on the form
-      view
-      |> form("#member-filter form", %{"payment_filter" => "paid"})
-      |> render_change()
-
-      # URL should be updated with cycle_status_filter=paid
-      path = assert_patch(view)
-      assert path =~ "cycle_status_filter=paid"
-    end
-  end
-
-  describe "button label" do
-    test "shows active boolean filter names in button label", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field1 = create_boolean_custom_field(%{name: "Active Member"})
-      boolean_field2 = create_boolean_custom_field(%{name: "Newsletter"})
-
-      # Set filters via URL
-      {:ok, view, _html} =
-        live(
-          conn,
-          "/members?bf_#{boolean_field1.id}=true&bf_#{boolean_field2.id}=false"
-        )
-
-      # Component should exist
-      assert has_element?(view, "#member-filter")
-
-      # Button label should contain the custom field names
-      # The exact format depends on implementation, but should show active filters
-      button_html =
-        view
-        |> element("#member-filter button[aria-haspopup='true']")
-        |> render()
-
-      assert button_html =~ boolean_field1.name || button_html =~ boolean_field2.name
-    end
-
-    test "truncates long custom field names in button label", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      # Create field with very long name (>30 characters)
-      long_name = String.duplicate("A", 50)
-      boolean_field = create_boolean_custom_field(%{name: long_name})
-
-      # Set filter via URL
-      {:ok, view, _html} =
-        live(conn, "/members?bf_#{boolean_field.id}=true")
-
-      # Component should exist
-      assert has_element?(view, "#member-filter")
-
-      # Get button label text
-      button_html =
-        view
-        |> element("#member-filter button[aria-haspopup='true']")
-        |> render()
-
-      # Button label should be truncated - full name should NOT appear in button
-      # (it may appear in dropdown when opened, but not in the button label itself)
-      # Check that button doesn't contain the full 50-character name
-      refute button_html =~ long_name
-
-      # Button should still contain some text (truncated version or indicator)
-      assert String.length(button_html) > 0
-    end
-
-    test "date-only activation (ed_mode=all) replaces the idle label", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?ed_mode=all")
-
-      button_html =
-        view
-        |> element("#member-filter button[aria-haspopup='true']")
-        |> render()
-
-      # The idle label must not appear; some non-idle label is shown. This is
-      # the same observable contract as the other filter categories — the
-      # button visually communicates "a filter is active". The `btn-active`
-      # CSS class is set by the parent class= attribute but the `<.button>`
-      # core component currently composes its own class string and drops the
-      # caller-supplied one — that is a pre-existing component constraint, not
-      # specific to date filters.
-      refute button_html =~ gettext("Apply filters")
-    end
-
-    test "date-only activation (jd_from) replaces the idle label", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?jd_from=2024-01-15")
-
-      button_html =
-        view
-        |> element("#member-filter button[aria-haspopup='true']")
-        |> render()
-
-      refute button_html =~ gettext("Apply filters")
-    end
-
-    test "date filter combined with one other filter shows '2 filters active'", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field = create_boolean_custom_field(%{name: "Newsletter"})
-
-      {:ok, view, _html} =
-        live(conn, "/members?ed_mode=all&bf_#{boolean_field.id}=true")
-
-      button_html =
-        view
-        |> element("#member-filter button[aria-haspopup='true']")
-        |> render()
-
-      # With two distinct filter categories active, the label switches to the
-      # pluralized "N filters active" form. Without counting date filters as
-      # a category, this would show only "1 filter active" or the boolean
-      # field name.
-      assert button_html =~ "2"
-      assert button_html =~ gettext("filters active")
-    end
-  end
-
-  describe "badge" do
-    test "shows total count of active boolean filters in badge", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field1 = create_boolean_custom_field(%{name: "Field1"})
-      boolean_field2 = create_boolean_custom_field(%{name: "Field2"})
-
-      # Set two filters via URL
-      {:ok, view, _html} =
-        live(
-          conn,
-          "/members?bf_#{boolean_field1.id}=true&bf_#{boolean_field2.id}=false"
-        )
-
-      # Component should exist
-      assert has_element?(view, "#member-filter")
-
-      # Badge should be visible when boolean filters are active
-      assert has_element?(view, "#member-filter .badge")
-
-      # Badge should show count of active boolean filters (2 in this case)
-      badge_html =
-        view
-        |> element("#member-filter .badge")
-        |> render()
-
-      assert badge_html =~ "2"
-    end
-  end
-
-  describe "filtering" do
-    test "only boolean custom fields are displayed, not string or integer fields", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      boolean_field = create_boolean_custom_field(%{name: "Boolean Field"})
-      _string_field = create_string_custom_field(%{name: "String Field"})
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      # Should show boolean field in the dropdown panel
-      # Extract only the dropdown panel HTML to check
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      # Should show boolean field in dropdown
-      assert dropdown_html =~ boolean_field.name
-
-      # Should not show string field name in the filter dropdown
-      # (String fields should not appear in boolean filter section)
-      refute dropdown_html =~ "String Field"
-    end
-
-    test "renders the Dates section with exit_date and join_date controls", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      assert dropdown_html =~ gettext("Dates")
-      assert dropdown_html =~ gettext("Join date")
-      assert dropdown_html =~ gettext("Exit date")
-      # Exit-date segmented control modes.
-      assert dropdown_html =~ gettext("Active only")
-      assert dropdown_html =~ gettext("Inactive only")
-      # Built-in date inputs (always present for join_date and the ed_mode selector).
-      assert dropdown_html =~ ~s(name="jd_from")
-      assert dropdown_html =~ ~s(name="jd_to")
-      assert dropdown_html =~ ~s(name="ed_mode")
-    end
-
-    test "exit_date custom mode reveals ed_from and ed_to inputs", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?ed_mode=custom")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      assert dropdown_html =~ ~s(name="ed_from")
-      assert dropdown_html =~ ~s(name="ed_to")
-    end
-
-    test "date inputs render via MvWeb.CoreComponents.input (no raw DaisyUI input markup)",
-         %{conn: conn} do
-      # DESIGN_GUIDELINES §1.1 mandates that LiveViews/HEEX use the project's
-      # `<.input>` wrapper rather than emitting raw `<input>` tags carrying
-      # DaisyUI component classes (e.g. `input input-sm input-bordered`)
-      # directly in HEEX. `<.input>` is the project's single source of truth
-      # for input styling; bypassing it splits styling across many call sites.
-      #
-      # The recognizable structural fingerprint of `<.input>` is a wrapping
-      # `<fieldset class="mb-2 fieldset">` `<label>` chain immediately
-      # preceding the `<input>`. The raw inline form has no such wrapper —
-      # the input sits directly inside a sibling `<label>`/`<input>` flex row.
-      # We assert that fingerprint on each of the date inputs.
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members?ed_mode=custom")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      for name <- ["jd_from", "jd_to", "ed_from", "ed_to"] do
-        # Match `<fieldset class="mb-2 fieldset">` followed (within a short
-        # window of HTML) by an `<input>` carrying the expected `name`. The
-        # window prevents the regex from spanning unrelated `mb-2` /
-        # `fieldset` occurrences scattered across the dropdown. The wrapper
-        # is the canonical fingerprint of `MvWeb.CoreComponents.input/1`
-        # (see `lib/mv_web/components/core_components.ex` — every input
-        # branch starts with `<fieldset class="mb-2 fieldset">`).
-        assert Regex.match?(
-                 ~r/<fieldset[^>]*class="mb-2 fieldset"[^>]*>\s*<label[^>]*>(?:\s*<span[^>]*>.*?<\/span>)?\s*<input[^>]*name="#{name}"/s,
-                 dropdown_html
-               ),
-               "expected date input #{name} to be wrapped by MvWeb.CoreComponents.input " <>
-                 "(class=\"mb-2 fieldset\" fieldset wrapper), not a raw inline " <>
-                 "<input type=\"date\"> element"
-      end
-    end
-
-    test "exit_date defaults to :active_only in the rendered radio", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      assert dropdown_html =~
-               ~r/name="ed_mode"[^>]*value="active_only"[^>]*checked|checked[^>]*name="ed_mode"[^>]*value="active_only"/
-    end
-
-    test "Custom date fields section is non-scrollable with 5 or fewer fields (§3.4)", %{
-      conn: conn
-    } do
-      conn = conn_with_oidc_user(conn)
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      for i <- 1..5 do
-        CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "DateField-#{i}-#{System.unique_integer([:positive])}",
-          value_type: :date
-        })
-        |> Ash.create!(actor: system_actor)
-      end
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      section_html = custom_date_section_html(view)
-
-      # With ≤ 5 fields the section must NOT carry the scrollable wrapper.
-      refute section_html =~ "max-h-60"
-      refute section_html =~ "overflow-y-auto"
-    end
-
-    test "Custom date fields section becomes scrollable with more than 5 fields (§3.4)", %{
-      conn: conn
-    } do
-      conn = conn_with_oidc_user(conn)
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      for i <- 1..6 do
-        CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "DateField-#{i}-#{System.unique_integer([:positive])}",
-          value_type: :date
-        })
-        |> Ash.create!(actor: system_actor)
-      end
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      section_html = custom_date_section_html(view)
-
-      # With more than 5 fields the section is wrapped in the scrollable container.
-      assert section_html =~ "max-h-60"
-      assert section_html =~ "overflow-y-auto"
-    end
-
-    # Extract the HTML of the rendered "Custom date fields" section. Returns
-    # "" if the section is not rendered. Used by the threshold tests to avoid
-    # picking up scrollable classes from sibling sections.
-    defp custom_date_section_html(view) do
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      label = gettext("Custom date fields")
-
-      case String.split(dropdown_html, label, parts: 2) do
-        [_before, after_label] ->
-          # Up to the next group header label, or the footer.
-          after_label
-          |> String.split(["text-xs font-semibold opacity-70 mb-2 uppercase"], parts: 2)
-          |> List.first()
-
-        _ ->
-          ""
-      end
-    end
-
-    test "Custom date fields section appears only when date custom fields exist", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view_no_field, _} = live(conn, "/members")
-
-      view_no_field
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view_no_field
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      refute dropdown_html =~ gettext("Custom date fields")
-
-      # Add a date-typed custom field and re-load: the section appears.
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      {:ok, field} =
-        CustomField
-        |> Ash.Changeset.for_create(:create, %{
-          name: "Birthday-#{System.unique_integer([:positive])}",
-          value_type: :date
-        })
-        |> Ash.create(actor: system_actor)
-
-      {:ok, view, _} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      assert dropdown_html =~ gettext("Custom date fields")
-      assert dropdown_html =~ field.name
-      assert dropdown_html =~ "cdf_#{field.id}_from"
-      assert dropdown_html =~ "cdf_#{field.id}_to"
-    end
-
-    test "update_filters event dispatches a date_filters_changed patch with the new jd_from", %{
-      conn: conn
-    } do
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, _html} = live(conn, "/members")
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      view
-      |> form("#member-filter form", %{
-        "jd_from" => "2024-01-15",
-        "payment_filter" => "all"
-      })
-      |> render_change()
-
-      # Parent LiveView receives {:date_filters_changed, ...} and patches the URL.
-      path = assert_patch(view)
-      assert path =~ "jd_from=2024-01-15"
-    end
-
-    test "selecting ed_mode=all updates the URL and reveals former members", %{conn: conn} do
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-      today = Date.utc_today()
-      unique_name = "Zarquon-#{System.unique_integer([:positive])}"
-
-      {:ok, former} =
-        Mv.Membership.create_member(
-          %{
-            first_name: unique_name,
-            last_name: "Exited",
-            email: "ex-#{System.unique_integer([:positive])}@example.com",
-            join_date: Date.add(today, -1000),
-            exit_date: Date.add(today, -30)
-          },
-          actor: system_actor
-        )
-
-      conn = conn_with_oidc_user(conn)
-      {:ok, view, html} = live(conn, "/members")
-
-      # Fresh load hides the former member.
-      refute html =~ former.first_name
-
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      view
-      |> form("#member-filter form", %{
-        "ed_mode" => "all",
-        "payment_filter" => "all"
-      })
-      |> render_change()
-
-      path = assert_patch(view)
-      assert path =~ "ed_mode=all"
-
-      # Now Eve appears in the rendered list.
-      assert render(view) =~ former.first_name
-    end
-
-    test "dropdown shows scrollbar when many boolean custom fields exist", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-
-      # Create 15 boolean custom fields (more than typical, should trigger scrollbar)
-      boolean_fields =
-        Enum.map(1..15, fn i ->
-          create_boolean_custom_field(%{name: "Field #{i}"})
-        end)
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Open dropdown
-      view
-      |> element("#member-filter button[aria-haspopup='true']")
-      |> render_click()
-
-      # Extract dropdown panel HTML
-      dropdown_html =
-        view
-        |> element("#member-filter div[role='dialog']")
-        |> render()
-
-      # Should have scrollbar classes: max-h-60 overflow-y-auto pr-2
-      # Check for the scrollable container (the div with max-h-60 and overflow-y-auto)
-      assert dropdown_html =~ "max-h-60"
-      assert dropdown_html =~ "overflow-y-auto"
-
-      # Verify all fields are present in the dropdown
-      Enum.each(boolean_fields, fn field ->
-        assert dropdown_html =~ field.name
-      end)
-    end
-  end
-end
diff --git a/test/mv_web/live/member_live/index/export_payload_test.exs b/test/mv_web/live/member_live/index/export_payload_test.exs
index 932816e6..b049dfff 100644
--- a/test/mv_web/live/member_live/index/export_payload_test.exs
+++ b/test/mv_web/live/member_live/index/export_payload_test.exs
@@ -56,8 +56,11 @@ defmodule MvWeb.MemberLive.Index.ExportPayloadTest do
       assert payload.query == "ada"
       assert payload.sort_field == "last_name"
       assert payload.sort_order == "desc"
+      # Decoupled from the removed overview cycle toggle (§3.3): the export basis
+      # is always the current cycle and no cycle-status row filter is applied,
+      # regardless of any legacy cycle assigns.
       assert payload.show_current_cycle == true
-      assert payload.cycle_status_filter == "unpaid"
+      assert payload.cycle_status_filter == nil
       assert payload.boolean_filters == %{"cf-x" => true}
     end
 
@@ -79,7 +82,7 @@ defmodule MvWeb.MemberLive.Index.ExportPayloadTest do
       assert payload.query == nil
       assert payload.sort_field == nil
       assert payload.sort_order == nil
-      assert payload.show_current_cycle == false
+      assert payload.show_current_cycle == true
       assert payload.cycle_status_filter == nil
       assert payload.boolean_filters == %{}
     end
diff --git a/test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs b/test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
deleted file mode 100644
index 1ee235c9..00000000
--- a/test/mv_web/live/member_live/index/overview_query_cycle_status_test.exs
+++ /dev/null
@@ -1,78 +0,0 @@
-defmodule MvWeb.MemberLive.Index.OverviewQueryCycleStatusTest do
-  @moduledoc """
-  §1.13 — the paid/unpaid cycle-status filter, under the current or last-completed
-  cycle view, returns the same members as the previous in-memory classifier,
-  computed DB-side via the `cycle_end`-backed aggregates.
-  """
-  use Mv.DataCase, async: false
-
-  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
-
-  alias Mv.Membership.Member
-  alias MvWeb.MemberLive.Index.MembershipFeeStatus
-  alias MvWeb.MemberLive.Index.OverviewQuery
-
-  @today ~D[2024-07-15]
-
-  setup do
-    actor = Mv.Helpers.SystemActor.get_system_actor()
-    ft = create_fee_type(%{interval: :yearly}, actor)
-
-    # current 2024 paid, last-completed 2023 unpaid
-    paid_now = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
-    create_cycle(paid_now, ft, %{cycle_start: ~D[2024-01-01], status: :paid}, actor)
-    create_cycle(paid_now, ft, %{cycle_start: ~D[2023-01-01], status: :unpaid}, actor)
-
-    # current 2024 unpaid, last-completed 2023 paid
-    unpaid_now = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
-    create_cycle(unpaid_now, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
-    create_cycle(unpaid_now, ft, %{cycle_start: ~D[2023-01-01], status: :paid}, actor)
-
-    # no cycles
-    _no_cycles = member_fixture_with_actor(%{membership_fee_type_id: ft.id}, actor)
-
-    %{actor: actor, paid_now: paid_now, unpaid_now: unpaid_now}
-  end
-
-  defp db_ids(status, show_current, actor) do
-    OverviewQuery.build(%{
-      cycle_status_filter: status,
-      show_current_cycle: show_current,
-      today: @today
-    })
-    |> Ash.read!(actor: actor)
-    |> MapSet.new(& &1.id)
-  end
-
-  defp oracle_ids(status, show_current, actor) do
-    Member
-    |> Ash.Query.load(membership_fee_cycles: [:membership_fee_type])
-    |> Ash.Query.load(:membership_fee_type)
-    |> Ash.read!(actor: actor)
-    |> Enum.filter(fn m ->
-      MembershipFeeStatus.get_cycle_status_for_member(m, show_current, @today) == status
-    end)
-    |> MapSet.new(& &1.id)
-  end
-
-  # {status, show_current, member-key expected in the result}
-  @cases [
-    {:paid, true, :paid_now},
-    {:unpaid, true, :unpaid_now},
-    {:paid, false, :unpaid_now},
-    {:unpaid, false, :paid_now}
-  ]
-
-  for {status, show_current, expected_key} <- @cases do
-    test "#{status} under #{if show_current, do: "current", else: "last"} cycle matches oracle",
-         %{actor: actor} = ctx do
-      status = unquote(status)
-      show_current = unquote(show_current)
-      expected = Map.fetch!(ctx, unquote(expected_key))
-
-      db = db_ids(status, show_current, actor)
-      assert db == oracle_ids(status, show_current, actor)
-      assert expected.id in db
-    end
-  end
-end
diff --git a/test/mv_web/member_live/index_add_filter_flow_test.exs b/test/mv_web/member_live/index_add_filter_flow_test.exs
new file mode 100644
index 00000000..acee2755
--- /dev/null
+++ b/test/mv_web/member_live/index_add_filter_flow_test.exs
@@ -0,0 +1,88 @@
+defmodule MvWeb.MemberLive.IndexAddFilterFlowTest do
+  @moduledoc """
+  §1.1–§1.3, §1.11, §3.1 — the Polaris-style add-filter flow of the
+  `AddFilterBuilderComponent`: field pick → focused value control →
+  commit-on-select / drop-on-dismiss, with no detail "Add" button, and the
+  removal of the old vertical filter panel.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Membership.Group
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, member} =
+      Mv.Membership.create_member(
+        %{first_name: "Flow", last_name: "Member", email: "flow@example.com"},
+        actor: actor
+      )
+
+    {:ok, group} =
+      Group
+      |> Ash.Changeset.for_create(:create, %{name: "Board"})
+      |> Ash.create(actor: actor)
+
+    {:ok, _mg} =
+      Mv.Membership.create_member_group(%{member_id: member.id, group_id: group.id}, actor: actor)
+
+    %{conn: conn_with_oidc_user(conn), member: member, group: group}
+  end
+
+  test "the add-filter builder replaces the old vertical filter panel (§1.11)", %{conn: conn} do
+    {:ok, view, html} = live(conn, ~p"/members")
+
+    assert has_element?(view, "[data-testid='add-filter-trigger']")
+    # No residue of the removed MemberFilterComponent.
+    refute html =~ ~s(data-testid="member-filter-form")
+    refute html =~ "member-filter-dropdown"
+    refute has_element?(view, ~s(button[aria-label="Filter members"]))
+  end
+
+  test "picking a field closes the picker and opens a focused value control, no Add button (§1.1)",
+       %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    open_picker(view)
+    assert has_element?(view, "#member-filter-field-listbox[role='listbox']")
+
+    view |> element("#member-filter-field-opt-group") |> render_click()
+
+    # Picker closes, the group value control opens; there is no detail "Add" button.
+    refute has_element?(view, "#member-filter-field-listbox")
+    assert has_element?(view, "[data-testid='value-control-group']")
+    refute has_element?(view, "[data-testid='pending-filter'] button[type='submit']")
+  end
+
+  test "a valid value selection commits a chip and reloads (§1.2)", %{conn: conn, group: group} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    path = apply_group_filter(view, group.id, "in")
+
+    assert path =~ "group_#{group.id}=in"
+    assert has_element?(view, "[data-testid='filter-chip']")
+  end
+
+  test "dismissing a pending filter without a selection drops it, no chip, no reload (§1.3)",
+       %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "group")
+    assert has_element?(view, "[data-testid='value-control-group']")
+
+    # No chip has been added and no navigation happened yet (pending, uncommitted).
+    refute has_element?(view, "[data-testid='filter-chip']")
+    refute_patched(view)
+
+    # Dismiss (Escape/click-away) drops the pending control without committing.
+    render_keydown(element(view, "#member-filter"), %{"key" => "Escape"})
+    refute has_element?(view, "[data-testid='value-control-group']")
+    refute has_element?(view, "[data-testid='filter-chip']")
+  end
+
+  defp refute_patched(view) do
+    assert_raise ArgumentError, fn -> assert_patch(view, 50) end
+  end
+end
diff --git a/test/mv_web/member_live/index_column_manager_test.exs b/test/mv_web/member_live/index_column_manager_test.exs
index 723b8f2d..7833d128 100644
--- a/test/mv_web/member_live/index_column_manager_test.exs
+++ b/test/mv_web/member_live/index_column_manager_test.exs
@@ -23,9 +23,9 @@ defmodule MvWeb.MemberLive.IndexColumnManagerTest do
   test "column manager trigger sits alongside the filter controls", %{conn: conn} do
     {:ok, view, _html} = live(conn, ~p"/members")
 
-    # Both the filter panel trigger and the column-manager trigger render in the
-    # same toolbar.
-    assert has_element?(view, ~s(button[aria-label="Filter members"]))
+    # Both the add-filter builder trigger and the column-manager trigger render
+    # in the same toolbar.
+    assert has_element?(view, "[data-testid='add-filter-trigger']")
     assert has_element?(view, "button[aria-controls='field-visibility-menu']")
   end
 
diff --git a/test/mv_web/member_live/index_date_presets_test.exs b/test/mv_web/member_live/index_date_presets_test.exs
new file mode 100644
index 00000000..ce30fe35
--- /dev/null
+++ b/test/mv_web/member_live/index_date_presets_test.exs
@@ -0,0 +1,39 @@
+defmodule MvWeb.MemberLive.IndexDatePresetsTest do
+  @moduledoc """
+  §1.8 — a date field's value control offers presets; picking "This year"
+  applies the Jan 1 – Dec 31 range of the current year and writes the equivalent
+  range params to the URL.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, _member} =
+      Mv.Membership.create_member(
+        %{first_name: "Preset", last_name: "Member", email: "preset@example.com"},
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "the 'This year' preset applies the current-year range and writes URL params", %{
+    conn: conn
+  } do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    # Open the Join date value control and apply the "This year" preset.
+    pick_field(view, "join_date")
+    assert has_element?(view, "[data-testid='date-presets']")
+
+    view |> element("[data-testid='date-preset-this_year']") |> render_click()
+
+    path = assert_patch(view)
+    year = Date.utc_today().year
+    assert path =~ "jd_from=#{year}-01-01"
+    assert path =~ "jd_to=#{year}-12-31"
+  end
+end
diff --git a/test/mv_web/member_live/index_default_columns_test.exs b/test/mv_web/member_live/index_default_columns_test.exs
index 5f5545d6..3cac0353 100644
--- a/test/mv_web/member_live/index_default_columns_test.exs
+++ b/test/mv_web/member_live/index_default_columns_test.exs
@@ -40,7 +40,9 @@ defmodule MvWeb.MemberLive.IndexDefaultColumnsTest do
     # Fee type, fee status, groups, join date headers.
     assert has_element?(view, "[data-testid='membership_fee_type']")
     assert has_element?(view, "[data-testid='join_date']")
-    assert has_element?(view, "th", "Membership Fee Status")
+    # The former "Membership Fee Status" column is now the period-scoped payment
+    # aging column (§3.3), headed "Fees".
+    assert has_element?(view, "th", "Fees")
     assert has_element?(view, "[data-testid='groups']")
   end
 
diff --git a/test/mv_web/member_live/index_filter_chips_test.exs b/test/mv_web/member_live/index_filter_chips_test.exs
new file mode 100644
index 00000000..c5be18a4
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_chips_test.exs
@@ -0,0 +1,92 @@
+defmodule MvWeb.MemberLive.IndexFilterChipsTest do
+  @moduledoc """
+  §1.4, §1.5, §3.2 — applied-filter chips render one per value, each is an
+  independently removable real button, and "Clear all" removes every active
+  filter in a single reload with the URL reset to the unfiltered state.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Membership.Group
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, member} =
+      Mv.Membership.create_member(
+        %{first_name: "Chip", last_name: "Member", email: "chip@example.com"},
+        actor: actor
+      )
+
+    {:ok, group1} =
+      Group |> Ash.Changeset.for_create(:create, %{name: "Alpha"}) |> Ash.create(actor: actor)
+
+    {:ok, group2} =
+      Group |> Ash.Changeset.for_create(:create, %{name: "Beta"}) |> Ash.create(actor: actor)
+
+    {:ok, _mg} =
+      Mv.Membership.create_member_group(%{member_id: member.id, group_id: group1.id},
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn), group1: group1, group2: group2}
+  end
+
+  test "an applied filter renders a removable chip that is a real button (§1.4, §3.2)", %{
+    conn: conn,
+    group1: group1
+  } do
+    {:ok, view, _html} = live(conn, "/members?group_#{group1.id}=in")
+
+    # The chip's remove control is a real button whose accessible name names the
+    # filter it removes (locale-independent: it contains the group name).
+    assert has_element?(
+             view,
+             "button[data-testid='filter-chip-remove'][aria-label*='Alpha']"
+           )
+  end
+
+  test "removing a chip drops its URL param and reloads (§1.4)", %{conn: conn, group1: group1} do
+    {:ok, view, _html} = live(conn, "/members?group_#{group1.id}=in")
+
+    view |> element("[data-testid='filter-chip-remove']") |> render_click()
+
+    path = assert_patch(view)
+    refute path =~ "group_#{group1.id}"
+  end
+
+  test "Clear all removes every active filter in one reload and resets the URL (§1.5)", %{
+    conn: conn,
+    group1: group1,
+    group2: group2
+  } do
+    {:ok, view, _html} =
+      live(conn, "/members?group_#{group1.id}=in&group_#{group2.id}=not_in")
+
+    assert has_element?(view, "[data-testid='clear-all-filters']")
+    view |> element("[data-testid='clear-all-filters']") |> render_click()
+
+    path = assert_patch(view)
+    refute path =~ "group_#{group1.id}"
+    refute path =~ "group_#{group2.id}"
+    refute has_element?(view, "[data-testid='filter-chip']")
+  end
+
+  test "each value renders its own chip (one chip per value)", %{
+    conn: conn,
+    group1: group1,
+    group2: group2
+  } do
+    {:ok, view, _html} =
+      live(conn, "/members?group_#{group1.id}=in&group_#{group2.id}=not_in")
+
+    chips =
+      render(view)
+      |> LazyHTML.from_fragment()
+      |> LazyHTML.query(~s([data-testid="filter-chip"]))
+      |> Enum.count()
+
+    assert chips == 2
+  end
+end
diff --git a/test/mv_web/member_live/index_filter_height_property_test.exs b/test/mv_web/member_live/index_filter_height_property_test.exs
new file mode 100644
index 00000000..1ba96cae
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_height_property_test.exs
@@ -0,0 +1,50 @@
+defmodule MvWeb.MemberLive.IndexFilterHeightPropertyTest do
+  @moduledoc """
+  §2.3 — the resting filter UI's size depends only on the number of active
+  filters, never on the size of the available-field catalog. The builder renders
+  one chip per active filter regardless of how many groups/fee types/custom
+  fields are pickable, so the chip count is a function of the active-filter count
+  alone.
+  """
+  use ExUnit.Case, async: true
+  use ExUnitProperties
+
+  import Phoenix.LiveViewTest
+
+  alias MvWeb.Components.AddFilterBuilderComponent
+
+  defp group(i), do: %{id: "g#{i}", name: "Group #{i}"}
+
+  defp chip_count(html) do
+    html
+    |> LazyHTML.from_fragment()
+    |> LazyHTML.query(~s([data-testid="filter-chip"]))
+    |> Enum.count()
+  end
+
+  property "resting chip count depends only on active-filter count, not catalog size" do
+    check all(
+            catalog_size <- integer(0..8),
+            active_count <- integer(0..5)
+          ) do
+      # active filters must reference real catalog ids, so ensure enough groups.
+      total = max(catalog_size, active_count)
+      groups = Enum.map(1..max(total, 1)//1, &group/1)
+      groups = if total == 0, do: [], else: groups
+
+      group_filters =
+        groups
+        |> Enum.take(active_count)
+        |> Map.new(&{&1.id, :in})
+
+      html =
+        render_component(AddFilterBuilderComponent,
+          id: "member-filter",
+          groups: groups,
+          group_filters: group_filters
+        )
+
+      assert chip_count(html) == active_count
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_filter_panel_test.exs b/test/mv_web/member_live/index_filter_panel_test.exs
deleted file mode 100644
index 770c0944..00000000
--- a/test/mv_web/member_live/index_filter_panel_test.exs
+++ /dev/null
@@ -1,79 +0,0 @@
-defmodule MvWeb.MemberLive.IndexFilterPanelTest do
-  @moduledoc """
-  §1.18 — The existing "Apply filters" panel is unchanged: same fieldset/legend
-  form structure and payment-status controls, no chip/add-filter-builder
-  paradigm (that is #548). Its filters now resolve DB-side via the `:overview`
-  read action.
-  """
-  use MvWeb.ConnCase, async: false
-
-  import Phoenix.LiveViewTest
-
-  alias Mv.Helpers.SystemActor
-
-  setup %{conn: conn} do
-    {:ok, _} =
-      Mv.Membership.create_member(
-        %{first_name: "Panel", last_name: "Member", email: "panel@example.com"},
-        actor: SystemActor.get_system_actor()
-      )
-
-    %{conn: conn_with_oidc_user(conn)}
-  end
-
-  defp open_filter(view) do
-    view
-    |> element(~s(button[phx-click="toggle_dropdown"][aria-label="Filter members"]))
-    |> render_click()
-  end
-
-  test "the filter panel keeps its fieldset form structure and payment controls", %{conn: conn} do
-    {:ok, view, _html} = live(conn, ~p"/members")
-    open_filter(view)
-
-    # Semantic form structure (fieldset/legend, radio controls) is preserved.
-    assert has_element?(view, ~s(form[data-testid="member-filter-form"]))
-    assert has_element?(view, "#payment-filter-all")
-    assert has_element?(view, "#payment-filter-paid")
-    assert has_element?(view, "#payment-filter-unpaid")
-  end
-
-  test "no chip / add-filter-builder paradigm is present (#548 is out of scope)", %{conn: conn} do
-    {:ok, view, html} = live(conn, ~p"/members")
-    open_filter(view)
-    html = html <> render(view)
-
-    refute html =~ ~s(data-testid="add-filter")
-    refute html =~ ~s(data-testid="filter-chip")
-    refute html =~ "filter-builder"
-  end
-
-  test "the panel's payment filter resolves DB-side via :overview", %{conn: conn} do
-    system_actor = SystemActor.get_system_actor()
-    fee_type = Mv.Fixtures.create_fee_type(%{interval: :yearly}, system_actor)
-    last_year_start = Date.new!(Date.utc_today().year - 1, 1, 1)
-
-    {:ok, paid} =
-      Mv.Membership.create_member(
-        %{
-          first_name: "PaidPanel",
-          last_name: "X",
-          email: "paidpanel@example.com",
-          membership_fee_type_id: fee_type.id
-        },
-        actor: system_actor
-      )
-
-    Mv.Fixtures.create_cycle(
-      paid,
-      fee_type,
-      %{cycle_start: last_year_start, status: :paid, replace_existing: true},
-      system_actor
-    )
-
-    {:ok, _view, html} = live(conn, ~p"/members?cycle_status_filter=paid")
-
-    assert html =~ "PaidPanel"
-    refute html =~ "Panel Member"
-  end
-end
diff --git a/test/mv_web/member_live/index_filter_parity_property_test.exs b/test/mv_web/member_live/index_filter_parity_property_test.exs
index 8cd17ce8..3568e1b4 100644
--- a/test/mv_web/member_live/index_filter_parity_property_test.exs
+++ b/test/mv_web/member_live/index_filter_parity_property_test.exs
@@ -8,8 +8,8 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
 
   The unchanged DB filters (group, fee-type) are applied identically in both
   arms; the property isolates the filters that moved from memory to the DB
-  (boolean custom fields, date custom fields, paid/unpaid cycle status) by
-  applying them DB-side in one arm and in-memory in the other.
+  (boolean custom fields, date custom fields) plus the period-scoped payment
+  aging filter, by applying them DB-side in one arm and in-memory in the other.
   """
   use Mv.DataCase, async: false
   use ExUnitProperties
@@ -21,10 +21,8 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
   alias Mv.Membership.Member
   alias MvWeb.MemberLive.Index
   alias MvWeb.MemberLive.Index.DateFilter
-  alias MvWeb.MemberLive.Index.MembershipFeeStatus
   alias MvWeb.MemberLive.Index.OverviewQuery
 
-  @today ~D[2024-07-15]
   @cycle_starts [~D[2023-01-01], ~D[2024-01-01], ~D[2025-01-01]]
   @date_values [~D[2023-06-01], ~D[2024-06-15], ~D[2025-06-01]]
 
@@ -74,8 +72,14 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
 
   defp filter_params_gen do
     StreamData.fixed_map(%{
-      cycle_status: StreamData.member_of([nil, :paid, :unpaid]),
-      show_current: StreamData.boolean(),
+      payment:
+        StreamData.member_of([
+          nil,
+          :fully_paid,
+          {:has_unpaid, 1},
+          {:has_unpaid, 2},
+          {:has_unpaid, 3}
+        ]),
       bool: StreamData.member_of([nil, true, false]),
       date_range: StreamData.member_of([nil, {~D[2024-01-01], ~D[2024-12-31]}]),
       group: StreamData.member_of([nil, :in, :not_in]),
@@ -144,16 +148,16 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
       Map.merge(opts, %{fee_type_filters: %{to_string(ctx.ft1.id) => dir}, fee_types: [ctx.ft1]})
 
   defp moved_opts(params, ctx) do
-    %{today: @today}
-    |> put_cycle(params.cycle_status, params.show_current)
+    %{}
+    |> put_payment(params.payment)
     |> put_bool(params.bool, ctx)
     |> put_date(params.date_range, ctx)
   end
 
-  defp put_cycle(opts, nil, _show), do: opts
+  defp put_payment(opts, nil), do: opts
 
-  defp put_cycle(opts, status, show),
-    do: Map.merge(opts, %{cycle_status_filter: status, show_current_cycle: show})
+  defp put_payment(opts, filter),
+    do: Map.merge(opts, %{payment_filter: filter, payment_period: %{from: nil, to: nil}})
 
   defp put_bool(opts, nil, _ctx), do: opts
 
@@ -195,7 +199,7 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
     base_members
     |> apply_oracle_bool(params, ctx)
     |> apply_oracle_date(params, ctx)
-    |> apply_oracle_cycle(params)
+    |> apply_oracle_payment(params)
     |> MapSet.new(& &1.id)
   end
 
@@ -219,14 +223,22 @@ defmodule MvWeb.MemberLive.IndexFilterParityPropertyTest do
     )
   end
 
-  defp apply_oracle_cycle(members, %{cycle_status: nil}), do: members
+  defp apply_oracle_payment(members, %{payment: nil}), do: members
 
-  defp apply_oracle_cycle(members, %{cycle_status: status, show_current: show}) do
-    Enum.filter(members, fn m ->
-      MembershipFeeStatus.get_cycle_status_for_member(m, show, @today) == status
-    end)
+  defp apply_oracle_payment(members, %{payment: filter}) do
+    Enum.filter(members, fn m -> payment_match?(unpaid_count(m), filter) end)
   end
 
+  # Member-relative count of unpaid cycles (all-time period, so every unpaid
+  # cycle counts); suspended and paid are excluded, mirroring the calculation.
+  defp unpaid_count(member) do
+    member.membership_fee_cycles
+    |> Enum.count(&(&1.status == :unpaid))
+  end
+
+  defp payment_match?(count, :fully_paid), do: count == 0
+  defp payment_match?(count, {:has_unpaid, n}), do: count >= n
+
   property "DB-backed filter result set equals the in-memory oracle", ctx do
     check all(
             specs <- StreamData.list_of(member_spec_gen(), min_length: 1, max_length: 5),
diff --git a/test/mv_web/member_live/index_groups_accessibility_test.exs b/test/mv_web/member_live/index_groups_accessibility_test.exs
index bfe47c43..34cea277 100644
--- a/test/mv_web/member_live/index_groups_accessibility_test.exs
+++ b/test/mv_web/member_live/index_groups_accessibility_test.exs
@@ -65,21 +65,22 @@ defmodule MvWeb.MemberLive.IndexGroupsAccessibilityTest do
   end
 
   @tag :ui
-  test "filter dropdown has group presence section with legend", %{
+  test "field picker exposes a combobox with a Group field option", %{
     conn: conn
   } do
     conn = conn_with_oidc_user(conn)
     {:ok, view, _html} = live(conn, "/members")
 
-    # Open filter dropdown
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
+    # Open the add-filter picker (combobox + listbox of grouped fields)
+    open_picker(view)
 
-    html = render(view)
-    # Groups section: legend "Member has groups" and radios (Any / Yes / No)
-    assert html =~ ~r/[Gg]roups/
-    assert has_element?(view, "[data-testid='member-filter-form']")
+    assert has_element?(view, "[data-testid='field-combobox'][role='combobox']")
+    assert has_element?(view, "#member-filter-field-listbox[role='listbox']")
+    assert has_element?(view, "#member-filter-field-opt-group[role='option']")
+
+    # Picking the Group field opens its value control with per-group legends.
+    view |> element("#member-filter-field-opt-group") |> render_click()
+    assert has_element?(view, "[data-testid='value-control-group']")
   end
 
   @tag :ui
@@ -102,13 +103,7 @@ defmodule MvWeb.MemberLive.IndexGroupsAccessibilityTest do
     conn = conn_with_oidc_user(conn)
     {:ok, view, _html} = live(conn, "/members")
 
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     html = render(view)
     assert html =~ member1.first_name
@@ -140,13 +135,7 @@ defmodule MvWeb.MemberLive.IndexGroupsAccessibilityTest do
     conn = conn_with_oidc_user(conn)
     {:ok, view, _html} = live(conn, "/members")
 
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     html = render(view)
     assert html =~ member1.first_name
diff --git a/test/mv_web/member_live/index_groups_filter_test.exs b/test/mv_web/member_live/index_groups_filter_test.exs
index c8d5160a..639b3992 100644
--- a/test/mv_web/member_live/index_groups_filter_test.exs
+++ b/test/mv_web/member_live/index_groups_filter_test.exs
@@ -62,20 +62,7 @@ defmodule MvWeb.MemberLive.IndexGroupsFilterTest do
   end
 
   defp open_filter_and_set_group(view, group_id, value) do
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    key = "group_#{group_id}"
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{key => value, "payment_filter" => "all"})
-
-    # Force LiveView to process {:group_filter_changed, ...} (render triggers mailbox processing)
-    _ = render(view)
-    # Wait for patch; return path so callers can assert URL contains expected filter param
-    path = assert_patch(view)
+    path = apply_group_filter(view, group_id, value)
     {view, path}
   end
 
diff --git a/test/mv_web/member_live/index_groups_integration_test.exs b/test/mv_web/member_live/index_groups_integration_test.exs
index cae9ce16..0e150a57 100644
--- a/test/mv_web/member_live/index_groups_integration_test.exs
+++ b/test/mv_web/member_live/index_groups_integration_test.exs
@@ -103,13 +103,7 @@ defmodule MvWeb.MemberLive.IndexGroupsIntegrationTest do
     conn = conn_with_oidc_user(conn)
     {:ok, view, _html} = live(conn, "/members")
 
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     html = render(view)
     assert html =~ member1.first_name
@@ -174,10 +168,10 @@ defmodule MvWeb.MemberLive.IndexGroupsIntegrationTest do
     conn = conn_with_oidc_user(conn)
 
     {:ok, _view, html} =
-      live(conn, "/members?group_#{group1.id}=in&cycle_status_filter=paid")
+      live(conn, "/members?group_#{group1.id}=in&pay_filter=fully_paid")
 
     assert html =~ "Members"
-    # member1 has a group and a paid cycle; page should load with both filters
+    # member1 has a group and no unpaid cycles; both filters keep it visible.
     assert html =~ member1.first_name
   end
 
@@ -191,13 +185,7 @@ defmodule MvWeb.MemberLive.IndexGroupsIntegrationTest do
     {:ok, view, _html} = live(conn, "/members")
 
     # Apply group filter
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     # Apply search (this tests that filter and search work together;
     # search form is in SearchBarComponent with phx-submit="search")
@@ -242,13 +230,7 @@ defmodule MvWeb.MemberLive.IndexGroupsIntegrationTest do
     {:ok, view, _html} = live(conn, "/members")
 
     # Apply group filter
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     # Apply sorting
     view
diff --git a/test/mv_web/member_live/index_groups_performance_test.exs b/test/mv_web/member_live/index_groups_performance_test.exs
index 6d05908b..3634b172 100644
--- a/test/mv_web/member_live/index_groups_performance_test.exs
+++ b/test/mv_web/member_live/index_groups_performance_test.exs
@@ -102,13 +102,7 @@ defmodule MvWeb.MemberLive.IndexGroupsPerformanceTest do
     {:ok, view, _html} = live(conn, "/members")
 
     # Open filter and apply "Yes" for group1 (even-indexed members are in group1)
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     # Force LiveView to process {:group_filter_changed, ...}
     html = render(view)
diff --git a/test/mv_web/member_live/index_groups_url_params_test.exs b/test/mv_web/member_live/index_groups_url_params_test.exs
index 3de60923..22329ab3 100644
--- a/test/mv_web/member_live/index_groups_url_params_test.exs
+++ b/test/mv_web/member_live/index_groups_url_params_test.exs
@@ -73,13 +73,7 @@ defmodule MvWeb.MemberLive.IndexGroupsUrlParamsTest do
     conn = conn_with_oidc_user(conn)
     {:ok, view, _html} = live(conn, "/members")
 
-    view
-    |> element("button[aria-label='Filter members']")
-    |> render_click()
-
-    view
-    |> element("[data-testid='member-filter-form']")
-    |> render_change(%{"group_#{group1.id}" => "in", "payment_filter" => "all"})
+    apply_group_filter(view, group1.id, "in")
 
     html = render(view)
     assert html =~ member1.first_name
diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index 5ee23afb..4dd92c73 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -1,16 +1,15 @@
 defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
   @moduledoc """
-  Tests for membership fee status column in member list view.
+  Tests for the period-scoped payment aging column in the member overview
+  (§1.13, §3.3). The column shows, per member, the count of unpaid cycles whose
+  `cycle_end` falls in the active period (default: all outstanding); 0 → "Paid";
+  suspended cycles are excluded from the count.
   """
   use MvWeb.ConnCase, async: false
 
   import Phoenix.LiveViewTest
   import Mv.Fixtures, only: [create_fee_type: 1, create_cycle: 3]
 
-  alias Mv.MembershipFees.MembershipFeeCycle
-
-  require Ash.Query
-
   # Helper to create a member
   defp create_member(attrs) do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
@@ -26,253 +25,90 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
     member
   end
 
-  describe "status column display" do
-    test "shows status column in member list", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
+  describe "payment aging column" do
+    test "header names the payment column", %{conn: conn} do
+      {:ok, _view, html} = live(conn, "/members")
+      assert html =~ "Fees"
+    end
 
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :paid,
-        replace_existing: true
-      })
+    test "a member with unpaid cycles shows the unpaid count; suspended excluded", %{conn: conn} do
+      fee_type = create_fee_type(%{interval: :yearly})
+      member = create_member(%{first_name: "OwesTwo", membership_fee_type_id: fee_type.id})
+
+      create_cycle(member, fee_type, %{cycle_start: ~D[2022-01-01], status: :unpaid})
+      create_cycle(member, fee_type, %{cycle_start: ~D[2023-01-01], status: :unpaid})
+      # A suspended cycle must never be counted.
+      create_cycle(member, fee_type, %{cycle_start: ~D[2024-01-01], status: :suspended})
 
       {:ok, _view, html} = live(conn, "/members")
 
-      # Should show membership fee status column
-      assert html =~ "Membership Fee Status" || html =~ "Mitgliedsbeitrag Status"
+      assert html =~ "2 open"
+      refute html =~ "3 open"
     end
 
-    test "shows last completed cycle status by default", %{conn: conn} do
+    test "a member with no unpaid cycles reads Paid", %{conn: conn} do
       fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
+      member = create_member(%{first_name: "AllPaid", membership_fee_type_id: fee_type.id})
 
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2022-01-01],
-        status: :paid,
-        replace_existing: true
-      })
+      create_cycle(member, fee_type, %{cycle_start: ~D[2023-01-01], status: :paid})
 
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :unpaid,
-        replace_existing: true
-      })
+      {:ok, _view, html} = live(conn, "/members")
+
+      assert html =~ "Paid"
+    end
+
+    test "the badge is a focusable control that drills into the member fees history", %{
+      conn: conn
+    } do
+      fee_type = create_fee_type(%{interval: :yearly})
+      member = create_member(%{first_name: "Drill", membership_fee_type_id: fee_type.id})
+      create_cycle(member, fee_type, %{cycle_start: ~D[2023-01-01], status: :unpaid})
 
       {:ok, view, _html} = live(conn, "/members")
 
-      # Should show unpaid status (2023 is last completed)
-      html = render(view)
-      assert html =~ "hero-x-circle" || html =~ "unpaid"
+      assert has_element?(
+               view,
+               "button[data-testid='payment-badge']##{"payment-badge-#{member.id}"}"
+             )
+
+      # A tooltip popover lists the open cycles for the period.
+      assert has_element?(view, "##{"payment-tip-#{member.id}"}[popover]")
     end
 
-    test "toggle switches to current cycle view", %{conn: conn} do
+    test "members without cycles render without error", %{conn: conn} do
       fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
+      member = create_member(%{first_name: "NoCycles", membership_fee_type_id: fee_type.id})
 
-      today = Date.utc_today()
-      current_year_start = %{today | month: 1, day: 1}
-
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :paid,
-        replace_existing: true
-      })
-
-      create_cycle(member, fee_type, %{
-        cycle_start: current_year_start,
-        status: :suspended,
-        replace_existing: true
-      })
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      # Toggle to current cycle (use the button in the header)
-      view
-      |> element("[data-testid=toggle-cycle-view]")
-      |> render_click()
-
-      html = render(view)
-      # Should show suspended status (current cycle)
-      assert html =~ "hero-pause-circle" || html =~ "suspended"
-
-      # The toggle button exposes its pressed state to assistive tech.
-      assert has_element?(view, ~s([data-testid=toggle-cycle-view][aria-pressed="true"]))
-    end
-
-    test "shows correct color coding for paid status", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
-
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :paid,
-        replace_existing: true
-      })
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      html = render(view)
-      assert html =~ "text-success" || html =~ "hero-check-circle"
-    end
-
-    test "shows correct color coding for unpaid status", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
-
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :unpaid,
-        replace_existing: true
-      })
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      html = render(view)
-      assert html =~ "text-error" || html =~ "hero-x-circle"
-    end
-
-    test "shows correct color coding for suspended status", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
-
-      create_cycle(member, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :suspended,
-        replace_existing: true
-      })
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      html = render(view)
-      assert html =~ "text-base-content/60" || html =~ "hero-pause-circle"
-    end
-
-    test "handles members without cycles gracefully", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
-      member = create_member(%{membership_fee_type_id: fee_type.id})
-      # No cycles created
-
-      {:ok, view, _html} = live(conn, "/members")
-
-      html = render(view)
-      # Should not crash, may show empty or default state
+      {:ok, _view, html} = live(conn, "/members")
       assert html =~ member.first_name
     end
   end
 
-  describe "filters" do
-    test "filter unpaid in last cycle works", %{conn: conn} do
+  describe "payment filter" do
+    setup do
       fee_type = create_fee_type(%{interval: :yearly})
 
-      # Member with unpaid last cycle
-      member1 = create_member(%{first_name: "UnpaidMember", membership_fee_type_id: fee_type.id})
+      unpaid = create_member(%{first_name: "HasUnpaid", membership_fee_type_id: fee_type.id})
+      create_cycle(unpaid, fee_type, %{cycle_start: ~D[2023-01-01], status: :unpaid})
 
-      create_cycle(member1, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :unpaid,
-        replace_existing: true
-      })
+      paid = create_member(%{first_name: "FullyPaid", membership_fee_type_id: fee_type.id})
+      create_cycle(paid, fee_type, %{cycle_start: ~D[2023-01-01], status: :paid})
 
-      # Member with paid last cycle
-      member2 = create_member(%{first_name: "PaidMember", membership_fee_type_id: fee_type.id})
-
-      create_cycle(member2, fee_type, %{
-        cycle_start: ~D[2023-01-01],
-        status: :paid,
-        replace_existing: true
-      })
-
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      # Verify cycles exist in database
-      cycles1 =
-        MembershipFeeCycle
-        |> Ash.Query.filter(member_id == ^member1.id)
-        |> Ash.read!(actor: system_actor)
-
-      cycles2 =
-        MembershipFeeCycle
-        |> Ash.Query.filter(member_id == ^member2.id)
-        |> Ash.read!(actor: system_actor)
-
-      refute Enum.empty?(cycles1)
-      refute Enum.empty?(cycles2)
-
-      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=unpaid")
-
-      assert html =~ "UnpaidMember"
-      refute html =~ "PaidMember"
+      %{}
     end
 
-    test "filter unpaid in current cycle works", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
+    test "has-unpaid ≥ 1 selects only members with unpaid cycles", %{conn: conn} do
+      {:ok, _view, html} = live(conn, "/members?pay_filter=unpaid_1")
 
-      today = Date.utc_today()
-      current_year_start = %{today | month: 1, day: 1}
-
-      # Member with unpaid current cycle
-      member1 = create_member(%{first_name: "UnpaidCurrent", membership_fee_type_id: fee_type.id})
-
-      create_cycle(member1, fee_type, %{
-        cycle_start: current_year_start,
-        status: :unpaid,
-        replace_existing: true
-      })
-
-      # Member with paid current cycle
-      member2 = create_member(%{first_name: "PaidCurrent", membership_fee_type_id: fee_type.id})
-
-      create_cycle(member2, fee_type, %{
-        cycle_start: current_year_start,
-        status: :paid,
-        replace_existing: true
-      })
-
-      system_actor = Mv.Helpers.SystemActor.get_system_actor()
-
-      # Verify cycles exist in database
-      cycles1 =
-        MembershipFeeCycle
-        |> Ash.Query.filter(member_id == ^member1.id)
-        |> Ash.read!(actor: system_actor)
-
-      cycles2 =
-        MembershipFeeCycle
-        |> Ash.Query.filter(member_id == ^member2.id)
-        |> Ash.read!(actor: system_actor)
-
-      refute Enum.empty?(cycles1)
-      refute Enum.empty?(cycles2)
-
-      {:ok, _view, html} =
-        live(conn, "/members?cycle_status_filter=unpaid&show_current_cycle=true")
-
-      assert html =~ "UnpaidCurrent"
-      refute html =~ "PaidCurrent"
+      assert html =~ "HasUnpaid"
+      refute html =~ "FullyPaid"
     end
-  end
 
-  @moduletag :slow
-  describe "performance" do
-    test "loads cycles efficiently without N+1 queries", %{conn: conn} do
-      fee_type = create_fee_type(%{interval: :yearly})
+    test "fully-paid selects only members with zero unpaid cycles", %{conn: conn} do
+      {:ok, _view, html} = live(conn, "/members?pay_filter=fully_paid")
 
-      # Create multiple members with cycles
-      Enum.each(1..5, fn _ ->
-        member = create_member(%{membership_fee_type_id: fee_type.id})
-
-        create_cycle(member, fee_type, %{
-          cycle_start: ~D[2023-01-01],
-          status: :paid,
-          replace_existing: true
-        })
-      end)
-
-      {:ok, _view, html} = live(conn, "/members")
-
-      # Should render without errors (N+1 would cause performance issues)
-      assert html =~ "Members" || html =~ "Mitglieder"
+      assert html =~ "FullyPaid"
+      refute html =~ "HasUnpaid"
     end
   end
 end
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
index 1cf7c0ce..7752b307 100644
--- a/test/mv_web/member_live/index_payment_period_test.exs
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -93,17 +93,19 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
   end
 
   describe "badge/1" do
-    test "0 renders as Paid (success)" do
+    test "0 renders as All paid (success/green)" do
       badge = PaymentAging.badge(0)
       assert badge.variant == :success
-      assert badge.label == "Paid"
+      assert badge.color_class == "badge-success"
+      assert badge.label == "All paid"
     end
 
-    test "N > 0 renders as N unpaid (error)" do
+    test "N > 0 renders as N open (error/red)" do
       badge = PaymentAging.badge(2)
       assert badge.variant == :error
+      assert badge.color_class == "badge-error"
       assert badge.label =~ "2"
-      assert badge.label =~ "unpaid"
+      assert badge.label =~ "open"
     end
   end
 
@@ -114,11 +116,11 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
       %{actor: actor, ft: ft}
     end
 
-    test "lists in-period unpaid cycles and flags suspended separately; paid excluded",
+    test "lists in-period unpaid and suspended cycles chronologically; paid/out-of-period excluded",
          %{actor: actor, ft: ft} do
       member = member_fixture_with_actor(%{}, actor)
-      create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
       create_cycle(member, ft, %{cycle_start: ~D[2024-02-01], status: :unpaid}, actor)
+      create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :unpaid}, actor)
       create_cycle(member, ft, %{cycle_start: ~D[2024-03-01], status: :suspended}, actor)
       create_cycle(member, ft, %{cycle_start: ~D[2024-04-01], status: :paid}, actor)
       # out of period
@@ -127,10 +129,13 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
       member = Ash.load!(member, :membership_fee_cycles, actor: actor)
       result = PaymentAging.open_cycles(member, %{from: ~D[2024-01-01], to: ~D[2024-12-31]})
 
-      assert length(result.unpaid) == 2
-      assert length(result.suspended) == 1
-      assert Enum.all?(result.unpaid, &(&1.status == :unpaid))
-      assert Enum.all?(result.suspended, &(&1.status == :suspended))
+      assert Enum.map(result, & &1.status) == [:unpaid, :unpaid, :suspended]
+
+      assert Enum.map(result, & &1.cycle_start) == [
+               ~D[2024-01-01],
+               ~D[2024-02-01],
+               ~D[2024-03-01]
+             ]
     end
 
     test "nil bounds include every unpaid/suspended cycle", %{actor: actor, ft: ft} do
@@ -141,8 +146,22 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
       member = Ash.load!(member, :membership_fee_cycles, actor: actor)
       result = PaymentAging.open_cycles(member, PaymentAging.default_period())
 
-      assert length(result.unpaid) == 1
-      assert length(result.suspended) == 1
+      assert Enum.map(result, & &1.status) == [:unpaid, :suspended]
+    end
+  end
+
+  describe "tooltip_cycles/1 (five-slot cap)" do
+    test "five or fewer cycles show in full with no overflow" do
+      cycles = for i <- 1..5, do: %{n: i}
+      assert PaymentAging.tooltip_cycles(cycles) == {cycles, 0}
+    end
+
+    test "more than five collapses to first four cycles plus the overflow count" do
+      cycles = for i <- 1..19, do: %{n: i}
+      {shown, overflow} = PaymentAging.tooltip_cycles(cycles)
+
+      assert shown == Enum.take(cycles, 4)
+      assert overflow == 15
     end
   end
 end
diff --git a/test/mv_web/member_live/index_payment_wiring_test.exs b/test/mv_web/member_live/index_payment_wiring_test.exs
new file mode 100644
index 00000000..8991ca08
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_wiring_test.exs
@@ -0,0 +1,72 @@
+defmodule MvWeb.MemberLive.IndexPaymentWiringTest do
+  @moduledoc """
+  §1.16 / §1.17 — the member overview LiveView honours the period-scoped
+  payment-count filter and payment-period URL contract (`pay_filter`,
+  `pay_from`, `pay_to`), driving the same DB result set the OverviewQuery unit
+  tests pin, but through `handle_params` and the query wiring.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    ft = create_fee_type(%{interval: :monthly}, actor)
+
+    # Deterministic id set: drop the seeded members.
+    Mv.Membership.Member
+    |> Ash.read!(actor: actor)
+    |> Enum.each(&Ash.destroy!(&1, actor: actor))
+
+    %{conn: conn_with_oidc_user(conn), actor: actor, ft: ft}
+  end
+
+  defp member_with_unpaid(n, actor, ft) do
+    member = member_fixture_with_actor(%{}, actor)
+
+    Enum.each(1..max(n, 0)//1, fn i ->
+      create_cycle(member, ft, %{cycle_start: Date.new!(2024, i, 1), status: :unpaid}, actor)
+    end)
+
+    member
+  end
+
+  test "has-unpaid >= 2 shows only members with at least two in-period unpaid cycles", ctx do
+    one = member_with_unpaid(1, ctx.actor, ctx.ft)
+    two = member_with_unpaid(2, ctx.actor, ctx.ft)
+
+    {:ok, view, _html} =
+      live(ctx.conn, "/members?pay_filter=unpaid_2&pay_from=2024-01-01&pay_to=2024-12-31")
+
+    assert has_element?(view, "#row-#{two.id}")
+    refute has_element?(view, "#row-#{one.id}")
+  end
+
+  test "fully_paid shows only members with zero in-period unpaid cycles", ctx do
+    paid = member_with_unpaid(0, ctx.actor, ctx.ft)
+    create_cycle(paid, ctx.ft, %{cycle_start: ~D[2024-05-01], status: :paid}, ctx.actor)
+    unpaid = member_with_unpaid(1, ctx.actor, ctx.ft)
+
+    {:ok, view, _html} =
+      live(ctx.conn, "/members?pay_filter=fully_paid&pay_from=2024-01-01&pay_to=2024-12-31")
+
+    assert has_element?(view, "#row-#{paid.id}")
+    refute has_element?(view, "#row-#{unpaid.id}")
+  end
+
+  test "the active period scopes the filter: a cycle outside the period does not count", ctx do
+    # One unpaid cycle in 2023, none in 2024. With a 2024 period, has-unpaid>=1
+    # must not select this member; with the all-outstanding default it must.
+    member = member_fixture_with_actor(%{}, ctx.actor)
+    create_cycle(member, ctx.ft, %{cycle_start: ~D[2023-03-01], status: :unpaid}, ctx.actor)
+
+    {:ok, scoped, _} =
+      live(ctx.conn, "/members?pay_filter=unpaid_1&pay_from=2024-01-01&pay_to=2024-12-31")
+
+    refute has_element?(scoped, "#row-#{member.id}")
+
+    {:ok, all_time, _} = live(ctx.conn, "/members?pay_filter=unpaid_1")
+    assert has_element?(all_time, "#row-#{member.id}")
+  end
+end
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index fbff9f47..d8946529 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -473,17 +473,26 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
   end
 
-  # Opens the member-filter dropdown so its boolean filter controls are rendered.
-  defp open_member_filter(view) do
-    view
-    |> element(~s(button[phx-click="toggle_dropdown"][aria-label="Filter members"]))
-    |> render_click()
+  # Number of active add-filter chips currently rendered. The builder shows one
+  # chip per active filter value; this replaces the removed panel's active-count
+  # badge as the observable carrier of the filter count.
+  defp chip_count(view) do
+    render(view)
+    |> LazyHTML.from_fragment()
+    |> LazyHTML.query(~s([data-testid="filter-chip"]))
+    |> Enum.count()
   end
 
-  # Returns the rendered HTML of the member-filter dropdown (with it open).
-  defp member_filter_html(view) do
-    open_member_filter(view)
-    render(view)
+  # Whether a boolean custom-field filter chip for `field` in the given state
+  # ("Yes"/"No") is rendered.
+  defp boolean_chip?(view, field, state) do
+    render(view) =~ "#{field.name}: #{state}"
+  end
+
+  # Whether the field picker offers a pickable option for the given custom field.
+  defp picker_has_field?(view, field_id) do
+    open_picker(view)
+    has_element?(view, "#member-filter-field-opt-#{field_id}")
   end
 
   describe "copy_emails feature" do
@@ -797,10 +806,8 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       assert html =~ "hero-chevron-down"
 
-      # The bulk-actions trigger and the bespoke member-filter trigger each
-      # carry their own chevron; assert the filter trigger's chevron is pinned
-      # independently, so removing it from the filter component fails this test.
-      assert has_element?(view, ".member-filter-dropdown .hero-chevron-down")
+      # The bulk-actions trigger carries its own trailing chevron.
+      assert has_element?(view, "[data-testid='bulk-actions-button'] .hero-chevron-down")
     end
 
     test "dropdown opens and closes on click", %{conn: conn} do
@@ -1055,7 +1062,7 @@ defmodule MvWeb.MemberLive.IndexTest do
 
     test "scope is :filtered when a non-search filter is active", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
-      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=paid")
+      {:ok, _view, html} = live(conn, "/members?pay_filter=fully_paid")
 
       badge = scope_badge(html)
       assert badge |> LazyHTML.text() |> String.trim() == "filtered"
@@ -1162,230 +1169,6 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
   end
 
-  describe "cycle status filter" do
-    # Helper to create a member (only used in this describe block)
-    defp create_member(attrs, actor) do
-      default_attrs = %{
-        first_name: "Test",
-        last_name: "Member",
-        email: "test.member.#{System.unique_integer([:positive])}@example.com"
-      }
-
-      attrs = Map.merge(default_attrs, attrs)
-      {:ok, member} = Membership.create_member(attrs, actor: actor)
-      member
-    end
-
-    test "filter shows only members with paid status in last cycle", %{conn: conn} do
-      system_actor = SystemActor.get_system_actor()
-      conn = conn_with_oidc_user(conn)
-      fee_type = create_fee_type(%{interval: :yearly}, system_actor)
-      today = Date.utc_today()
-      last_year_start = Date.new!(today.year - 1, 1, 1)
-
-      # Member with paid last cycle
-      paid_member =
-        create_member(
-          %{
-            first_name: "PaidLast",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        paid_member,
-        fee_type,
-        %{cycle_start: last_year_start, status: :paid, replace_existing: true},
-        system_actor
-      )
-
-      # Member with unpaid last cycle
-      unpaid_member =
-        create_member(
-          %{
-            first_name: "UnpaidLast",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        unpaid_member,
-        fee_type,
-        %{cycle_start: last_year_start, status: :unpaid, replace_existing: true},
-        system_actor
-      )
-
-      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=paid")
-
-      assert html =~ "PaidLast"
-      refute html =~ "UnpaidLast"
-    end
-
-    test "filter shows only members with unpaid status in last cycle", %{conn: conn} do
-      system_actor = SystemActor.get_system_actor()
-      conn = conn_with_oidc_user(conn)
-      fee_type = create_fee_type(%{interval: :yearly}, system_actor)
-      today = Date.utc_today()
-      last_year_start = Date.new!(today.year - 1, 1, 1)
-
-      # Member with paid last cycle
-      paid_member =
-        create_member(
-          %{
-            first_name: "PaidLast",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        paid_member,
-        fee_type,
-        %{cycle_start: last_year_start, status: :paid, replace_existing: true},
-        system_actor
-      )
-
-      # Member with unpaid last cycle
-      unpaid_member =
-        create_member(
-          %{
-            first_name: "UnpaidLast",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        unpaid_member,
-        fee_type,
-        %{cycle_start: last_year_start, status: :unpaid, replace_existing: true},
-        system_actor
-      )
-
-      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=unpaid")
-
-      refute html =~ "PaidLast"
-      assert html =~ "UnpaidLast"
-    end
-
-    test "filter shows only members with paid status in current cycle", %{conn: conn} do
-      system_actor = SystemActor.get_system_actor()
-      conn = conn_with_oidc_user(conn)
-      fee_type = create_fee_type(%{interval: :yearly}, system_actor)
-      today = Date.utc_today()
-      current_year_start = Date.new!(today.year, 1, 1)
-
-      # Member with paid current cycle
-      paid_member =
-        create_member(
-          %{
-            first_name: "PaidCurrent",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        paid_member,
-        fee_type,
-        %{cycle_start: current_year_start, status: :paid, replace_existing: true},
-        system_actor
-      )
-
-      # Member with unpaid current cycle
-      unpaid_member =
-        create_member(
-          %{
-            first_name: "UnpaidCurrent",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        unpaid_member,
-        fee_type,
-        %{cycle_start: current_year_start, status: :unpaid, replace_existing: true},
-        system_actor
-      )
-
-      {:ok, _view, html} = live(conn, "/members?cycle_status_filter=paid&show_current_cycle=true")
-
-      assert html =~ "PaidCurrent"
-      refute html =~ "UnpaidCurrent"
-    end
-
-    test "filter shows only members with unpaid status in current cycle", %{conn: conn} do
-      system_actor = SystemActor.get_system_actor()
-      conn = conn_with_oidc_user(conn)
-      fee_type = create_fee_type(%{interval: :yearly}, system_actor)
-      today = Date.utc_today()
-      current_year_start = Date.new!(today.year, 1, 1)
-
-      # Member with paid current cycle
-      paid_member =
-        create_member(
-          %{
-            first_name: "PaidCurrent",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        paid_member,
-        fee_type,
-        %{cycle_start: current_year_start, status: :paid, replace_existing: true},
-        system_actor
-      )
-
-      # Member with unpaid current cycle
-      unpaid_member =
-        create_member(
-          %{
-            first_name: "UnpaidCurrent",
-            membership_fee_type_id: fee_type.id
-          },
-          system_actor
-        )
-
-      create_cycle(
-        unpaid_member,
-        fee_type,
-        %{cycle_start: current_year_start, status: :unpaid, replace_existing: true},
-        system_actor
-      )
-
-      {:ok, _view, html} =
-        live(conn, "/members?cycle_status_filter=unpaid&show_current_cycle=true")
-
-      refute html =~ "PaidCurrent"
-      assert html =~ "UnpaidCurrent"
-    end
-
-    test "toggle cycle view updates URL and preserves filter", %{conn: conn} do
-      conn = conn_with_oidc_user(conn)
-
-      # Start with last cycle view and paid filter
-      {:ok, view, _html} = live(conn, "/members?cycle_status_filter=paid")
-
-      # Toggle to current cycle - this should update URL and preserve filter
-      # Use the button in the toolbar
-      view
-      |> element("button[phx-click='toggle_cycle_view']")
-      |> render_click()
-
-      # Wait for patch to complete
-      path = assert_patch(view)
-
-      # URL should contain both filter and show_current_cycle
-      assert path =~ "cycle_status_filter=paid"
-      assert path =~ "show_current_cycle=true"
-    end
-  end
-
   describe "boolean custom field filters" do
     # Helper to create a boolean custom field (uses system actor for authorization)
     defp create_boolean_custom_field(attrs \\ %{}) do
@@ -1454,12 +1237,13 @@ defmodule MvWeb.MemberLive.IndexTest do
       string_field = create_string_custom_field(%{name: "Phone Number"})
 
       {:ok, view, _html} = live(conn, "/members")
-      open_member_filter(view)
+      open_picker(view)
 
-      # Only the boolean fields render a tri-state filter control; the string field does not.
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field1.id}-all"}")
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field2.id}-all"}")
-      refute has_element?(view, "##{"custom-boolean-filter-#{string_field.id}-all"}")
+      # Only the boolean fields are offered as pickable filter fields; the string
+      # field is not filterable on the overview.
+      assert has_element?(view, "#member-filter-field-opt-#{boolean_field1.id}")
+      assert has_element?(view, "#member-filter-field-opt-#{boolean_field2.id}")
+      refute has_element?(view, "#member-filter-field-opt-#{string_field.id}")
     end
 
     test "mount sorts boolean custom fields by name ascending", %{conn: conn} do
@@ -1471,19 +1255,16 @@ defmodule MvWeb.MemberLive.IndexTest do
       field_m = create_boolean_custom_field(%{name: "Middle Field"})
 
       {:ok, view, _html} = live(conn, "/members")
-      html = member_filter_html(view)
+      open_picker(view)
 
-      # The rendered boolean filter controls appear in name-ascending order.
+      # The picker lists the boolean custom fields in name-ascending order.
       rendered_order =
-        html
+        render(view)
         |> LazyHTML.from_fragment()
-        |> LazyHTML.query(~s(input[id$="-all"][name^="custom_boolean"]))
+        |> LazyHTML.query(~s(#member-filter-field-listbox [role="option"]))
         |> LazyHTML.attribute("id")
-        |> Enum.map(
-          &(&1
-            |> String.replace_prefix("custom-boolean-filter-", "")
-            |> String.replace_suffix("-all", ""))
-        )
+        |> Enum.map(&String.replace_prefix(&1, "member-filter-field-opt-", ""))
+        |> Enum.filter(&(&1 in [field_a.id, field_m.id, field_z.id]))
 
       assert rendered_order == [field_a.id, field_m.id, field_z.id]
     end
@@ -1492,17 +1273,14 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       boolean_field = create_boolean_custom_field()
 
-      # Test true value: the "Yes" radio is checked (the boolean true, not the string "true").
+      # Test true value: a "Yes" chip for the field (the boolean true, not "true").
       {:ok, view1, _html} = live(conn, "/members?bf_#{boolean_field.id}=true")
-      open_member_filter(view1)
-      assert has_element?(view1, "##{"custom-boolean-filter-#{boolean_field.id}-true"}[checked]")
-      refute has_element?(view1, "##{"custom-boolean-filter-#{boolean_field.id}-all"}[checked]")
+      assert boolean_chip?(view1, boolean_field, "Yes")
+      refute boolean_chip?(view1, boolean_field, "No")
 
-      # Test false value: the "No" radio is checked.
+      # Test false value: a "No" chip for the field.
       {:ok, view2, _html} = live(conn, "/members?bf_#{boolean_field.id}=false")
-      open_member_filter(view2)
-      assert has_element?(view2, "##{"custom-boolean-filter-#{boolean_field.id}-false"}[checked]")
-      refute has_element?(view2, "##{"custom-boolean-filter-#{boolean_field.id}-all"}[checked]")
+      assert boolean_chip?(view2, boolean_field, "No")
     end
 
     test "handle_params ignores non-existent custom field IDs", %{conn: conn} do
@@ -1510,11 +1288,10 @@ defmodule MvWeb.MemberLive.IndexTest do
       fake_id = Ecto.UUID.generate()
 
       {:ok, view, _html} = live(conn, "/members?bf_#{fake_id}=true")
-      open_member_filter(view)
 
-      # No filter control exists for a non-existent field, and no active-filter badge appears.
-      refute has_element?(view, "##{"custom-boolean-filter-#{fake_id}-true"}")
-      refute has_element?(view, ~s(button[aria-label="Filter members"].btn-active))
+      # A non-existent field is not offered in the picker and produces no chip.
+      refute picker_has_field?(view, fake_id)
+      assert chip_count(view) == 0
     end
 
     test "handle_params ignores non-boolean custom fields", %{conn: conn} do
@@ -1522,11 +1299,10 @@ defmodule MvWeb.MemberLive.IndexTest do
       string_field = create_string_custom_field()
 
       {:ok, view, _html} = live(conn, "/members?bf_#{string_field.id}=true")
-      open_member_filter(view)
 
-      # A string field is never rendered as a boolean filter, and no filter becomes active.
-      refute has_element?(view, "##{"custom-boolean-filter-#{string_field.id}-true"}")
-      refute has_element?(view, ~s(button[aria-label="Filter members"].btn-active))
+      # A string field is never a filterable field, and no filter becomes active.
+      refute picker_has_field?(view, string_field.id)
+      assert chip_count(view) == 0
     end
 
     test "handle_params ignores invalid filter values", %{conn: conn} do
@@ -1538,11 +1314,10 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       for invalid_value <- invalid_values do
         {:ok, view, _html} = live(conn, "/members?bf_#{boolean_field.id}=#{invalid_value}")
-        open_member_filter(view)
 
-        # An invalid value leaves the field's filter at "All" (no filter applied).
-        assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-all"}[checked]"),
-               "Invalid value '#{invalid_value}' should leave the filter at All"
+        # An invalid value applies no filter, so no chip is rendered.
+        assert chip_count(view) == 0,
+               "Invalid value '#{invalid_value}' should leave the filter unset"
       end
     end
 
@@ -1557,16 +1332,11 @@ defmodule MvWeb.MemberLive.IndexTest do
           "/members?bf_#{boolean_field1.id}=true&bf_#{boolean_field2.id}=false"
         )
 
-      open_member_filter(view)
-
-      # Both filters are reflected: field1 at "Yes", field2 at "No", and the
-      # active-filter count badge shows 2.
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field1.id}-true"}[checked]")
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field2.id}-false"}[checked]")
-
-      assert view
-             |> element(~s(button[aria-label="Filter members"] .badge), "2")
-             |> has_element?()
+      # Both filters are reflected as chips: field1 at "Yes", field2 at "No", for
+      # a total of two active-filter chips.
+      assert boolean_chip?(view, boolean_field1, "Yes")
+      assert boolean_chip?(view, boolean_field2, "No")
+      assert chip_count(view) == 2
     end
 
     test "build_query_params includes active boolean filters and excludes nil filters", %{
@@ -1630,22 +1400,20 @@ defmodule MvWeb.MemberLive.IndexTest do
       assert path2 =~ "bf_#{boolean_field.id}=true"
     end
 
-    test "boolean filters work together with cycle_status_filter", %{conn: conn} do
+    test "boolean filters work together with the payment filter", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
       boolean_field = create_boolean_custom_field()
 
       {:ok, view, _html} =
         live(
           conn,
-          "/members?cycle_status_filter=paid&bf_#{boolean_field.id}=true"
+          "/members?pay_filter=fully_paid&bf_#{boolean_field.id}=true"
         )
 
-      open_member_filter(view)
-
-      # Both filters are reflected in the rendered controls: the boolean field at
-      # "Yes" and the payment-status filter at "paid".
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-true"}[checked]")
-      assert has_element?(view, "#payment-filter-paid[checked]")
+      # Both filters are reflected as chips: the boolean field at "Yes" and the
+      # period-scoped payment filter as "Fully paid".
+      assert boolean_chip?(view, boolean_field, "Yes")
+      assert render(view) =~ "Fully paid"
 
       # Both should be in URL when triggering search
       view
@@ -1653,7 +1421,7 @@ defmodule MvWeb.MemberLive.IndexTest do
       |> render_change(%{value: "test"})
 
       path = assert_patch(view)
-      assert path =~ "cycle_status_filter=paid"
+      assert path =~ "pay_filter=fully_paid"
       assert path =~ "bf_#{boolean_field.id}=true"
     end
 
@@ -1666,8 +1434,7 @@ defmodule MvWeb.MemberLive.IndexTest do
       {:ok, view, _html} =
         live(conn, "/members?bf_#{boolean_field.id}=true")
 
-      open_member_filter(view)
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-true"}[checked]")
+      assert boolean_chip?(view, boolean_field, "Yes")
 
       # Delete the custom field (requires actor with destroy permission)
       Ash.destroy!(boolean_field, actor: system_actor)
@@ -1676,11 +1443,9 @@ defmodule MvWeb.MemberLive.IndexTest do
       {:ok, view2, _html} =
         live(conn, "/members?bf_#{boolean_field.id}=true")
 
-      open_member_filter(view2)
-
-      # The deleted field renders no filter control and no filter is active.
-      refute has_element?(view2, "##{"custom-boolean-filter-#{boolean_field.id}-true"}")
-      refute has_element?(view2, ~s(button[aria-label="Filter members"].btn-active))
+      # The deleted field is not offered in the picker and no filter is active.
+      refute picker_has_field?(view2, boolean_field.id)
+      assert chip_count(view2) == 0
     end
 
     test "handle_params handles URL-encoded custom field IDs correctly", %{conn: conn} do
@@ -1693,11 +1458,9 @@ defmodule MvWeb.MemberLive.IndexTest do
       {:ok, view, _html} =
         live(conn, "/members?bf_#{encoded_id}=true")
 
-      open_member_filter(view)
-
       # Phoenix decodes the param, so the filter applies under the original ID:
-      # the "Yes" radio for the field is checked.
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-true"}[checked]")
+      # a "Yes" chip is rendered for the field.
+      assert boolean_chip?(view, boolean_field, "Yes")
     end
 
     test "handle_params ignores malformed prefix (bf_bf_<uuid>)", %{conn: conn} do
@@ -1708,12 +1471,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       {:ok, view, _html} =
         live(conn, "/members?bf_bf_#{boolean_field.id}=true")
 
-      open_member_filter(view)
-
-      # The double-prefixed param is not a valid filter: the field stays at "All"
-      # and no filter is active.
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-all"}[checked]")
-      refute has_element?(view, ~s(button[aria-label="Filter members"].btn-active))
+      # The double-prefixed param is not a valid filter: no chip is active.
+      assert chip_count(view) == 0
     end
 
     test "handle_params limits number of boolean filters to prevent DoS", %{conn: conn} do
@@ -1728,11 +1487,9 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       {:ok, view, _html} = live(conn, "/members?#{filter_params}")
 
-      # The active-filter count badge is the observable carrier of the filter count.
+      # The active-filter chips are the observable carrier of the filter count.
       # With 60 requested filters, the DoS cap clamps it to exactly 50.
-      assert view
-             |> element(~s(button[aria-label="Filter members"] .badge), "50")
-             |> has_element?()
+      assert chip_count(view) == 50
     end
 
     test "handle_params ignores extremely long custom field IDs", %{conn: conn} do
@@ -1745,12 +1502,10 @@ defmodule MvWeb.MemberLive.IndexTest do
       {:ok, view, _html} =
         live(conn, "/members?bf_#{fake_long_id}=true")
 
-      open_member_filter(view)
-
-      # The over-long ID is rejected: the real field stays at "All" and no filter
-      # is active.
-      assert has_element?(view, "##{"custom-boolean-filter-#{boolean_field.id}-all"}[checked]")
-      refute has_element?(view, ~s(button[aria-label="Filter members"].btn-active))
+      # The over-long ID is rejected: no filter is active. (`boolean_field` is
+      # created only to prove a real field is unaffected.)
+      assert boolean_field.id
+      assert chip_count(view) == 0
     end
 
     # Helper to create a member with a boolean custom field value
@@ -2092,7 +1847,7 @@ defmodule MvWeb.MemberLive.IndexTest do
       refute html_false =~ "NoValue"
     end
 
-    test "boolean filter integration works together with cycle_status_filter", %{conn: conn} do
+    test "boolean filter integration works together with the payment filter", %{conn: conn} do
       system_actor = SystemActor.get_system_actor()
       conn = conn_with_oidc_user(conn)
       boolean_field = create_boolean_custom_field()
@@ -2156,11 +1911,12 @@ defmodule MvWeb.MemberLive.IndexTest do
         system_actor
       )
 
-      # Test both filters together
+      # Test both filters together: fully-paid (0 unpaid cycles in the period)
+      # plus the boolean field at "Yes".
       {:ok, _view, html} =
-        live(conn, "/members?cycle_status_filter=paid&bf_#{boolean_field.id}=true")
+        live(conn, "/members?pay_filter=fully_paid&bf_#{boolean_field.id}=true")
 
-      # Only member_paid_true should match both filters
+      # Only member_paid_true has zero unpaid cycles and the boolean value true.
       assert html =~ "PaidTrue"
       refute html =~ "UnpaidTrue"
     end
@@ -2246,25 +2002,25 @@ defmodule MvWeb.MemberLive.IndexTest do
     end
 
     @tag :ui
-    test "boolean custom field appears in filter dropdown after being added", %{conn: conn} do
+    test "boolean custom field appears in the field picker after being added", %{conn: conn} do
       conn = conn_with_oidc_user(conn)
 
       # Start with no boolean custom fields
       {:ok, view, _html} = live(conn, "/members")
-      open_member_filter(view)
+      open_picker(view)
 
-      # No boolean field control is rendered yet.
-      refute has_element?(view, ~s(input[name^="custom_boolean"]))
+      # With no custom fields, the picker renders no "Custom fields" group.
+      refute has_element?(view, "[data-testid='field-group-header']", "Custom fields")
 
       # Create a new boolean custom field
       new_boolean_field = create_boolean_custom_field(%{name: "Newly Added Field"})
 
-      # Navigate again - the new field should appear in the filter dropdown.
+      # Navigate again - the new field should appear in the picker.
       {:ok, view2, _html} = live(conn, "/members")
-      html_after = member_filter_html(view2)
+      open_picker(view2)
 
-      assert has_element?(view2, "##{"custom-boolean-filter-#{new_boolean_field.id}-all"}")
-      assert html_after =~ "Newly Added Field"
+      assert has_element?(view2, "#member-filter-field-opt-#{new_boolean_field.id}")
+      assert render(view2) =~ "Newly Added Field"
     end
 
     @tag :slow
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index f924a55f..7fb6dfec 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -36,6 +36,7 @@ defmodule MvWeb.ConnCase do
       import Plug.Conn
       import Phoenix.ConnTest
       import MvWeb.ConnCase
+      import MvWeb.FilterBuilderHelpers
     end
   end
 
diff --git a/test/support/filter_builder_helpers.ex b/test/support/filter_builder_helpers.ex
new file mode 100644
index 00000000..54a88953
--- /dev/null
+++ b/test/support/filter_builder_helpers.ex
@@ -0,0 +1,83 @@
+defmodule MvWeb.FilterBuilderHelpers do
+  @moduledoc """
+  Test helpers for driving the member-overview `AddFilterBuilderComponent`.
+
+  The add-filter flow is: open the picker → pick a field → change the focused
+  value control (which commits the filter and re-loads the list). These helpers
+  encapsulate that sequence so tests read at the intent level and stay robust to
+  the builder's internal markup.
+
+  Each `apply_*` returns the patched path (the new `/members?…` URL) so callers
+  can assert the URL-encoded filter contract.
+  """
+
+  import Phoenix.LiveViewTest
+
+  @builder_id "member-filter"
+
+  @doc "Opens the field picker."
+  def open_picker(view) do
+    view |> element("[data-testid='add-filter-trigger']") |> render_click()
+  end
+
+  @doc "Opens the picker and selects the field with the given descriptor key."
+  def pick_field(view, key) do
+    open_picker(view)
+    view |> element("##{@builder_id}-field-opt-#{key}") |> render_click()
+  end
+
+  @doc "Applies a group in/not_in/all filter through the builder."
+  def apply_group_filter(view, group_id, value) do
+    pick_field(view, "group")
+
+    view
+    |> element("[data-testid='value-control-group']")
+    |> render_change(%{"group_#{group_id}" => to_string(value)})
+
+    flush_and_patch(view)
+  end
+
+  @doc "Applies a fee-type in/not_in/all filter through the builder."
+  def apply_fee_type_filter(view, fee_type_id, value) do
+    pick_field(view, "fee_type")
+
+    view
+    |> element("[data-testid='value-control-fee-type']")
+    |> render_change(%{"fee_type_#{fee_type_id}" => to_string(value)})
+
+    flush_and_patch(view)
+  end
+
+  @doc "Applies a boolean custom-field filter (true/false/all) through the builder."
+  def apply_boolean_filter(view, field_id, value) do
+    pick_field(view, field_id)
+
+    view
+    |> element("[data-testid='value-control-boolean']")
+    |> render_change(%{"custom_boolean" => %{"#{field_id}" => to_string(value)}})
+
+    flush_and_patch(view)
+  end
+
+  @doc """
+  Applies a payment-count filter (and optionally a period) through the builder.
+  `filter` is one of `"all"`, `"fully_paid"`, `"unpaid_1"`, `"unpaid_2"`,
+  `"unpaid_3"`; `from`/`to` are ISO-8601 strings or `""`.
+  """
+  def apply_payment_filter(view, filter, from \\ "", to \\ "") do
+    pick_field(view, "payment")
+
+    view
+    |> element("[data-testid='value-control-payment']")
+    |> render_change(%{"pay" => filter, "pay_from" => from, "pay_to" => to})
+
+    flush_and_patch(view)
+  end
+
+  # Forces the LiveView to process the queued filter message(s) and returns the
+  # resulting patched path.
+  defp flush_and_patch(view) do
+    _ = render(view)
+    assert_patch(view)
+  end
+end

From c0d1550401d09c45e32c15b0915336bd12947193 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:15 +0200
Subject: [PATCH 23/30] feat(overview): add point-in-time, suspended, OR-group
 and count-range filters

---
 lib/mv/constants.ex                           |  51 ++++++
 .../add_filter_builder_component.ex           |  43 +++--
 lib/mv_web/live/member_live/index.ex          |  58 +++++--
 lib/mv_web/live/member_live/index.html.heex   |  26 +++-
 .../live/member_live/index/date_presets.ex    |  70 +++++++++
 .../live/member_live/index/overview_query.ex  | 147 ++++++++++++++----
 .../live/member_live/index/payment_aging.ex   | 111 ++++++++++++-
 lib/mv_web/live/member_live/index/stichtag.ex |  36 +++++
 priv/gettext/de/LC_MESSAGES/default.po        |  61 ++++----
 priv/gettext/default.pot                      |  46 ++++--
 .../index_date_presets_property_test.exs      |  66 ++++++++
 .../member_live/index_date_presets_test.exs   |  26 +++-
 .../index_filter_url_roundtrip_test.exs       |  38 +++++
 .../member_live/index_group_or_test.exs       |  72 +++++++++
 .../member_live/index_groups_filter_test.exs  |   4 +-
 .../index_payment_count_codec_test.exs        |  41 +++++
 .../member_live/index_payment_filter_test.exs |  18 +++
 .../member_live/index_payment_period_test.exs |  37 +++++
 .../member_live/index_payment_sort_test.exs   |  85 ++++++++++
 .../member_live/index_payment_wiring_test.exs |  21 +++
 .../index_status_params_codec_test.exs        |  40 +++++
 .../index_stichtag_property_test.exs          |  78 ++++++++++
 .../index_suspended_filter_test.exs           |  58 +++++++
 23 files changed, 1116 insertions(+), 117 deletions(-)
 create mode 100644 lib/mv_web/live/member_live/index/date_presets.ex
 create mode 100644 lib/mv_web/live/member_live/index/stichtag.ex
 create mode 100644 test/mv_web/member_live/index_date_presets_property_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_url_roundtrip_test.exs
 create mode 100644 test/mv_web/member_live/index_group_or_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_count_codec_test.exs
 create mode 100644 test/mv_web/member_live/index_payment_sort_test.exs
 create mode 100644 test/mv_web/member_live/index_status_params_codec_test.exs
 create mode 100644 test/mv_web/member_live/index_stichtag_property_test.exs
 create mode 100644 test/mv_web/member_live/index_suspended_filter_test.exs

diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex
index 449d1868..f60f77ad 100644
--- a/lib/mv/constants.ex
+++ b/lib/mv/constants.ex
@@ -44,6 +44,14 @@ defmodule Mv.Constants do
 
   @payment_filter_param "pay_filter"
 
+  @payment_count_min_param "pay_min"
+
+  @payment_count_max_param "pay_max"
+
+  @suspended_param "suspended"
+
+  @stichtag_param "stichtag"
+
   @max_boolean_filters 50
 
   @max_mailto_bulk_recipients 50
@@ -200,6 +208,49 @@ defmodule Mv.Constants do
   """
   def payment_filter_param, do: @payment_filter_param
 
+  @doc """
+  Returns the URL parameter name for the payment open-cycle count lower bound
+  (used with `pay_filter=has_unpaid` for the two-sided count range).
+
+  ## Examples
+
+      iex> Mv.Constants.payment_count_min_param()
+      "pay_min"
+  """
+  def payment_count_min_param, do: @payment_count_min_param
+
+  @doc """
+  Returns the URL parameter name for the payment open-cycle count upper bound.
+
+  ## Examples
+
+      iex> Mv.Constants.payment_count_max_param()
+      "pay_max"
+  """
+  def payment_count_max_param, do: @payment_count_max_param
+
+  @doc """
+  Returns the URL parameter name for the suspended-status filter flag.
+
+  ## Examples
+
+      iex> Mv.Constants.suspended_param()
+      "suspended"
+  """
+  def suspended_param, do: @suspended_param
+
+  @doc """
+  Returns the URL parameter name for the point-in-time membership ("Stichtag")
+  filter: keeps members who were active on the given ISO-8601 date X, i.e.
+  `join_date <= X and (exit_date is nil or exit_date > X)`.
+
+  ## Examples
+
+      iex> Mv.Constants.stichtag_param()
+      "stichtag"
+  """
+  def stichtag_param, do: @stichtag_param
+
   @doc """
   Returns the maximum number of boolean custom field filters allowed per request.
 
diff --git a/lib/mv_web/live/components/add_filter_builder_component.ex b/lib/mv_web/live/components/add_filter_builder_component.ex
index f4d2dc15..35fb3dbb 100644
--- a/lib/mv_web/live/components/add_filter_builder_component.ex
+++ b/lib/mv_web/live/components/add_filter_builder_component.ex
@@ -35,6 +35,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
 
   alias Mv.Constants
   alias MvWeb.MemberLive.Index.DateFilter
+  alias MvWeb.MemberLive.Index.DatePresets
   alias MvWeb.MemberLive.Index.FilterDescriptor
   alias MvWeb.MemberLive.Index.FilterParams
   alias MvWeb.MemberLive.Index.PaymentAging
@@ -968,32 +969,30 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   # --- date presets ---------------------------------------------------------
 
   defp date_presets do
-    [
-      {"this_year", gettext("This year")},
-      {"last_year", gettext("Last year")},
-      {"this_month", gettext("This month")},
-      {"last_30_days", gettext("Last 30 days")}
-    ]
+    Enum.map(DatePresets.all(), fn preset -> {Atom.to_string(preset), preset_label(preset)} end)
   end
 
-  defp preset_range("this_year") do
-    y = Date.utc_today().year
-    {Date.new!(y, 1, 1), Date.new!(y, 12, 31)}
-  end
+  defp preset_label(:last_7_days), do: gettext("Last 7 days")
+  defp preset_label(:last_30_days), do: gettext("Last 30 days")
+  defp preset_label(:last_3_months), do: gettext("Last 3 months")
+  defp preset_label(:last_12_months), do: gettext("Last 12 months")
+  defp preset_label(:this_month), do: gettext("This month")
+  defp preset_label(:this_quarter), do: gettext("This quarter")
+  defp preset_label(:this_year), do: gettext("This year")
 
-  defp preset_range("last_year") do
-    y = Date.utc_today().year - 1
-    {Date.new!(y, 1, 1), Date.new!(y, 12, 31)}
-  end
+  # Resolves a preset string (from `phx-value-preset`) to a concrete `{from, to}`
+  # tuple via the shared, clock-free `DatePresets` resolver, or nil for an
+  # unknown preset. The resolver defines "this year" as period-to-date
+  # ([Jan 1, today]) per §2.8, superseding the prior full-year range.
+  defp preset_range(preset) when is_binary(preset) do
+    case Enum.find(DatePresets.all(), &(Atom.to_string(&1) == preset)) do
+      nil ->
+        nil
 
-  defp preset_range("this_month") do
-    today = Date.utc_today()
-    {Date.beginning_of_month(today), Date.end_of_month(today)}
-  end
-
-  defp preset_range("last_30_days") do
-    today = Date.utc_today()
-    {Date.add(today, -30), today}
+      key ->
+        %{from: from, to: to} = DatePresets.resolve(key)
+        {from, to}
+    end
   end
 
   defp preset_range(_), do: nil
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index b519aa2d..b39ee175 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -59,6 +59,7 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
   alias MvWeb.MemberLive.Index.OverviewQuery
   alias MvWeb.MemberLive.Index.PaymentAging
+  alias MvWeb.MemberLive.Index.Stichtag
   alias MvWeb.MemberLive.Index.ViewSettings
 
   require Ash.Query
@@ -177,6 +178,8 @@ defmodule MvWeb.MemberLive.Index do
       |> assign_new(:sort_order, fn -> :asc end)
       |> assign(:payment_filter, nil)
       |> assign(:payment_period, PaymentAging.default_period())
+      |> assign(:suspended, false)
+      |> assign(:stichtag, nil)
       |> assign(:group_filters, %{})
       |> assign(:groups, groups)
       |> assign(:fee_type_filters, %{})
@@ -679,6 +682,8 @@ defmodule MvWeb.MemberLive.Index do
       |> maybe_update_sort(params)
       |> maybe_update_payment_filter(params)
       |> maybe_update_payment_period(params)
+      |> maybe_update_suspended(params)
+      |> maybe_update_stichtag(params)
       |> maybe_update_group_filters(params)
       |> maybe_update_fee_type_filters(params)
       |> maybe_update_boolean_filters(params)
@@ -728,6 +733,8 @@ defmodule MvWeb.MemberLive.Index do
       socket.assigns.sort_order,
       socket.assigns.payment_filter,
       socket.assigns.payment_period,
+      socket.assigns[:suspended],
+      socket.assigns[:stichtag],
       socket.assigns[:group_filters],
       socket.assigns[:fee_type_filters],
       socket.assigns.boolean_custom_field_filters,
@@ -883,10 +890,19 @@ defmodule MvWeb.MemberLive.Index do
     base_params = add_group_filters(base_params, opts.group_filters || %{})
     base_params = add_fee_type_filters(base_params, opts.fee_type_filters || %{})
     base_params = add_payment_params(base_params, opts.payment_filter, opts.payment_period)
+    base_params = add_status_params(base_params, opts[:suspended], opts[:stichtag])
     base_params = add_boolean_filters(base_params, opts.boolean_filters || %{})
     add_date_filters(base_params, opts.date_filters)
   end
 
+  # Suspended-status flag and Stichtag date serialize additively into the flat
+  # URL contract (suspended=1 / stichtag=<iso>), omitted when inactive (§2.1).
+  defp add_status_params(params, suspended, stichtag) do
+    params
+    |> Map.merge(PaymentAging.suspended_to_params(suspended))
+    |> Map.merge(Stichtag.to_params(stichtag))
+  end
+
   # Period-scoped payment model (§3.3): the payment-count filter and the active
   # period both serialize into the flat URL contract (pay_filter/pay_from/pay_to).
   defp add_payment_params(params, payment_filter, payment_period) do
@@ -906,6 +922,8 @@ defmodule MvWeb.MemberLive.Index do
       sort_order: socket.assigns.sort_order,
       payment_filter: socket.assigns.payment_filter,
       payment_period: socket.assigns.payment_period,
+      suspended: socket.assigns[:suspended] || false,
+      stichtag: socket.assigns[:stichtag],
       group_filters: socket.assigns[:group_filters] || %{},
       boolean_filters: socket.assigns.boolean_custom_field_filters || %{},
       fee_type_filters: socket.assigns[:fee_type_filters] || %{},
@@ -1366,6 +1384,8 @@ defmodule MvWeb.MemberLive.Index do
       date_custom_fields: socket.assigns[:date_custom_fields],
       payment_filter: socket.assigns.payment_filter,
       payment_period: socket.assigns.payment_period,
+      suspended: socket.assigns[:suspended] || false,
+      stichtag: socket.assigns[:stichtag],
       sort_field: socket.assigns.sort_field,
       sort_order: socket.assigns.sort_order,
       custom_fields: socket.assigns.all_custom_fields
@@ -1448,7 +1468,7 @@ defmodule MvWeb.MemberLive.Index do
     valid_fields = Mv.Constants.member_fields() -- non_sortable_fields
 
     field in valid_fields or custom_field_sort?(field) or
-      field in [:groups, :membership_fee_type, :name, :address]
+      field in [:groups, :membership_fee_type, :name, :address, :payment]
   end
 
   defp valid_sort_field_db_or_custom?(field) when is_binary(field) do
@@ -1458,6 +1478,7 @@ defmodule MvWeb.MemberLive.Index do
         field == "membership_fee_type" -> :membership_fee_type
         field == "name" -> :name
         field == "address" -> :address
+        field == "payment" -> :payment
         true -> safe_member_field_atom_only(field)
       end
 
@@ -1507,9 +1528,10 @@ defmodule MvWeb.MemberLive.Index do
   defp determine_field(default, nil), do: default
 
   # Computed/pseudo fields that are nonetheless sortable (they resolve to DB
-  # sort keys in OverviewQuery): groups aggregate and the composite Name/Address
-  # columns. Other computed fields (e.g. membership_fee_status) are not sortable.
-  @sortable_computed_fields [:groups, :name, :address]
+  # sort keys in OverviewQuery): groups aggregate, the composite Name/Address
+  # columns, and the period-scoped payment (unpaid-cycle-count) column. Other
+  # computed fields (e.g. membership_fee_status) are not sortable.
+  @sortable_computed_fields [:groups, :name, :address, :payment]
 
   defp determine_field(default, sf) when is_binary(sf) do
     sortable_strings = Enum.map(@sortable_computed_fields, &Atom.to_string/1)
@@ -1578,6 +1600,15 @@ defmodule MvWeb.MemberLive.Index do
   defp maybe_update_payment_period(socket, params),
     do: assign(socket, :payment_period, PaymentAging.parse_period(params))
 
+  # Suspended-status filter (§1.23) and point-in-time Stichtag (§1.24/§2.6):
+  # both decoded straight from the URL so `handle_params` remains the single
+  # source of truth. Absent params fall back to no filter.
+  defp maybe_update_suspended(socket, params),
+    do: assign(socket, :suspended, PaymentAging.parse_suspended(params))
+
+  defp maybe_update_stichtag(socket, params),
+    do: assign(socket, :stichtag, Stichtag.parse(params))
+
   defp maybe_update_group_filters(socket, params) when is_map(params) do
     prefix = @group_filter_prefix
     prefix_len = String.length(prefix)
@@ -1836,17 +1867,16 @@ defmodule MvWeb.MemberLive.Index do
   all-outstanding default (both bounds nil) reads just "Payment"; a bounded
   period appends the range so the scope is always legible.
   """
-  def payment_column_label(%{from: nil, to: nil}), do: gettext("Fees")
+  def payment_column_label(_period), do: gettext("Fees")
 
-  def payment_column_label(%{from: from, to: to}) do
-    range = "#{payment_bound(from)}–#{payment_bound(to)}"
-    gettext("Fees · %{range}", range: range)
-  end
-
-  def payment_column_label(_), do: gettext("Fees")
-
-  defp payment_bound(%Date{} = d), do: Date.to_iso8601(d)
-  defp payment_bound(_), do: "…"
+  @doc """
+  Whether a payment period is actively scoped (at least one bound set), used to
+  decide whether the compact period indicator badge renders (§1.28). The
+  all-outstanding default (both bounds nil) shows no badge.
+  """
+  def payment_period_active?(%{from: nil, to: nil}), do: false
+  def payment_period_active?(%{from: _, to: _}), do: true
+  def payment_period_active?(_), do: false
 
   defp update_selection_assigns(socket) do
     selected_members = socket.assigns.selected_members
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 5a56e922..fc4aa559 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -456,7 +456,31 @@
       <:col
         :let={member}
         :if={:membership_fee_status in @member_fields_visible}
-        label={MvWeb.MemberLive.Index.payment_column_label(@payment_period)}
+        sort_field={:payment}
+        label={
+          ~H"""
+          <div class="flex items-center gap-1.5">
+            <.live_component
+              module={MvWeb.Components.SortHeaderComponent}
+              id={:sort_payment}
+              field={:payment}
+              label={MvWeb.MemberLive.Index.payment_column_label(@payment_period)}
+              sort_hint={gettext("Click to sort by open payment cycles")}
+              sort_field={@sort_field}
+              sort_order={@sort_order}
+            />
+            <span
+              :if={MvWeb.MemberLive.Index.payment_period_active?(@payment_period)}
+              class="badge badge-soft badge-info badge-sm shrink-0"
+              title={PaymentAging.period_tooltip(@payment_period)}
+              aria-label={PaymentAging.period_tooltip(@payment_period)}
+              data-testid="payment-period-badge"
+            >
+              {PaymentAging.period_short_code(@payment_period) || gettext("filtered")}
+            </span>
+          </div>
+          """
+        }
       >
         <% count = member.unpaid_cycle_count || 0 %>
         <% badge = PaymentAging.badge(count) %>
diff --git a/lib/mv_web/live/member_live/index/date_presets.ex b/lib/mv_web/live/member_live/index/date_presets.ex
new file mode 100644
index 00000000..ca671f73
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/date_presets.ex
@@ -0,0 +1,70 @@
+defmodule MvWeb.MemberLive.Index.DatePresets do
+  @moduledoc """
+  Relative date-range presets for the date value controls (§1.25/§2.8).
+
+  Each preset resolves against a reference date "today" into a concrete
+  `%{from: Date.t(), to: Date.t()}` range. Rolling "last N days/months" presets
+  end on today; the "this month/quarter/year" presets run period-to-date from
+  the respective period start up to today. Resolving is pure and clock-free —
+  the caller passes `today` (defaulting to `Date.utc_today/0`), so the resolved
+  bounds are testable and reproducible.
+
+  The resolved bounds feed the same `jd_*` / `ed_*` / `cdf_*` URL params as an
+  absolute custom range; presets are purely an input convenience and add no new
+  persistence dimension.
+  """
+
+  @type preset ::
+          :last_7_days
+          | :last_30_days
+          | :last_3_months
+          | :last_12_months
+          | :this_month
+          | :this_quarter
+          | :this_year
+
+  @type range :: %{from: Date.t(), to: Date.t()}
+
+  @presets [
+    :last_7_days,
+    :last_30_days,
+    :last_3_months,
+    :last_12_months,
+    :this_month,
+    :this_quarter,
+    :this_year
+  ]
+
+  @doc """
+  Returns every preset key in display order (rolling windows first, then the
+  period-to-date presets), for rendering the preset radio list.
+  """
+  @spec all() :: [preset()]
+  def all, do: @presets
+
+  @doc """
+  Whether `key` names a known preset.
+  """
+  @spec preset?(term()) :: boolean()
+  def preset?(key), do: key in @presets
+
+  @doc """
+  Resolves a preset to a concrete `{from, to}` range relative to `today`
+  (default `Date.utc_today/0`).
+  """
+  @spec resolve(preset(), Date.t()) :: range()
+  def resolve(preset, today \\ Date.utc_today())
+
+  def resolve(:last_7_days, today), do: %{from: Date.add(today, -6), to: today}
+  def resolve(:last_30_days, today), do: %{from: Date.add(today, -29), to: today}
+  def resolve(:last_3_months, today), do: %{from: Date.shift(today, month: -3), to: today}
+  def resolve(:last_12_months, today), do: %{from: Date.shift(today, month: -12), to: today}
+  def resolve(:this_month, today), do: %{from: %{today | day: 1}, to: today}
+
+  def resolve(:this_quarter, today) do
+    first_month = div(today.month - 1, 3) * 3 + 1
+    %{from: Date.new!(today.year, first_month, 1), to: today}
+  end
+
+  def resolve(:this_year, today), do: %{from: Date.new!(today.year, 1, 1), to: today}
+end
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index a45dd077..dc125d65 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -46,9 +46,16 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
       opts[:boolean_custom_fields]
     )
     |> apply_date_filters(opts[:date_filters])
+    |> apply_stichtag_filter(opts[:stichtag])
     |> apply_custom_date_filters(opts[:date_filters], opts[:date_custom_fields])
     |> apply_payment_filter(opts[:payment_filter], payment_period(opts))
-    |> apply_sort(opts[:sort_field], opts[:sort_order], opts[:custom_fields] || [])
+    |> apply_suspended_filter(opts[:suspended], payment_period(opts))
+    |> apply_sort(
+      opts[:sort_field],
+      opts[:sort_order],
+      opts[:custom_fields] || [],
+      payment_period(opts)
+    )
   end
 
   # ---------------------------------------------------------------------------
@@ -61,7 +68,12 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   defp apply_search(query, _), do: query
 
   # ---------------------------------------------------------------------------
-  # Group filters (AND across selected groups)
+  # Group filters (:in OR across selected groups; :not_in AND-of-not-exists)
+  #
+  # Multiple "is" selections bundle into a single membership `exists` over the
+  # union of group ids, so a member matching *any* selected group is kept (OR,
+  # §1.29/§2.7). Each "is not" selection stays an independent not-exists, so a
+  # member is excluded when it belongs to *any* of them.
   # ---------------------------------------------------------------------------
 
   defp apply_group_filters(query, group_filters, _groups)
@@ -71,31 +83,32 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   defp apply_group_filters(query, group_filters, groups) do
     valid_ids = valid_id_set(groups)
 
-    Enum.reduce(group_filters, query, fn {group_id_str, value}, q ->
-      if MapSet.member?(valid_ids, group_id_str) do
-        apply_one_group_filter(q, group_id_str, value)
-      else
-        q
+    {in_filters, not_in_filters} =
+      group_filters
+      |> Enum.filter(fn {id_str, _} -> MapSet.member?(valid_ids, id_str) end)
+      |> Enum.split_with(fn {_, value} -> value == :in end)
+
+    query
+    |> apply_group_in_filter(Enum.map(in_filters, fn {id_str, _} -> id_str end))
+    |> apply_group_not_in_filters(Enum.map(not_in_filters, fn {id_str, _} -> id_str end))
+  end
+
+  defp apply_group_in_filter(query, id_strs) do
+    case cast_uuids(id_strs) do
+      [] -> query
+      uuids -> Ash.Query.filter(query, expr(exists(member_groups, group_id in ^uuids)))
+    end
+  end
+
+  defp apply_group_not_in_filters(query, id_strs) do
+    Enum.reduce(id_strs, query, fn id_str, q ->
+      case Ecto.UUID.cast(id_str) do
+        {:ok, uuid} -> Ash.Query.filter(q, expr(not exists(member_groups, group_id == ^uuid)))
+        _ -> q
       end
     end)
   end
 
-  defp apply_one_group_filter(query, group_id_str, :in) do
-    case Ecto.UUID.cast(group_id_str) do
-      {:ok, uuid} -> Ash.Query.filter(query, expr(exists(member_groups, group_id == ^uuid)))
-      _ -> query
-    end
-  end
-
-  defp apply_one_group_filter(query, group_id_str, :not_in) do
-    case Ecto.UUID.cast(group_id_str) do
-      {:ok, uuid} -> Ash.Query.filter(query, expr(not exists(member_groups, group_id == ^uuid)))
-      _ -> query
-    end
-  end
-
-  defp apply_one_group_filter(query, _id, _value), do: query
-
   # ---------------------------------------------------------------------------
   # Fee-type filters (:in OR; :not_in AND)
   # ---------------------------------------------------------------------------
@@ -209,8 +222,53 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     )
   end
 
+  # Two-sided open-cycle range (§1.22/§3.14): keeps members whose in-period
+  # unpaid count is within [min, max]. `max` nil means unbounded above, so
+  # `{:unpaid_range, 1, nil}` is the default "has open" (>= 1). Both bounds push
+  # to SQL through the same `unpaid_cycle_count` calculation.
+  defp apply_payment_filter(query, {:unpaid_range, min, max}, %{from: from, to: to})
+       when is_integer(min) and min > 0 do
+    query
+    |> Ash.Query.filter(unpaid_cycle_count(period_from: ^from, period_to: ^to) >= ^min)
+    |> apply_unpaid_upper_bound(max, from, to)
+  end
+
   defp apply_payment_filter(query, _filter, _period), do: query
 
+  defp apply_unpaid_upper_bound(query, max, from, to) when is_integer(max) and max > 0 do
+    Ash.Query.filter(
+      query,
+      expr(unpaid_cycle_count(period_from: ^from, period_to: ^to) <= ^max)
+    )
+  end
+
+  defp apply_unpaid_upper_bound(query, _max, _from, _to), do: query
+
+  # Suspended-status filter (§1.23): keeps members with at least one suspended
+  # cycle whose cycle_end falls in the active period. Independent of the unpaid
+  # count, which excludes suspended (§2.5). A correlated `exists` pushes to SQL;
+  # the period bounds are composed conditionally so an unbounded (nil) side adds
+  # no `cycle_end` comparison rather than comparing against a literal nil.
+  defp apply_suspended_filter(query, true, %{from: from, to: to}) do
+    Ash.Query.filter(
+      query,
+      expr(exists(membership_fee_cycles, ^suspended_period_predicate(from, to)))
+    )
+  end
+
+  defp apply_suspended_filter(query, _suspended, _period), do: query
+
+  defp suspended_period_predicate(nil, nil), do: expr(status == :suspended)
+
+  defp suspended_period_predicate(from, nil),
+    do: expr(status == :suspended and cycle_end >= ^from)
+
+  defp suspended_period_predicate(nil, to),
+    do: expr(status == :suspended and cycle_end <= ^to)
+
+  defp suspended_period_predicate(from, to),
+    do: expr(status == :suspended and cycle_end >= ^from and cycle_end <= ^to)
+
   # ---------------------------------------------------------------------------
   # Built-in date filters (join/exit)
   # ---------------------------------------------------------------------------
@@ -226,21 +284,41 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
 
   defp apply_custom_date_filters(query, _filters, _custom_fields), do: query
 
+  # ---------------------------------------------------------------------------
+  # Point-in-time membership ("Stichtag"): a member counts as a member on the
+  # reference date X iff it had joined by X and had not yet left as of X
+  # (§1.24/§2.6). "Left as of X" means a non-nil exit_date at or before X, so an
+  # exit_date strictly after X (or nil) still counts as a member on X.
+  # ---------------------------------------------------------------------------
+
+  defp apply_stichtag_filter(query, %Date{} = x) do
+    Ash.Query.filter(
+      query,
+      expr(join_date <= ^x and (is_nil(exit_date) or exit_date > ^x))
+    )
+  end
+
+  defp apply_stichtag_filter(query, _), do: query
+
   # ---------------------------------------------------------------------------
   # Sort (always append the unique id tie-breaker for keyset stability)
   # ---------------------------------------------------------------------------
 
-  defp apply_sort(query, nil, _order, _custom_fields), do: Ash.Query.sort(query, id: :asc)
-  defp apply_sort(query, _field, nil, _custom_fields), do: Ash.Query.sort(query, id: :asc)
+  defp apply_sort(query, nil, _order, _custom_fields, _period),
+    do: Ash.Query.sort(query, id: :asc)
+
+  defp apply_sort(query, _field, nil, _custom_fields, _period),
+    do: Ash.Query.sort(query, id: :asc)
 
   # Composite "Member" column: sort by last name then first name. The email that
   # shares the cell is display-only and does not affect the sort key (§1.21).
-  defp apply_sort(query, field, order, _custom_fields) when field in [:name, "name"] do
+  defp apply_sort(query, field, order, _custom_fields, _period) when field in [:name, "name"] do
     Ash.Query.sort(query, [{:last_name, order}, {:first_name, order}, {:id, :asc}])
   end
 
   # Composite "Address" column: sort by city, then postal code, then street.
-  defp apply_sort(query, field, order, _custom_fields) when field in [:address, "address"] do
+  defp apply_sort(query, field, order, _custom_fields, _period)
+       when field in [:address, "address"] do
     Ash.Query.sort(query, [
       {:city, order},
       {:postal_code, order},
@@ -249,7 +327,20 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     ])
   end
 
-  defp apply_sort(query, field, order, custom_fields) do
+  # "Beiträge" (payment) column: sort DB-side by the period-scoped unpaid-cycle
+  # count (§1.27). The count calculation takes the active period as arguments so
+  # the sort key matches the displayed value; the id tie-breaker keeps keyset
+  # pages stable across equal counts.
+  defp apply_sort(query, field, order, _custom_fields, %{from: from, to: to})
+       when field in [:payment, "payment"] do
+    Ash.Query.sort(query, [
+      {Ash.Sort.expr_sort(unpaid_cycle_count(period_from: ^from, period_to: ^to), :integer),
+       order},
+      {:id, :asc}
+    ])
+  end
+
+  defp apply_sort(query, field, order, custom_fields, _period) do
     case sort_key(field) do
       nil -> apply_custom_field_sort(query, field, order, custom_fields)
       key -> Ash.Query.sort(query, [{key, order}, {:id, :asc}])
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index e6154aa7..9fc4cd65 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -29,11 +29,18 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   @type period :: %{from: Date.t() | nil, to: Date.t() | nil}
 
-  @type filter :: nil | :fully_paid | {:has_unpaid, 1..3}
+  @type filter ::
+          nil
+          | :fully_paid
+          | {:has_unpaid, 1..3}
+          | {:unpaid_range, pos_integer(), pos_integer() | nil}
 
   @payment_period_from_param Constants.payment_period_from_param()
   @payment_period_to_param Constants.payment_period_to_param()
   @payment_filter_param Constants.payment_filter_param()
+  @payment_count_min_param Constants.payment_count_min_param()
+  @payment_count_max_param Constants.payment_count_max_param()
+  @suspended_param Constants.suspended_param()
 
   @doc """
   The default period: all outstanding cycles, all time (both bounds nil).
@@ -83,6 +90,10 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   @doc """
   Encodes a payment-count filter into URL params. `nil` yields the empty map.
+
+  The two-sided `{:unpaid_range, min, max}` form encodes as
+  `pay_filter=has_unpaid` plus `pay_min` (and `pay_max` when bounded above),
+  so a fresh "has open" default (`min=1`, `max=nil`) round-trips canonically.
   """
   @spec filter_to_params(filter()) :: %{optional(String.t()) => String.t()}
   def filter_to_params(:fully_paid), do: %{@payment_filter_param => "fully_paid"}
@@ -90,14 +101,61 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
   def filter_to_params({:has_unpaid, n}) when n in 1..3,
     do: %{@payment_filter_param => "unpaid_#{n}"}
 
+  def filter_to_params({:unpaid_range, min, max}) when is_integer(min) and min > 0 do
+    %{@payment_filter_param => "has_unpaid", @payment_count_min_param => Integer.to_string(min)}
+    |> maybe_put_max(max)
+  end
+
   def filter_to_params(_), do: %{}
 
+  defp maybe_put_max(params, max) when is_integer(max) and max > 0,
+    do: Map.put(params, @payment_count_max_param, Integer.to_string(max))
+
+  defp maybe_put_max(params, _max), do: params
+
   @doc """
   Decodes the payment-count filter from a full params map.
+
+  A `pay_filter=has_unpaid` value reads the `pay_min`/`pay_max` bounds into a
+  `{:unpaid_range, min, max}`; an absent/invalid `pay_min` defaults to 1 and an
+  absent/invalid `pay_max` to nil (unbounded). Other `pay_filter` values fall
+  back to the single-token decode (`fully_paid` / `unpaid_N`).
   """
   @spec parse_filter_params(map()) :: filter()
-  def parse_filter_params(params) when is_map(params),
-    do: parse_filter(Map.get(params, @payment_filter_param))
+  def parse_filter_params(params) when is_map(params) do
+    case Map.get(params, @payment_filter_param) do
+      "has_unpaid" ->
+        {:unpaid_range, parse_count(Map.get(params, @payment_count_min_param), 1),
+         parse_count(Map.get(params, @payment_count_max_param), nil)}
+
+      other ->
+        parse_filter(other)
+    end
+  end
+
+  defp parse_count(value, default) when is_binary(value) do
+    case Integer.parse(String.trim(value)) do
+      {n, ""} when n > 0 -> n
+      _ -> default
+    end
+  end
+
+  defp parse_count(_value, default), do: default
+
+  @doc """
+  Decodes the suspended-status filter flag (§1.23) from a params map. The flag
+  is present (`suspended=1`) only when active; any other value reads as false.
+  """
+  @spec parse_suspended(map()) :: boolean()
+  def parse_suspended(params) when is_map(params), do: Map.get(params, @suspended_param) == "1"
+
+  @doc """
+  Encodes the suspended-status filter flag into URL params. Only `true` emits a
+  param (`suspended=1`); false/nil yield the empty map so a fresh URL is canonical.
+  """
+  @spec suspended_to_params(boolean() | nil) :: %{optional(String.t()) => String.t()}
+  def suspended_to_params(true), do: %{@suspended_param => "1"}
+  def suspended_to_params(_), do: %{}
 
   @doc """
   Badge descriptor for an unpaid-cycle count. A count of 0 reads "Alle bezahlt"
@@ -132,6 +190,53 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
     }
   end
 
+  @doc """
+  Compact short code for a payment period (§1.28), or nil when the period is not
+  compactly codeable (the header then falls back to a plain "filtered" badge).
+
+    * `{nil, nil}` (all-outstanding default) → nil (no badge)
+    * a full calendar year (Jan 1 – Dec 31) → `"2026"`
+    * a full calendar quarter → `"Q1 2026"`
+    * anything else (arbitrary or open-ended range) → nil
+  """
+  @spec period_short_code(period()) :: String.t() | nil
+  def period_short_code(%{from: %Date{} = from, to: %Date{} = to}) do
+    cond do
+      full_year?(from, to) -> Integer.to_string(from.year)
+      full_quarter?(from, to) -> "Q#{quarter(from.month)} #{from.year}"
+      true -> nil
+    end
+  end
+
+  def period_short_code(_), do: nil
+
+  @doc """
+  Human-readable tooltip naming the active payment period with locally formatted
+  (`dd.MM.yyyy`) bounds (§1.28). The all-outstanding default names all
+  outstanding cycles; open-ended periods render an open bound as an ellipsis.
+  """
+  @spec period_tooltip(period()) :: String.t()
+  def period_tooltip(%{from: nil, to: nil}), do: gettext("Fees across all outstanding cycles")
+
+  def period_tooltip(%{from: from, to: to}) do
+    gettext("Fees in period %{from}–%{to}", from: period_bound(from), to: period_bound(to))
+  end
+
+  def period_tooltip(_), do: gettext("Fees across all outstanding cycles")
+
+  defp period_bound(%Date{} = d), do: DateFormatter.format_date(d)
+  defp period_bound(_), do: "…"
+
+  defp full_year?(from, to),
+    do:
+      from.month == 1 and from.day == 1 and to.year == from.year and to.month == 12 and
+        to.day == 31
+
+  defp full_quarter?(from, to) do
+    from.day == 1 and from.month in [1, 4, 7, 10] and to.year == from.year and
+      to == Date.end_of_month(Date.new!(from.year, from.month + 2, 1))
+  end
+
   @doc """
   A member's open cycles for the badge tooltip: the unpaid and suspended cycles
   whose `cycle_end` falls inside `period`, merged into a single list sorted
diff --git a/lib/mv_web/live/member_live/index/stichtag.ex b/lib/mv_web/live/member_live/index/stichtag.ex
new file mode 100644
index 00000000..647d609d
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/stichtag.ex
@@ -0,0 +1,36 @@
+defmodule MvWeb.MemberLive.Index.Stichtag do
+  @moduledoc """
+  URL codec for the point-in-time membership ("Stichtag") filter (§1.24/§2.6).
+
+  The Stichtag is a single ISO-8601 date X carried in the flat URL contract
+  under the `stichtag` key. When set, the overview keeps members who were active
+  on X (`join_date <= X and (exit_date is nil or exit_date > X)`); the predicate
+  itself lives in `OverviewQuery`. Absent or malformed values decode to nil (no
+  filter), and nil encodes to the empty map so a fresh URL stays canonical.
+  """
+
+  @stichtag_param Mv.Constants.stichtag_param()
+
+  @doc """
+  Decodes the Stichtag date from a params map. Missing or malformed ISO-8601
+  values yield nil.
+  """
+  @spec parse(map()) :: Date.t() | nil
+  def parse(params) when is_map(params), do: parse_date(Map.get(params, @stichtag_param))
+
+  @doc """
+  Encodes a Stichtag date into URL params. nil yields the empty map.
+  """
+  @spec to_params(Date.t() | nil) :: %{optional(String.t()) => String.t()}
+  def to_params(%Date{} = date), do: %{@stichtag_param => Date.to_iso8601(date)}
+  def to_params(_), do: %{}
+
+  defp parse_date(value) when is_binary(value) do
+    case Date.from_iso8601(String.trim(value)) do
+      {:ok, date} -> date
+      _ -> nil
+    end
+  end
+
+  defp parse_date(_), do: nil
+end
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index a8243b50..d6f9123f 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -3956,6 +3956,7 @@ msgid "email %{email} has already been taken"
 msgstr "E-Mail %{email} wurde bereits verwendet"
 
 #: lib/mv_web/components/bulk_actions_dropdown.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "filtered"
 msgstr "gefiltert"
@@ -4212,11 +4213,6 @@ msgstr "Beigetreten"
 msgid "Last 30 days"
 msgstr "Letzte 30 Tage"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Last year"
-msgstr "Letztes Jahr"
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Membership"
@@ -4307,11 +4303,6 @@ msgstr "Februar"
 msgid "Fees"
 msgstr "Beiträge"
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Fees · %{range}"
-msgstr "Beiträge · %{range}"
-
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
 msgid "January"
@@ -4347,27 +4338,37 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Click for member details"
-#~ msgstr "Klicke für Mitglieds-Details"
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by open payment cycles"
+msgstr "Klicke, um nach offenen Beitragszyklen zu sortieren"
 
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "No open cycles for this period"
-#~ msgstr "Keine offenen Zyklen in diesem Zeitraum"
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 12 months"
+msgstr "Letzte 12 Monate"
 
-#~ #: lib/mv_web/live/member_live/index.ex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Payment · %{range}"
-#~ msgstr "Zahlung · %{range}"
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 3 months"
+msgstr "Letzte 3 Monate"
 
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Suspended: %{date}"
-#~ msgstr "Ausgesetzt: %{date}"
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 7 days"
+msgstr "Letzte 7 Tage"
 
-#~ #: lib/mv_web/live/member_live/index.html.heex
-#~ #, elixir-autogen, elixir-format
-#~ msgid "Unpaid until %{date}"
-#~ msgstr "Offen bis %{date}"
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This quarter"
+msgstr "Dieses Quartal"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "Fees across all outstanding cycles"
+msgstr "Beiträge über alle offenen Zyklen"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "Fees in period %{from}–%{to}"
+msgstr "Beiträge im Zeitraum %{from}–%{to}"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 9de292e9..d0f9425b 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -3956,6 +3956,7 @@ msgid "email %{email} has already been taken"
 msgstr ""
 
 #: lib/mv_web/components/bulk_actions_dropdown.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "filtered"
 msgstr ""
@@ -4212,11 +4213,6 @@ msgstr ""
 msgid "Last 30 days"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Last year"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Membership"
@@ -4307,11 +4303,6 @@ msgstr ""
 msgid "Fees"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Fees · %{range}"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
 msgid "January"
@@ -4346,3 +4337,38 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "September"
 msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "Click to sort by open payment cycles"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 12 months"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 3 months"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 7 days"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This quarter"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "Fees across all outstanding cycles"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "Fees in period %{from}–%{to}"
+msgstr ""
diff --git a/test/mv_web/member_live/index_date_presets_property_test.exs b/test/mv_web/member_live/index_date_presets_property_test.exs
new file mode 100644
index 00000000..94c9c69d
--- /dev/null
+++ b/test/mv_web/member_live/index_date_presets_property_test.exs
@@ -0,0 +1,66 @@
+defmodule MvWeb.MemberLive.IndexDatePresetsPropertyTest do
+  @moduledoc """
+  §2.8 — Relative date-range preset resolution.
+
+  For any preset evaluated against any reference date "today", the resolved
+  `{from, to}` matches the preset's definition: rolling "last N days" windows end
+  on today, and the "this month/quarter/year" presets run period-to-date from the
+  respective period start to today.
+  """
+  use ExUnit.Case, async: true
+  use ExUnitProperties
+
+  alias MvWeb.MemberLive.Index.DatePresets
+
+  defp date_gen do
+    gen all(
+          year <- StreamData.integer(2000..2100),
+          month <- StreamData.integer(1..12),
+          day <- StreamData.integer(1..28)
+        ) do
+      Date.new!(year, month, day)
+    end
+  end
+
+  property "last-N-days presets end on today and span N days inclusive" do
+    check all(today <- date_gen()) do
+      assert DatePresets.resolve(:last_7_days, today) == %{from: Date.add(today, -6), to: today}
+      assert DatePresets.resolve(:last_30_days, today) == %{from: Date.add(today, -29), to: today}
+    end
+  end
+
+  property "last-N-months presets shift the start back N months and end on today" do
+    check all(today <- date_gen()) do
+      assert DatePresets.resolve(:last_3_months, today) ==
+               %{from: Date.shift(today, month: -3), to: today}
+
+      assert DatePresets.resolve(:last_12_months, today) ==
+               %{from: Date.shift(today, month: -12), to: today}
+    end
+  end
+
+  property "this-period presets run from the period start to today" do
+    check all(today <- date_gen()) do
+      month_start = %{today | day: 1}
+      q_first_month = div(today.month - 1, 3) * 3 + 1
+      quarter_start = Date.new!(today.year, q_first_month, 1)
+      year_start = Date.new!(today.year, 1, 1)
+
+      assert DatePresets.resolve(:this_month, today) == %{from: month_start, to: today}
+      assert DatePresets.resolve(:this_quarter, today) == %{from: quarter_start, to: today}
+      assert DatePresets.resolve(:this_year, today) == %{from: year_start, to: today}
+    end
+  end
+
+  test "all/0 lists every resolvable preset key in display order" do
+    assert DatePresets.all() == [
+             :last_7_days,
+             :last_30_days,
+             :last_3_months,
+             :last_12_months,
+             :this_month,
+             :this_quarter,
+             :this_year
+           ]
+  end
+end
diff --git a/test/mv_web/member_live/index_date_presets_test.exs b/test/mv_web/member_live/index_date_presets_test.exs
index ce30fe35..f8470b81 100644
--- a/test/mv_web/member_live/index_date_presets_test.exs
+++ b/test/mv_web/member_live/index_date_presets_test.exs
@@ -1,8 +1,8 @@
 defmodule MvWeb.MemberLive.IndexDatePresetsTest do
   @moduledoc """
-  §1.8 — a date field's value control offers presets; picking "This year"
-  applies the Jan 1 – Dec 31 range of the current year and writes the equivalent
-  range params to the URL.
+  §1.25 (supersedes §1.8) — a date field's value control offers relative
+  presets; picking "This year" applies the period-to-date range (Jan 1 – today)
+  of the current year and writes the equivalent range params to the URL.
   """
   use MvWeb.ConnCase, async: false
 
@@ -20,7 +20,7 @@ defmodule MvWeb.MemberLive.IndexDatePresetsTest do
     %{conn: conn_with_oidc_user(conn)}
   end
 
-  test "the 'This year' preset applies the current-year range and writes URL params", %{
+  test "the 'This year' preset applies the year-to-date range and writes URL params", %{
     conn: conn
   } do
     {:ok, view, _html} = live(conn, ~p"/members")
@@ -32,8 +32,20 @@ defmodule MvWeb.MemberLive.IndexDatePresetsTest do
     view |> element("[data-testid='date-preset-this_year']") |> render_click()
 
     path = assert_patch(view)
-    year = Date.utc_today().year
-    assert path =~ "jd_from=#{year}-01-01"
-    assert path =~ "jd_to=#{year}-12-31"
+    today = Date.utc_today()
+    assert path =~ "jd_from=#{today.year}-01-01"
+    assert path =~ "jd_to=#{Date.to_iso8601(today)}"
+  end
+
+  test "the 'Last 30 days' preset applies a today-anchored 30-day window", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "join_date")
+    view |> element("[data-testid='date-preset-last_30_days']") |> render_click()
+
+    path = assert_patch(view)
+    today = Date.utc_today()
+    assert path =~ "jd_from=#{Date.to_iso8601(Date.add(today, -29))}"
+    assert path =~ "jd_to=#{Date.to_iso8601(today)}"
   end
 end
diff --git a/test/mv_web/member_live/index_filter_url_roundtrip_test.exs b/test/mv_web/member_live/index_filter_url_roundtrip_test.exs
new file mode 100644
index 00000000..8fe3405a
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_url_roundtrip_test.exs
@@ -0,0 +1,38 @@
+defmodule MvWeb.MemberLive.IndexFilterUrlRoundtripTest do
+  @moduledoc """
+  §2.1 (extended) — the v2 filter keys survive the LiveView decode→encode round
+  trip. Loading `/members` with a Stichtag date, the suspended flag, and a
+  two-sided payment count range, then triggering an unrelated re-patch (a sort
+  click), preserves every one of those keys in the pushed URL.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, _member} =
+      Mv.Membership.create_member(
+        %{first_name: "Round", last_name: "Trip", email: "roundtrip@example.com"},
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "stichtag, suspended and payment count range persist through a re-patch", %{conn: conn} do
+    url = "/members?stichtag=2026-03-15&suspended=1&pay_filter=has_unpaid&pay_min=2&pay_max=4"
+    {:ok, view, _html} = live(conn, url)
+
+    # Trigger an unrelated URL re-patch by sorting a stable column.
+    view |> element("[data-testid='payment']") |> render_click()
+    path = assert_patch(view)
+
+    assert path =~ "stichtag=2026-03-15"
+    assert path =~ "suspended=1"
+    assert path =~ "pay_filter=has_unpaid"
+    assert path =~ "pay_min=2"
+    assert path =~ "pay_max=4"
+  end
+end
diff --git a/test/mv_web/member_live/index_group_or_test.exs b/test/mv_web/member_live/index_group_or_test.exs
new file mode 100644
index 00000000..ece478e1
--- /dev/null
+++ b/test/mv_web/member_live/index_group_or_test.exs
@@ -0,0 +1,72 @@
+defmodule MvWeb.MemberLive.IndexGroupOrTest do
+  @moduledoc """
+  §1.29 / §2.7 — Multi-select group semantics is OR.
+
+  Two "is" group selections match members in *either* group (union). Two
+  "is not" selections exclude members in *any* of them. Verified at the
+  `OverviewQuery` layer where the semantics live.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2, group_fixture: 1]
+
+  alias Mv.Membership.Member
+  alias Mv.Membership.MemberGroup
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+
+    g1 = group_fixture(%{name: "G1-#{System.unique_integer([:positive])}"})
+    g2 = group_fixture(%{name: "G2-#{System.unique_integer([:positive])}"})
+
+    m1 = member_fixture_with_actor(%{}, actor)
+    m2 = member_fixture_with_actor(%{}, actor)
+    m3 = member_fixture_with_actor(%{}, actor)
+
+    add_to_group(m1, g1, actor)
+    add_to_group(m2, g2, actor)
+
+    %{actor: actor, g1: g1, g2: g2, m1: m1, m2: m2, m3: m3}
+  end
+
+  defp add_to_group(member, group, actor) do
+    MemberGroup
+    |> Ash.Changeset.for_create(:create, %{member_id: member.id, group_id: group.id})
+    |> Ash.create!(actor: actor)
+  end
+
+  defp ids(opts, actor) do
+    opts
+    |> OverviewQuery.build()
+    |> Ash.read!(actor: actor)
+    |> MapSet.new(& &1.id)
+  end
+
+  test "two 'is' group selections match members in either group (OR)", ctx do
+    result =
+      ids(
+        %{
+          group_filters: %{to_string(ctx.g1.id) => :in, to_string(ctx.g2.id) => :in},
+          groups: [ctx.g1, ctx.g2]
+        },
+        ctx.actor
+      )
+
+    assert MapSet.equal?(result, MapSet.new([ctx.m1.id, ctx.m2.id]))
+  end
+
+  test "two 'is not' group selections exclude members in any of them", ctx do
+    result =
+      ids(
+        %{
+          group_filters: %{to_string(ctx.g1.id) => :not_in, to_string(ctx.g2.id) => :not_in},
+          groups: [ctx.g1, ctx.g2]
+        },
+        ctx.actor
+      )
+
+    assert MapSet.equal?(result, MapSet.new([ctx.m3.id]))
+  end
+end
diff --git a/test/mv_web/member_live/index_groups_filter_test.exs b/test/mv_web/member_live/index_groups_filter_test.exs
index 639b3992..6bf133af 100644
--- a/test/mv_web/member_live/index_groups_filter_test.exs
+++ b/test/mv_web/member_live/index_groups_filter_test.exs
@@ -3,8 +3,8 @@ defmodule MvWeb.MemberLive.IndexGroupsFilterTest do
   Tests for filtering members by group in the member overview.
 
   Uses the filter dropdown (MemberFilterComponent) with one row per group:
-  All / Yes / No (per group). Multiple active group filters combine with AND
-  (member must match all selected group conditions).
+  All / Yes / No (per group). Multiple "is" selections combine with OR (union),
+  while each "is not" selection excludes members in that group (§1.29/§2.7).
   """
   # Kept async: false as a deferred scope decision. The deferrable-FK migration
   # removed the concurrent-create_member deadlock that previously forced this, so
diff --git a/test/mv_web/member_live/index_payment_count_codec_test.exs b/test/mv_web/member_live/index_payment_count_codec_test.exs
new file mode 100644
index 00000000..fa2c6cd0
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_count_codec_test.exs
@@ -0,0 +1,41 @@
+defmodule MvWeb.MemberLive.IndexPaymentCountCodecTest do
+  @moduledoc """
+  §1.22 / §3.14 — URL codec for the two-sided payment open-cycle count range.
+
+  The `{:unpaid_range, min, max}` filter round-trips through the flat URL
+  contract: encoding to params then decoding yields the canonical filter, with
+  the "has open" default (`min=1`, `max=nil`) and both-bounded ranges covered.
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.PaymentAging
+
+  defp roundtrip(filter),
+    do: filter |> PaymentAging.filter_to_params() |> PaymentAging.parse_filter_params()
+
+  test "default has-open range (min 1, unbounded above) round-trips" do
+    assert roundtrip({:unpaid_range, 1, nil}) == {:unpaid_range, 1, nil}
+  end
+
+  test "two-sided range round-trips" do
+    assert roundtrip({:unpaid_range, 2, 5}) == {:unpaid_range, 2, 5}
+  end
+
+  test "exact single-value range round-trips" do
+    assert roundtrip({:unpaid_range, 3, 3}) == {:unpaid_range, 3, 3}
+  end
+
+  test "has_unpaid params decode into an unpaid_range" do
+    params = %{"pay_filter" => "has_unpaid", "pay_min" => "2", "pay_max" => "4"}
+    assert PaymentAging.parse_filter_params(params) == {:unpaid_range, 2, 4}
+  end
+
+  test "has_unpaid with no bounds defaults to min 1, max nil" do
+    assert PaymentAging.parse_filter_params(%{"pay_filter" => "has_unpaid"}) ==
+             {:unpaid_range, 1, nil}
+  end
+
+  test "fully_paid still round-trips" do
+    assert roundtrip(:fully_paid) == :fully_paid
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_filter_test.exs b/test/mv_web/member_live/index_payment_filter_test.exs
index f1b09fea..31ae2827 100644
--- a/test/mv_web/member_live/index_payment_filter_test.exs
+++ b/test/mv_web/member_live/index_payment_filter_test.exs
@@ -66,6 +66,24 @@ defmodule MvWeb.MemberLive.IndexPaymentFilterTest do
     refute MapSet.member?(ids({:has_unpaid, 1}, actor), zero.id)
   end
 
+  test "unpaid-range selects members whose in-period count is within [min, max]", %{
+    actor: actor,
+    ft: ft
+  } do
+    zero = member_with_unpaid(0, actor, ft)
+    one = member_with_unpaid(1, actor, ft)
+    two = member_with_unpaid(2, actor, ft)
+    three = member_with_unpaid(3, actor, ft)
+
+    # two-sided: 2..3
+    assert ids({:unpaid_range, 2, 3}, actor) == MapSet.new([two.id, three.id])
+    # lower-bounded only: >= 1 (max nil)
+    assert ids({:unpaid_range, 1, nil}, actor) == MapSet.new([one.id, two.id, three.id])
+    # exact single value: 1..1
+    assert ids({:unpaid_range, 1, 1}, actor) == MapSet.new([one.id])
+    refute MapSet.member?(ids({:unpaid_range, 1, nil}, actor), zero.id)
+  end
+
   test "suspended cycles do not count toward has-unpaid", %{actor: actor, ft: ft} do
     member = member_fixture_with_actor(%{}, actor)
     create_cycle(member, ft, %{cycle_start: ~D[2024-01-01], status: :suspended}, actor)
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
index 7752b307..5f1977ac 100644
--- a/test/mv_web/member_live/index_payment_period_test.exs
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -40,6 +40,43 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
     end
   end
 
+  describe "period short code (§1.28)" do
+    test "the all-outstanding default has no short code" do
+      assert PaymentAging.period_short_code(%{from: nil, to: nil}) == nil
+    end
+
+    test "a full calendar year renders as the year" do
+      assert PaymentAging.period_short_code(%{from: ~D[2026-01-01], to: ~D[2026-12-31]}) == "2026"
+    end
+
+    test "a full calendar quarter renders as Q# YYYY" do
+      assert PaymentAging.period_short_code(%{from: ~D[2026-01-01], to: ~D[2026-03-31]}) ==
+               "Q1 2026"
+
+      assert PaymentAging.period_short_code(%{from: ~D[2026-10-01], to: ~D[2026-12-31]}) ==
+               "Q4 2026"
+    end
+
+    test "an arbitrary bounded period has no compact short code" do
+      assert PaymentAging.period_short_code(%{from: ~D[2026-02-03], to: ~D[2026-08-17]}) == nil
+      # An open-ended period is not compactly codeable either.
+      assert PaymentAging.period_short_code(%{from: ~D[2026-01-01], to: nil}) == nil
+    end
+  end
+
+  describe "period tooltip (§1.28)" do
+    test "names the period with locally formatted bounds" do
+      tip = PaymentAging.period_tooltip(%{from: ~D[2026-01-01], to: ~D[2026-12-31]})
+      assert tip =~ "01.01.2026"
+      assert tip =~ "31.12.2026"
+    end
+
+    test "the all-outstanding default reads as all outstanding" do
+      tip = PaymentAging.period_tooltip(%{from: nil, to: nil})
+      assert is_binary(tip) and tip =~ "outstanding"
+    end
+  end
+
   describe "payment-count filter codec" do
     test "round-trips fully_paid and has-unpaid thresholds" do
       for state <- [:fully_paid, {:has_unpaid, 1}, {:has_unpaid, 2}, {:has_unpaid, 3}] do
diff --git a/test/mv_web/member_live/index_payment_sort_test.exs b/test/mv_web/member_live/index_payment_sort_test.exs
new file mode 100644
index 00000000..1ef14114
--- /dev/null
+++ b/test/mv_web/member_live/index_payment_sort_test.exs
@@ -0,0 +1,85 @@
+defmodule MvWeb.MemberLive.IndexPaymentSortTest do
+  @moduledoc """
+  §1.27 — The Beiträge (payment) column sorts DB-side by the period-scoped
+  unpaid-cycle count, ascending and descending, with the unique id tie-breaker
+  preserving keyset stability. Verified at the `OverviewQuery` layer.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+  import Mv.Fixtures, only: [create_fee_type: 2, member_fixture_with_actor: 2, create_cycle: 4]
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  @period %{from: ~D[2024-01-01], to: ~D[2024-12-31]}
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    ft = create_fee_type(%{interval: :monthly}, actor)
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+    %{actor: actor, ft: ft}
+  end
+
+  defp member_with_unpaid(n, ctx) do
+    member = member_fixture_with_actor(%{}, ctx.actor)
+
+    Enum.each(1..max(n, 0)//1, fn i ->
+      create_cycle(
+        member,
+        ctx.ft,
+        %{cycle_start: Date.new!(2024, i, 1), status: :unpaid},
+        ctx.actor
+      )
+    end)
+
+    member
+  end
+
+  defp sorted_ids(order, ctx) do
+    %{sort_field: :payment, sort_order: order, payment_period: @period}
+    |> OverviewQuery.build()
+    |> Ash.read!(actor: ctx.actor)
+    |> Enum.map(& &1.id)
+  end
+
+  test "sorts ascending by in-period unpaid count", ctx do
+    zero = member_with_unpaid(0, ctx)
+    one = member_with_unpaid(1, ctx)
+    two = member_with_unpaid(2, ctx)
+
+    assert sorted_ids(:asc, ctx) == [zero.id, one.id, two.id]
+  end
+
+  test "sorts descending by in-period unpaid count", ctx do
+    zero = member_with_unpaid(0, ctx)
+    one = member_with_unpaid(1, ctx)
+    two = member_with_unpaid(2, ctx)
+
+    assert sorted_ids(:desc, ctx) == [two.id, one.id, zero.id]
+  end
+
+  describe "payment sort header (LiveView)" do
+    setup %{conn: conn} do
+      %{conn: conn_with_oidc_user(conn)}
+    end
+
+    @tag :ui
+    test "clicking the payment header reflects the sort in the URL", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      view |> element("[data-testid='payment']") |> render_click()
+
+      path = assert_patch(view)
+      assert path =~ "sort_field=payment"
+      assert path =~ "sort_order=asc"
+    end
+
+    @tag :ui
+    test "the payment th exposes aria-sort when active", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members?sort_field=payment&sort_order=desc")
+
+      assert has_element?(view, "th[aria-sort='descending']")
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_payment_wiring_test.exs b/test/mv_web/member_live/index_payment_wiring_test.exs
index 8991ca08..8c7b0547 100644
--- a/test/mv_web/member_live/index_payment_wiring_test.exs
+++ b/test/mv_web/member_live/index_payment_wiring_test.exs
@@ -69,4 +69,25 @@ defmodule MvWeb.MemberLive.IndexPaymentWiringTest do
     {:ok, all_time, _} = live(ctx.conn, "/members?pay_filter=unpaid_1")
     assert has_element?(all_time, "#row-#{member.id}")
   end
+
+  describe "period indicator badge (§1.28)" do
+    test "no badge in the default all-outstanding scope", ctx do
+      {:ok, view, _} = live(ctx.conn, "/members")
+      refute has_element?(view, "[data-testid='payment-period-badge']")
+    end
+
+    test "a full year renders the compact year short code", ctx do
+      {:ok, view, _} = live(ctx.conn, "/members?pay_from=2026-01-01&pay_to=2026-12-31")
+
+      assert has_element?(view, "[data-testid='payment-period-badge']", "2026")
+    end
+
+    test "an arbitrary period falls back to a 'filtered' badge with a period tooltip", ctx do
+      {:ok, view, _} = live(ctx.conn, "/members?pay_from=2026-02-03&pay_to=2026-08-17")
+
+      badge = view |> element("[data-testid='payment-period-badge']") |> render()
+      assert badge =~ "03.02.2026"
+      assert badge =~ "17.08.2026"
+    end
+  end
 end
diff --git a/test/mv_web/member_live/index_status_params_codec_test.exs b/test/mv_web/member_live/index_status_params_codec_test.exs
new file mode 100644
index 00000000..b1438969
--- /dev/null
+++ b/test/mv_web/member_live/index_status_params_codec_test.exs
@@ -0,0 +1,40 @@
+defmodule MvWeb.MemberLive.IndexStatusParamsCodecTest do
+  @moduledoc """
+  §2.1 (extended) — URL codec round-trip for the new v2 filter keys: the
+  point-in-time Stichtag date and the suspended-status flag. Encoding a state to
+  params then decoding yields the canonical state, and the default (no filter)
+  encodes to the empty map so a fresh URL is canonical.
+  """
+  use ExUnit.Case, async: true
+
+  alias MvWeb.MemberLive.Index.PaymentAging
+  alias MvWeb.MemberLive.Index.Stichtag
+
+  describe "Stichtag date" do
+    test "a set date round-trips" do
+      date = ~D[2026-03-15]
+      assert date |> Stichtag.to_params() |> Stichtag.parse() == date
+    end
+
+    test "nil encodes to the empty map and decodes to nil" do
+      assert Stichtag.to_params(nil) == %{}
+      assert Stichtag.parse(%{}) == nil
+    end
+
+    test "a malformed date param decodes to nil" do
+      assert Stichtag.parse(%{"stichtag" => "not-a-date"}) == nil
+    end
+  end
+
+  describe "suspended flag" do
+    test "true round-trips" do
+      assert true |> PaymentAging.suspended_to_params() |> PaymentAging.parse_suspended() == true
+    end
+
+    test "false/nil encodes to the empty map and decodes to false" do
+      assert PaymentAging.suspended_to_params(false) == %{}
+      assert PaymentAging.suspended_to_params(nil) == %{}
+      assert PaymentAging.parse_suspended(%{}) == false
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_stichtag_property_test.exs b/test/mv_web/member_live/index_stichtag_property_test.exs
new file mode 100644
index 00000000..017d08fb
--- /dev/null
+++ b/test/mv_web/member_live/index_stichtag_property_test.exs
@@ -0,0 +1,78 @@
+defmodule MvWeb.MemberLive.IndexStichtagPropertyTest do
+  @moduledoc """
+  §2.6 — Point-in-time membership ("member on the reference date X").
+
+  For arbitrary (join_date, exit_date) pairs and reference dates X, the Stichtag
+  filter keeps a member iff `join_date <= X and (exit_date is nil or exit_date > X)`.
+  Verified at the `OverviewQuery` layer against an in-memory oracle.
+  """
+  use Mv.DataCase, async: false
+  use ExUnitProperties
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2]
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  @dates [
+    ~D[2023-01-01],
+    ~D[2024-06-15],
+    ~D[2025-01-01],
+    ~D[2025-06-15],
+    ~D[2026-01-01]
+  ]
+
+  defp clear(actor) do
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+  end
+
+  defp on_date?(join, exit_date, x) do
+    Date.compare(join, x) != :gt and (is_nil(exit_date) or Date.compare(exit_date, x) == :gt)
+  end
+
+  # Generates a (join_date, exit_date) pair where exit_date is nil or on/after
+  # join_date, so it satisfies the Member "exit not before join" validation.
+  defp valid_pair_gen do
+    StreamData.bind(StreamData.member_of(@dates), fn join ->
+      later = [nil | Enum.filter(@dates, &(Date.compare(&1, join) == :gt))]
+
+      StreamData.bind(StreamData.member_of(later), fn exit_date ->
+        StreamData.constant({join, exit_date})
+      end)
+    end)
+  end
+
+  property "Stichtag filter keeps exactly the members active on X" do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    check all(
+            specs <- StreamData.list_of(valid_pair_gen(), min_length: 1, max_length: 5),
+            x <- StreamData.member_of(@dates),
+            max_runs: 25
+          ) do
+      clear(actor)
+
+      created =
+        Enum.map(specs, fn {join, exit_date} ->
+          member =
+            member_fixture_with_actor(%{join_date: join, exit_date: exit_date}, actor)
+
+          {member.id, join, exit_date}
+        end)
+
+      expected =
+        for {id, join, exit_date} <- created,
+            on_date?(join, exit_date, x),
+            into: MapSet.new(),
+            do: id
+
+      actual =
+        %{stichtag: x}
+        |> OverviewQuery.build()
+        |> Ash.read!(actor: actor)
+        |> MapSet.new(& &1.id)
+
+      assert MapSet.equal?(actual, expected)
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_suspended_filter_test.exs b/test/mv_web/member_live/index_suspended_filter_test.exs
new file mode 100644
index 00000000..add447f9
--- /dev/null
+++ b/test/mv_web/member_live/index_suspended_filter_test.exs
@@ -0,0 +1,58 @@
+defmodule MvWeb.MemberLive.IndexSuspendedFilterTest do
+  @moduledoc """
+  §1.23 — Filter by `suspended` status.
+
+  With the suspended filter active, the overview keeps members that have at
+  least one `suspended` cycle whose `cycle_end` falls in the active period.
+  Suspended is filterable as its own status, independent of the unpaid count
+  (which excludes suspended, §2.5). Verified at the `OverviewQuery` layer.
+  """
+  use Mv.DataCase, async: false
+
+  import Mv.Fixtures, only: [member_fixture_with_actor: 2, create_fee_type: 2, create_cycle: 4]
+
+  alias Mv.Membership.Member
+  alias MvWeb.MemberLive.Index.OverviewQuery
+
+  setup do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+    Member |> Ash.read!(actor: actor) |> Enum.each(&Ash.destroy!(&1, actor: actor))
+    ft = create_fee_type(%{interval: :yearly}, actor)
+    %{actor: actor, ft: ft}
+  end
+
+  defp member_with_cycle(ctx, status, cycle_start) do
+    m = member_fixture_with_actor(%{}, ctx.actor)
+    create_cycle(m, ctx.ft, %{cycle_start: cycle_start, status: status}, ctx.actor)
+    m
+  end
+
+  defp ids(opts, actor) do
+    opts |> OverviewQuery.build() |> Ash.read!(actor: actor) |> MapSet.new(& &1.id)
+  end
+
+  test "keeps members with a suspended cycle whose cycle_end is in the period", ctx do
+    suspended_in = member_with_cycle(ctx, :suspended, ~D[2025-01-01])
+    _unpaid = member_with_cycle(ctx, :unpaid, ~D[2025-01-01])
+    _paid = member_with_cycle(ctx, :paid, ~D[2025-01-01])
+    _suspended_out = member_with_cycle(ctx, :suspended, ~D[2023-01-01])
+
+    result =
+      ids(
+        %{suspended: true, payment_period: %{from: ~D[2025-01-01], to: ~D[2025-12-31]}},
+        ctx.actor
+      )
+
+    assert MapSet.equal?(result, MapSet.new([suspended_in.id]))
+  end
+
+  test "all-time period keeps every member with any suspended cycle", ctx do
+    s1 = member_with_cycle(ctx, :suspended, ~D[2025-01-01])
+    s2 = member_with_cycle(ctx, :suspended, ~D[2023-01-01])
+    _unpaid = member_with_cycle(ctx, :unpaid, ~D[2025-01-01])
+
+    result = ids(%{suspended: true, payment_period: %{from: nil, to: nil}}, ctx.actor)
+
+    assert MapSet.equal?(result, MapSet.new([s1.id, s2.id]))
+  end
+end

From 8303a39041beb0ef5f564bcd7c45d9a4b2d9c353 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:15 +0200
Subject: [PATCH 24/30] feat(overview): rework filter builder with editable
 chips and native date ranges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Editable filter chips, uniformly-sized value controls, working field-picker
search, and native date-range inputs with relative presets in place of the
vendored calendar — native inputs give year-jump, manual entry and keyboard
accessibility for free.
---
 assets/css/app.css                            |   15 +
 assets/js/app.js                              |    7 +
 assets/js/hooks/filter_combobox_search.js     |   33 +
 assets/js/hooks/hover_popover.js              |   76 ++
 .../add_filter_builder_component.ex           | 1003 +++++++++++------
 lib/mv_web/live/member_live/index.ex          |   44 +
 lib/mv_web/live/member_live/index.html.heex   |   34 +-
 .../live/member_live/index/date_presets.ex    |    2 +-
 .../member_live/index/filter_descriptor.ex    |    7 +-
 .../live/member_live/index/payment_aging.ex   |   26 +-
 priv/gettext/de/LC_MESSAGES/default.po        |  208 +++-
 priv/gettext/default.pot                      |  129 ++-
 priv/gettext/en/LC_MESSAGES/default.po        |  254 +++--
 .../member_live/index_active_former_test.exs  |   92 ++
 .../member_live/index_chip_edit_test.exs      |   91 ++
 .../member_live/index_date_range_test.exs     |   74 ++
 .../member_live/index_filter_row_test.exs     |   48 +
 .../index_membership_fee_status_test.exs      |   34 +-
 .../member_live/index_payment_period_test.exs |   14 +
 .../member_live/index_payment_wiring_test.exs |    1 +
 test/mv_web/member_live/index_test.exs        |    4 +-
 .../member_live/index_value_control_test.exs  |  257 +++++
 test/support/filter_builder_helpers.ex        |   17 +-
 23 files changed, 1905 insertions(+), 565 deletions(-)
 create mode 100644 assets/js/hooks/filter_combobox_search.js
 create mode 100644 assets/js/hooks/hover_popover.js
 create mode 100644 test/mv_web/member_live/index_chip_edit_test.exs
 create mode 100644 test/mv_web/member_live/index_date_range_test.exs
 create mode 100644 test/mv_web/member_live/index_filter_row_test.exs
 create mode 100644 test/mv_web/member_live/index_value_control_test.exs

diff --git a/assets/css/app.css b/assets/css/app.css
index 37091909..f8553c55 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -941,6 +941,21 @@
   pointer-events: none;
 }
 
+/*
+ * Payment-badge tooltip. A native Popover-API element (opened by the
+ * HoverPopover hook), so it lives in the browser TOP LAYER and is not clipped by
+ * the members table's overflow. Placement is pure CSS anchor positioning: the
+ * badge carries `anchor-name`, this popover carries `position-anchor`, and
+ * `position-area` drops it just below the badge, left-aligned. A `position-try`
+ * fallback flips it above the badge when there is no room below. No JS
+ * coordinate math is involved (unlike the older SortTooltip).
+ */
+.payment-tip {
+  margin: 0;
+  position-area: bottom span-right;
+  position-try-fallbacks: flip-block;
+}
+
 /*
  * Vertically center the row checkbox in the sticky first column using the
  * table-native vertical-align: middle. This keeps display: table-cell intact so
diff --git a/assets/js/app.js b/assets/js/app.js
index 90e36102..04842115 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -22,6 +22,8 @@ import {Socket} from "phoenix"
 import {LiveSocket} from "phoenix_live_view"
 import topbar from "../vendor/topbar"
 import Sortable from "../vendor/sortable"
+import FilterComboboxSearch from "./hooks/filter_combobox_search"
+import HoverPopover from "./hooks/hover_popover"
 
 let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")
 
@@ -36,6 +38,11 @@ function getBrowserTimezone() {
 // Hooks for LiveView components
 let Hooks = {}
 
+// Add-filter builder hooks (member overview field-picker search).
+Hooks.FilterComboboxSearch = FilterComboboxSearch
+// Top-layer hover/focus popover (member overview payment badge tooltip).
+Hooks.HoverPopover = HoverPopover
+
 // IndeterminateCheckbox: the `indeterminate` state of a checkbox is a JS
 // property, not an HTML attribute, so it cannot be set from the server render.
 // Mirror it from the data-indeterminate attribute on mount and every update
diff --git a/assets/js/hooks/filter_combobox_search.js b/assets/js/hooks/filter_combobox_search.js
new file mode 100644
index 00000000..ec60061b
--- /dev/null
+++ b/assets/js/hooks/filter_combobox_search.js
@@ -0,0 +1,33 @@
+// FilterComboboxSearch hook: the type-ahead search input of the add-filter
+// field picker (§1.21).
+//
+// Responsibilities:
+//   * Autofocus the input when the picker opens, so the user can type
+//     immediately (the cursor lands in the search field on mount). Programmatic
+//     .focus() does NOT trigger the browser's :focus-visible state, so no focus
+//     ring is drawn on open — the ring appears only during keyboard navigation,
+//     which is exactly the desired behaviour (focus-visible on keyboard only).
+//   * Guard Enter: while the listbox is open, Enter must not submit the
+//     surrounding form (this replaces the old standalone ComboBox hook).
+//
+// The actual field-list filtering is done server-side (phx-change pushes the
+// query; the component narrows the descriptor list), so this hook only manages
+// focus and the Enter guard.
+const FilterComboboxSearch = {
+  mounted() {
+    // Defer to the next frame so focus lands after the dropdown is laid out.
+    requestAnimationFrame(() => this.el.focus())
+
+    this.handleKeyDown = (e) => {
+      const open = this.el.getAttribute("aria-expanded") === "true"
+      if (e.key === "Enter" && open) e.preventDefault()
+    }
+    this.el.addEventListener("keydown", this.handleKeyDown)
+  },
+
+  destroyed() {
+    this.el.removeEventListener("keydown", this.handleKeyDown)
+  }
+}
+
+export default FilterComboboxSearch
diff --git a/assets/js/hooks/hover_popover.js b/assets/js/hooks/hover_popover.js
new file mode 100644
index 00000000..71a80cdc
--- /dev/null
+++ b/assets/js/hooks/hover_popover.js
@@ -0,0 +1,76 @@
+// HoverPopover hook: opens a native Popover-API element on hover/keyboard focus
+// of its trigger, so the popover renders in the browser TOP LAYER and escapes
+// any ancestor `overflow` clipping (the members table forces overflow-y:auto,
+// which clips an absolutely-positioned daisyUI tooltip/dropdown-content). Unlike
+// the older SortTooltip, placement is handed to CSS anchor positioning
+// (`anchor-name` on the trigger, `position-anchor`/`position-area` on the
+// popover) — this hook does no coordinate math, it only toggles visibility.
+//
+// WCAG 2.2 AA / SC 1.4.13 (Content on Hover or Focus): the popover is shown on
+// both hover and focus, is dismissible via Escape, and is hoverable/persistent —
+// a short close delay plus the popover's own hover keep it open while the pointer
+// travels from the trigger onto the popover content.
+//
+// Expected DOM:
+//   <a phx-hook="HoverPopover" data-popover-target="tip-id" style="anchor-name:--x">…</a>
+//   <div id="tip-id" popover style="position-anchor:--x">…</div>
+const HoverPopover = {
+  mounted() {
+    this.tip = document.getElementById(this.el.dataset.popoverTarget)
+    // Feature-detect: without Popover API support fall back to no visual popover
+    // (the trigger's aria-label still conveys the summary to assistive tech).
+    if (!this.tip || typeof this.tip.showPopover !== "function") return
+
+    this.open = () => {
+      try {
+        if (!this.tip.matches(":popover-open")) this.tip.showPopover()
+      } catch (_e) {}
+    }
+    this.close = () => {
+      try {
+        if (this.tip.matches(":popover-open")) this.tip.hidePopover()
+      } catch (_e) {}
+    }
+    this.cancelClose = () => {
+      if (this.closeTimer) {
+        clearTimeout(this.closeTimer)
+        this.closeTimer = null
+      }
+    }
+    this.show = () => {
+      this.cancelClose()
+      this.open()
+    }
+    this.scheduleClose = () => {
+      this.cancelClose()
+      this.closeTimer = setTimeout(() => this.close(), 120)
+    }
+    this.onKey = (e) => {
+      if (e.key === "Escape") this.close()
+    }
+
+    this.el.addEventListener("mouseenter", this.show)
+    this.el.addEventListener("focus", this.show)
+    this.el.addEventListener("mouseleave", this.scheduleClose)
+    this.el.addEventListener("blur", this.scheduleClose)
+    this.el.addEventListener("keydown", this.onKey)
+    // Keep it open while the pointer is over the popover itself (hoverable).
+    this.tip.addEventListener("mouseenter", this.show)
+    this.tip.addEventListener("mouseleave", this.scheduleClose)
+  },
+
+  destroyed() {
+    if (!this.tip) return
+    this.cancelClose()
+    this.close()
+    this.el.removeEventListener("mouseenter", this.show)
+    this.el.removeEventListener("focus", this.show)
+    this.el.removeEventListener("mouseleave", this.scheduleClose)
+    this.el.removeEventListener("blur", this.scheduleClose)
+    this.el.removeEventListener("keydown", this.onKey)
+    this.tip.removeEventListener("mouseenter", this.show)
+    this.tip.removeEventListener("mouseleave", this.scheduleClose)
+  }
+}
+
+export default HoverPopover
diff --git a/lib/mv_web/live/components/add_filter_builder_component.ex b/lib/mv_web/live/components/add_filter_builder_component.ex
index 35fb3dbb..ccafd01e 100644
--- a/lib/mv_web/live/components/add_filter_builder_component.ex
+++ b/lib/mv_web/live/components/add_filter_builder_component.ex
@@ -6,15 +6,21 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   It follows the Polaris-style add-filter flow (Option C, append-right):
 
     * a "+ Add filter" trigger opens a combobox **field picker** grouped
-      Quick / Membership / Custom fields (see `FilterDescriptor`);
+      Quick / Membership / Custom fields (see `FilterDescriptor`), with a
+      focused, type-ahead search input (§1.21);
     * picking a field closes the picker and opens a focused, type-aware **value
-      control** to the right of the existing chips (no detail "Add" button);
-    * a valid value selection **commits** an applied-filter chip and re-loads the
-      list; dismissing the pending control without a selection **drops** it with
-      no re-load;
-    * applied filters render as **one compact chip per value**, each a real
-      remove button (`aria-label="Remove filter: …"`, ≥24px target);
-    * a **Clear all** control removes every active filter in one re-load.
+      control** wrapped in a consistent popover shell titled "Filter: <field>"
+      (§3.11); simple selects/radios commit on click, date-ranges have
+      Apply/Cancel (§3.13);
+    * applied filters render as **one compact chip per value**; the chip body is
+      an editable button that re-opens the value control pre-filled (§1.18) and a
+      separate × removes the filter;
+    * the "+ Add filter" trigger, the chips, and **Clear all** share one uniform
+      button size (§1.19).
+
+  There is no "All"/"Alle" option in the value controls — a cleared filter is
+  simply the absence of a chip (§1.20). Multi-select group/fee-type values are
+  OR (`is`) / exclude-all (`is not`) (§1.29).
 
   Filter state itself lives in the parent LiveView assigns; this component is a
   pure input layer. It emits the parent's existing filter messages unchanged:
@@ -24,16 +30,19 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     * `{:boolean_filter_changed, id_str, true | false | nil}`
     * `{:date_filters_changed, date_filters}`
 
-  plus the period-scoped payment messages (§3.3):
+  plus the period-scoped payment and status messages:
 
-    * `{:payment_filter_changed, nil | :fully_paid | {:has_unpaid, 1..3}}`
+    * `{:payment_filter_changed, nil | :fully_paid | {:has_unpaid, 1..3} | {:unpaid_range, pos_integer(), pos_integer() | nil}}`
     * `{:payment_period_changed, %{from: Date.t() | nil, to: Date.t() | nil}}`
+    * `{:suspended_changed, boolean()}`
+    * `{:stichtag_changed, Date.t() | nil}`
 
   and `{:clear_all_filters}` for Clear all.
   """
   use MvWeb, :live_component
 
   alias Mv.Constants
+  alias MvWeb.Helpers.DateFormatter
   alias MvWeb.MemberLive.Index.DateFilter
   alias MvWeb.MemberLive.Index.DatePresets
   alias MvWeb.MemberLive.Index.FilterDescriptor
@@ -50,6 +59,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
      socket
      |> assign(:open_picker, false)
      |> assign(:picker_query, "")
+     |> assign(:edit_anchor, nil)
      |> assign(:pending, nil)}
   end
 
@@ -80,6 +90,8 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     |> assign(:date_filters, assigns[:date_filters] || DateFilter.default())
     |> assign(:payment_filter, assigns[:payment_filter])
     |> assign(:payment_period, assigns[:payment_period] || PaymentAging.default_period())
+    |> assign(:suspended, assigns[:suspended] || false)
+    |> assign(:stichtag, assigns[:stichtag])
   end
 
   # --------------------------------------------------------------------------
@@ -106,7 +118,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       <div class="relative">
         <button
           type="button"
-          class="badge badge-secondary badge-outline gap-1 cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+          class="btn btn-sm btn-secondary"
           phx-click="toggle_picker"
           phx-target={@myself}
           aria-haspopup="listbox"
@@ -114,7 +126,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
           data-testid="add-filter-trigger"
         >
           <.icon name="hero-plus" class="size-3.5" />
-          <span class="text-xs">{gettext("Add filter")}</span>
+          <span>{gettext("Add filter")}</span>
         </button>
 
         <%!-- Field picker: an anchored dropdown (absolute, top-layer via z-index)
@@ -126,24 +138,33 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
           role="dialog"
           aria-label={gettext("Add filter")}
         >
-          <input
-            type="text"
-            id={"#{@id}-field-combobox"}
-            role="combobox"
-            aria-expanded="true"
-            aria-controls={"#{@id}-field-listbox"}
-            aria-autocomplete="list"
-            autocomplete="off"
-            phx-hook="ComboBox"
+          <%!-- The type-ahead query is submitted via `phx-change` — which
+          LiveView only honours on an input that is inside a <form>; a bare input
+          raises "form events require the input to be inside a form" and the live
+          filtering silently no-ops (§1.21). Hence the wrapping form. --%>
+          <form
             phx-change="filter_fields"
-            phx-debounce="120"
             phx-target={@myself}
-            name="picker_query"
-            value={@picker_query}
-            placeholder={gettext("Filter by …")}
-            class="input input-sm input-bordered w-full mb-2 shrink-0"
-            data-testid="field-combobox"
-          />
+            class="mb-2 shrink-0"
+            data-testid="field-search-form"
+          >
+            <input
+              type="text"
+              id={"#{@id}-field-combobox"}
+              role="combobox"
+              aria-expanded="true"
+              aria-controls={"#{@id}-field-listbox"}
+              aria-autocomplete="list"
+              autocomplete="off"
+              phx-hook="FilterComboboxSearch"
+              phx-debounce="120"
+              name="picker_query"
+              value={@picker_query}
+              placeholder={gettext("Filter by …")}
+              class="input input-sm input-bordered w-full"
+              data-testid="field-combobox"
+            />
+          </form>
           <ul
             id={"#{@id}-field-listbox"}
             role="listbox"
@@ -185,15 +206,31 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       </div>
 
       <ul class="flex flex-wrap items-center gap-2 p-0 m-0 list-none" data-testid="filter-chips">
-        <li :for={chip <- @chips} class="p-0 m-0">
-          <span class="badge badge-primary badge-outline gap-1 pr-0.5" data-testid="filter-chip">
-            <span class="text-xs">{chip.label}</span>
-            <%!-- Subtle remove control: a ≥24px hit target (WCAG 2.5.8) wrapping a
-            small glyph whose only hover feedback is a minimal rounded tint around
-            the × itself, so the interaction stays quiet and no tooltip is used. --%>
+        <li :for={chip <- @chips} class="relative p-0 m-0" data-testid="filter-chip-item">
+          <%!-- Editable chip: a join of a body button (re-opens the value control
+          pre-filled, §1.18) and a separate × remove button. Both are btn-sm so
+          the chip is the same height as the "+ Add filter" trigger and "Clear
+          all" (§1.19), and both are real, focusable buttons. --%>
+          <span class="join" data-testid="filter-chip">
             <button
               type="button"
-              class="group inline-flex size-6 min-h-0 items-center justify-center rounded-full p-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+              class="join-item btn btn-sm btn-outline btn-primary font-normal"
+              phx-click="edit_chip"
+              phx-value-key={chip.edit_key}
+              phx-value-kind={chip.kind}
+              phx-value-id={chip.id}
+              phx-target={@myself}
+              data-testid="filter-chip-edit"
+            >
+              <span>{chip.label}</span>
+            </button>
+            <%!-- border-l-0: the body and the × each carry a 1px outline border,
+            which doubles up at the join seam and sub-pixel-rounds to 1px on some
+            chips and 2px on others (flipping on browser zoom / DPR). Dropping the
+            ×'s left border leaves a single hairline seam on every chip. --%>
+            <button
+              type="button"
+              class="join-item btn btn-sm btn-outline btn-primary btn-square border-l-0"
               phx-click="remove_chip"
               phx-value-kind={chip.kind}
               phx-value-id={chip.id}
@@ -201,29 +238,39 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
               aria-label={gettext("Remove filter: %{label}", label: chip.label)}
               data-testid="filter-chip-remove"
             >
-              <span class="inline-flex rounded-full p-0.5 opacity-50 transition group-hover:bg-base-content/10 group-hover:opacity-100">
-                <.icon name="hero-x-mark" class="size-3.5" />
-              </span>
+              <.icon name="hero-x-mark" class="size-3.5" />
             </button>
           </span>
+
+          <%!-- Editing this chip (§1.18): its type-aware value control opens as an
+          anchored dropdown directly under THIS chip, in place — not as a new
+          pending chip elsewhere in the row. --%>
+          <div
+            :if={editing_chip?(@edit_anchor, chip)}
+            class="absolute left-0 top-full z-[100] mt-2"
+            data-testid="chip-edit-popover"
+          >
+            {render_value_control(assigns)}
+          </div>
         </li>
       </ul>
 
-      <%!-- Pending filter: the picked field renders a chip anchor and its
-      type-aware value control opens as an anchored dropdown below it (absolute,
-      top-layer), so the toolbar never reflows while choosing a value. Clicking
-      the chip (or Escape / click-away) dismisses without committing (§1.3). --%>
-      <div :if={@pending} class="relative" data-testid="pending-filter">
+      <%!-- Pending filter (add-flow only): the newly picked field renders a chip
+      anchor and its type-aware value control opens as an anchored dropdown below
+      it (absolute, top-layer), so the toolbar never reflows while choosing a
+      value. Editing an existing chip anchors under that chip instead (above).
+      Clicking the chip (or Escape / click-away) dismisses without committing. --%>
+      <div :if={@pending && is_nil(@edit_anchor)} class="relative" data-testid="pending-filter">
         <button
           type="button"
-          class="badge badge-primary badge-outline gap-1 h-7 cursor-pointer"
+          class="btn btn-sm btn-outline btn-primary"
           phx-click="dismiss"
           phx-target={@myself}
           aria-haspopup="dialog"
           aria-expanded="true"
           data-testid="pending-chip"
         >
-          <span class="text-xs">{@pending.label}</span>
+          <span>{@pending.label}</span>
           <.icon name="hero-chevron-down" class="size-3" />
         </button>
         <div class="absolute left-0 top-full z-[100] mt-2">
@@ -234,159 +281,272 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       <button
         :if={@chips != []}
         type="button"
-        class="badge badge-ghost cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-base-content/40"
+        class="btn btn-sm btn-ghost"
         phx-click="clear_all"
         phx-target={@myself}
         data-testid="clear-all-filters"
       >
-        <span class="text-xs">{gettext("Clear all")}</span>
+        <span>{gettext("Clear all")}</span>
       </button>
     </div>
     """
   end
 
+  # --- unified popover shell (§3.11) ----------------------------------------
+
+  attr :title, :string, required: true
+  attr :wide, :boolean, default: false
+  slot :inner_block, required: true
+
+  # Shared popover shell for every value control (§3.11): the same container,
+  # the same "Filter: <field>" title, and a consistent min-width (wider for the
+  # date-range and multi-select controls). The control's own body — a
+  # `phx-change="commit"` form or the date-range disclosure — carries the
+  # `value-control-*` test id so tests target the element that also owns the
+  # change binding.
+  defp control_shell(assigns) do
+    ~H"""
+    <div class={[
+      "rounded-box border border-base-300 bg-base-100 p-3 shadow flex flex-col gap-3",
+      if(@wide, do: "min-w-80", else: "min-w-64")
+    ]}>
+      <div
+        class="text-xs font-semibold uppercase tracking-wide opacity-70 pb-1.5 border-b border-base-200"
+        data-testid="control-title"
+      >
+        {gettext("Filter: %{field}", field: @title)}
+      </div>
+      {render_slot(@inner_block)}
+    </div>
+    """
+  end
+
+  # --- shared native date-range row -----------------------------------------
+
+  attr :from_name, :string, required: true
+  attr :to_name, :string, required: true
+  attr :from_value, :string, default: ""
+  attr :to_value, :string, default: ""
+  attr :testid, :string, default: nil
+
+  # The single native "Von/Bis" range used by *every* date-range value control
+  # (payment period, join date, exit date, custom date fields). Two
+  # `<input type="date">` sit side by side in a non-wrapping `flex` row, each
+  # wrapped in `min-w-0 flex-1` so they share the row width equally and always
+  # stay on one line. Only the input `name`s differ between call sites, so the
+  # dispatch stays per-control while the render is identical everywhere.
+  defp date_range_row(assigns) do
+    ~H"""
+    <div class="flex items-end gap-2" data-testid={@testid}>
+      <div class="min-w-0 flex-1">
+        <.input
+          type="date"
+          name={@from_name}
+          label={gettext("From")}
+          class="input input-sm input-bordered w-full"
+          value={@from_value}
+        />
+      </div>
+      <div class="min-w-0 flex-1">
+        <.input
+          type="date"
+          name={@to_name}
+          label={gettext("To")}
+          class="input input-sm input-bordered w-full"
+          value={@to_value}
+        />
+      </div>
+    </div>
+    """
+  end
+
   # --- value controls -------------------------------------------------------
 
   defp render_value_control(%{pending: %{control: :payment_count}} = assigns) do
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="flex flex-wrap items-end gap-2 rounded-box border border-base-300 bg-base-100 p-2 shadow"
-      data-testid="value-control-payment"
-    >
-      <fieldset class="border-0 p-0 m-0">
-        <legend class="text-xs font-medium mb-1">{gettext("Payment")}</legend>
-        <select
-          name="pay"
-          class="select select-sm select-bordered"
-          aria-label={gettext("Payment status")}
+    <.control_shell title={@pending.label} wide={true}>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="flex flex-col gap-3"
+        data-testid="value-control-payment"
+      >
+        <input type="hidden" name="__payment" value="1" />
+        <fieldset class="border-0 p-0 m-0">
+          <legend class="text-xs font-medium mb-1">{gettext("Payment status")}</legend>
+          <div class="join">
+            <.toggle_option name="pay" value="fully_paid" checked={@payment_filter == :fully_paid}>
+              {gettext("All paid")}
+            </.toggle_option>
+            <.toggle_option name="pay" value="has_unpaid" checked={has_unpaid?(@payment_filter)}>
+              {gettext("Open contributions")}
+            </.toggle_option>
+          </div>
+        </fieldset>
+
+        <fieldset
+          :if={has_unpaid?(@payment_filter)}
+          class="border-0 p-0 m-0"
+          data-testid="payment-count-range"
         >
-          <option value="all" selected={@payment_filter == nil}>{gettext("All")}</option>
-          <option value="fully_paid" selected={@payment_filter == :fully_paid}>
-            {gettext("Fully paid")}
-          </option>
-          <option value="unpaid_1" selected={@payment_filter == {:has_unpaid, 1}}>
-            {gettext("Has unpaid ≥ 1")}
-          </option>
-          <option value="unpaid_2" selected={@payment_filter == {:has_unpaid, 2}}>
-            {gettext("Has unpaid ≥ 2")}
-          </option>
-          <option value="unpaid_3" selected={@payment_filter == {:has_unpaid, 3}}>
-            {gettext("Has unpaid ≥ 3")}
-          </option>
-        </select>
-      </fieldset>
-      <.input
-        type="date"
-        name="pay_from"
-        label={gettext("Period from")}
-        class="input input-sm input-bordered"
-        value={date_iso(@payment_period[:from])}
-      />
-      <.input
-        type="date"
-        name="pay_to"
-        label={gettext("Period to")}
-        class="input input-sm input-bordered"
-        value={date_iso(@payment_period[:to])}
-      />
-    </form>
+          <legend class="text-xs font-medium mb-1">{gettext("Open cycles")}</legend>
+          <div class="flex items-end gap-2">
+            <.input
+              type="number"
+              name="pay_min"
+              label={gettext("min")}
+              min="1"
+              class="input input-sm input-bordered w-20"
+              value={range_min(@payment_filter)}
+            />
+            <.input
+              type="number"
+              name="pay_max"
+              label={gettext("max")}
+              min="1"
+              class="input input-sm input-bordered w-20"
+              value={range_max(@payment_filter)}
+            />
+          </div>
+        </fieldset>
+
+        <label class="flex items-center gap-2 text-sm" data-testid="payment-suspended">
+          <input
+            type="checkbox"
+            name="suspended"
+            value="1"
+            class="checkbox checkbox-sm"
+            checked={@suspended}
+          />
+          {gettext("Suspended fees")}
+        </label>
+
+        <fieldset class="border-0 p-0 m-0">
+          <legend class="text-xs font-medium mb-1">{gettext("Contribution period")}</legend>
+          <.date_range_row
+            from_name="pay_from"
+            to_name="pay_to"
+            from_value={date_iso(@payment_period[:from]) || ""}
+            to_value={date_iso(@payment_period[:to]) || ""}
+            testid="payment-period-range"
+          />
+        </fieldset>
+      </form>
+    </.control_shell>
     """
   end
 
   defp render_value_control(%{pending: %{control: :active_former}} = assigns) do
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
-      data-testid="value-control-active-former"
-    >
-      <fieldset class="border-0 p-0 m-0">
-        <legend class="text-xs font-medium mb-1">{gettext("Active / former")}</legend>
-        <div class="join">
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
-              name="quick"
-              value="active"
-              class="hidden"
-              checked={quick(@date_filters) == :active}
-            />
-            {gettext("Active")}
-          </label>
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
-              name="quick"
-              value="former"
-              class="hidden"
-              checked={quick(@date_filters) == :former}
-            />
-            {gettext("Former")}
-          </label>
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
-              name="quick"
-              value="all"
-              class="hidden"
-              checked={quick(@date_filters) == :all}
-            />
-            {gettext("All")}
-          </label>
+    <.control_shell title={@pending.label} wide={true}>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="flex flex-col gap-3"
+        data-testid="value-control-active-former"
+      >
+        <fieldset class="border-0 p-0 m-0">
+          <legend class="text-xs font-medium mb-1">{gettext("Active / former")}</legend>
+          <div class="join">
+            <.toggle_option name="quick" value="active" checked={quick(@date_filters) == :active}>
+              {gettext("Active")}
+            </.toggle_option>
+            <.toggle_option name="quick" value="former" checked={quick(@date_filters) == :former}>
+              {gettext("Former")}
+            </.toggle_option>
+            <.toggle_option name="quick" value="all" checked={quick(@date_filters) == :all}>
+              {gettext("All")}
+            </.toggle_option>
+          </div>
+        </fieldset>
+
+        <%!-- Separate paragraph (not part of the Active/Former button-join): the
+        point-in-time "active on X" Stichtag filter (§1.24). --%>
+        <div class="flex flex-col gap-1" data-testid="stichtag-paragraph">
+          <.input
+            type="date"
+            name="stichtag"
+            label={gettext("Active on reference date")}
+            class="input input-sm input-bordered"
+            value={date_iso(@stichtag)}
+            data-testid="stichtag-input"
+          />
         </div>
-      </fieldset>
-    </form>
+      </form>
+
+      <%!-- Third paragraph "Eigener Zeitraum": the same native From/To range the
+        join-date builder uses, wired to the exit_date custom mode — members whose
+        exit date falls within [from, to] (§1.24). A sibling form (not the
+        quick/Stichtag one) so committing a bound only touches the exit_date
+        slice and never re-reads the quick radios. --%>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="flex flex-col gap-1"
+        data-testid="value-control-exit-range"
+      >
+        <span class="text-xs font-medium">{gettext("Custom range")}</span>
+        <.date_range_row
+          from_name="ed_from"
+          to_name="ed_to"
+          from_value={exit_bound_iso(@date_filters, :from)}
+          to_value={exit_bound_iso(@date_filters, :to)}
+          testid="exit-custom-range"
+        />
+      </form>
+    </.control_shell>
     """
   end
 
   defp render_value_control(%{pending: %{control: :group_membership}} = assigns) do
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow max-h-[70vh] overflow-y-auto min-w-[16rem]"
-      data-testid="value-control-group"
-    >
-      <fieldset
-        :for={group <- @groups}
-        class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+    <.control_shell title={@pending.label} wide={true}>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="max-h-[60vh] overflow-y-auto flex flex-col gap-1"
+        data-testid="value-control-group"
       >
-        <legend class="text-sm col-start-1 float-left w-auto">{group.name}</legend>
-        <div class="join col-start-2">
-          <.in_not_in_radios
-            name={"#{@group_filter_prefix}#{group.id}"}
-            current={Map.get(@group_filters, to_string(group.id))}
-          />
-        </div>
-      </fieldset>
-    </form>
+        <fieldset
+          :for={group <- @groups}
+          class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+        >
+          <legend class="text-sm col-start-1 float-left w-auto">{group.name}</legend>
+          <div class="join col-start-2">
+            <.in_not_in_radios
+              name={"#{@group_filter_prefix}#{group.id}"}
+              current={Map.get(@group_filters, to_string(group.id))}
+            />
+          </div>
+        </fieldset>
+      </form>
+    </.control_shell>
     """
   end
 
   defp render_value_control(%{pending: %{control: :fee_type_membership}} = assigns) do
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow max-h-[70vh] overflow-y-auto min-w-[16rem]"
-      data-testid="value-control-fee-type"
-    >
-      <fieldset
-        :for={ft <- @fee_types}
-        class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+    <.control_shell title={@pending.label} wide={true}>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="max-h-[60vh] overflow-y-auto flex flex-col gap-1"
+        data-testid="value-control-fee-type"
       >
-        <legend class="text-sm col-start-1 float-left w-auto">{ft.name}</legend>
-        <div class="join col-start-2">
-          <.in_not_in_radios
-            name={"#{@fee_type_filter_prefix}#{ft.id}"}
-            current={Map.get(@fee_type_filters, to_string(ft.id))}
-          />
-        </div>
-      </fieldset>
-    </form>
+        <fieldset
+          :for={ft <- @fee_types}
+          class="border-0 p-0 m-0 grid grid-cols-[1fr_auto] items-center gap-2 py-1"
+        >
+          <legend class="text-sm col-start-1 float-left w-auto">{ft.name}</legend>
+          <div class="join col-start-2">
+            <.in_not_in_radios
+              name={"#{@fee_type_filter_prefix}#{ft.id}"}
+              current={Map.get(@fee_type_filters, to_string(ft.id))}
+            />
+          </div>
+        </fieldset>
+      </form>
+    </.control_shell>
     """
   end
 
@@ -394,91 +554,31 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     assigns = assign(assigns, :field_id, to_string(key))
 
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
-      data-testid="value-control-boolean"
-    >
-      <fieldset class="border-0 p-0 m-0">
-        <legend class="text-xs font-medium mb-1">{@pending.label}</legend>
-        <div class="join">
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
-              name={"custom_boolean[#{@field_id}]"}
-              value="all"
-              class="hidden"
-              checked={Map.get(@boolean_filters, @field_id) == nil}
-            />
-            {gettext("All")}
-          </label>
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
+    <.control_shell title={@pending.label}>
+      <form phx-change="commit" phx-target={@myself} data-testid="value-control-boolean">
+        <fieldset class="border-0 p-0 m-0">
+          <legend class="text-xs font-medium mb-1">{@pending.label}</legend>
+          <div class="join">
+            <.toggle_option
               name={"custom_boolean[#{@field_id}]"}
               value="true"
-              class="hidden"
+              icon="hero-check-circle"
               checked={Map.get(@boolean_filters, @field_id) == true}
-            />
-            {gettext("Yes")}
-          </label>
-          <label class="join-item btn btn-sm">
-            <input
-              type="radio"
+            >
+              {gettext("Yes")}
+            </.toggle_option>
+            <.toggle_option
               name={"custom_boolean[#{@field_id}]"}
               value="false"
-              class="hidden"
+              icon="hero-x-circle"
               checked={Map.get(@boolean_filters, @field_id) == false}
-            />
-            {gettext("No")}
-          </label>
-        </div>
-      </fieldset>
-    </form>
-    """
-  end
-
-  defp render_value_control(%{pending: %{control: :exit_date}} = assigns) do
-    ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
-      data-testid="value-control-exit-date"
-    >
-      <fieldset class="border-0 p-0 m-0">
-        <legend class="text-xs font-medium mb-1">{gettext("Exit date")}</legend>
-        <div class="join">
-          <label :for={{mode, label} <- exit_modes()} class="join-item btn btn-sm">
-            <input
-              type="radio"
-              name="ed_mode"
-              value={mode}
-              class="hidden"
-              checked={exit_mode(@date_filters) == String.to_existing_atom(mode)}
-            />
-            {label}
-          </label>
-        </div>
-        <div :if={exit_mode(@date_filters) == :custom} class="mt-2 flex gap-2 items-end flex-wrap">
-          <.input
-            type="date"
-            name="ed_from"
-            label={gettext("From")}
-            class="input input-sm input-bordered"
-            value={date_for(@date_filters, :exit_date, :from)}
-          />
-          <.input
-            type="date"
-            name="ed_to"
-            label={gettext("To")}
-            class="input input-sm input-bordered"
-            value={date_for(@date_filters, :exit_date, :to)}
-          />
-        </div>
-      </fieldset>
-    </form>
+            >
+              {gettext("No")}
+            </.toggle_option>
+          </div>
+        </fieldset>
+      </form>
+    </.control_shell>
     """
   end
 
@@ -493,46 +593,47 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       |> assign(:to_val, to_val)
 
     ~H"""
-    <form
-      phx-change="commit"
-      phx-target={@myself}
-      class="rounded-box border border-base-300 bg-base-100 p-2 shadow"
-      data-testid="value-control-date-range"
-    >
-      <fieldset class="border-0 p-0 m-0">
-        <legend class="text-xs font-medium mb-1">{@pending.label}</legend>
-        <div class="flex flex-wrap gap-1 mb-2" data-testid="date-presets">
-          <button
-            :for={{preset, label} <- date_presets()}
-            type="button"
-            class="btn btn-xs"
-            phx-click="apply_preset"
-            phx-value-preset={preset}
-            phx-value-key={to_string(@pending.key)}
-            phx-target={@myself}
-            data-testid={"date-preset-#{preset}"}
-          >
-            {label}
-          </button>
-        </div>
-        <div class="flex gap-2 items-end flex-wrap">
-          <.input
-            type="date"
-            name={@from_name}
-            label={gettext("From")}
-            class="input input-sm input-bordered"
-            value={@from_val}
-          />
-          <.input
-            type="date"
-            name={@to_name}
-            label={gettext("To")}
-            class="input input-sm input-bordered"
-            value={@to_val}
-          />
-        </div>
-      </fieldset>
-    </form>
+    <.control_shell title={@pending.label} wide={true}>
+      <div class="flex flex-wrap gap-1" data-testid="date-presets">
+        <button
+          :for={{preset, label} <- date_presets()}
+          type="button"
+          class="btn btn-xs"
+          phx-click="apply_preset"
+          phx-value-preset={preset}
+          phx-value-key={to_string(@pending.key)}
+          phx-target={@myself}
+          data-testid={"date-preset-#{preset}"}
+        >
+          {label}
+        </button>
+      </div>
+
+      <%!-- Currently applied concrete range, locally formatted (dd.MM.yyyy). --%>
+      <p :if={@from_val != "" or @to_val != ""} class="text-xs opacity-70" data-testid="date-resolved">
+        {local_range(@from_val, @to_val)}
+      </p>
+
+      <%!-- Separate "Eigener Zeitraum" paragraph: two native <input type="date">
+      controls side by side (§3.12 native-first — no cally). Committing a bound
+      through the shared date dispatch applies the custom range; the browser's
+      own date popup gives year-jump, manual entry and WCAG a11y for free. --%>
+      <form
+        phx-change="commit"
+        phx-target={@myself}
+        class="flex flex-col gap-1"
+        data-testid="value-control-date-range"
+      >
+        <span class="text-xs font-medium">{gettext("Custom range")}</span>
+        <.date_range_row
+          from_name={@from_name}
+          to_name={@to_name}
+          from_value={@from_val}
+          to_value={@to_val}
+          testid="custom-range"
+        />
+      </form>
+    </.control_shell>
     """
   end
 
@@ -559,7 +660,11 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   def handle_event("dismiss", _params, socket) do
     # Drop-on-dismiss (§1.3): closing the picker or a pending value control
     # without a selection adds no chip and triggers no re-load.
-    {:noreply, socket |> assign(:open_picker, false) |> assign(:pending, nil)}
+    {:noreply,
+     socket
+     |> assign(:open_picker, false)
+     |> assign(:edit_anchor, nil)
+     |> assign(:pending, nil)}
   end
 
   @impl true
@@ -575,6 +680,23 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
      socket
      |> assign(:open_picker, false)
      |> assign(:picker_query, "")
+     |> assign(:edit_anchor, nil)
+     |> assign(:pending, descriptor)}
+  end
+
+  @impl true
+  def handle_event("edit_chip", %{"key" => key, "kind" => kind, "id" => id}, socket) do
+    # Editable chip (§1.18): re-open the field's value control pre-filled with the
+    # current state (the controls read straight from assigns, so no extra plumbing
+    # is needed to pre-fill them). Anchor the popover under the clicked chip by
+    # tracking its {kind, id}, so it opens in place rather than as a new pending
+    # chip at the row start.
+    descriptor = Enum.find(descriptors(socket.assigns), &(to_string(&1.key) == key))
+
+    {:noreply,
+     socket
+     |> assign(:open_picker, false)
+     |> assign(:edit_anchor, {kind, id})
      |> assign(:pending, descriptor)}
   end
 
@@ -600,6 +722,8 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   def handle_event("commit", params, socket) do
     dispatch_payment(socket, params)
     dispatch_quick(socket, params)
+    dispatch_stichtag(socket, params)
+    dispatch_exit_range(socket, params)
 
     dispatch_prefix(
       socket,
@@ -620,7 +744,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     dispatch_boolean(socket, params)
     dispatch_dates(socket, params)
 
-    {:noreply, assign(socket, :pending, nil)}
+    {:noreply, socket}
   end
 
   @impl true
@@ -632,27 +756,56 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   @impl true
   def handle_event("clear_all", _params, socket) do
     send(self(), {:clear_all_filters})
-    {:noreply, socket |> assign(:open_picker, false) |> assign(:pending, nil)}
+
+    {:noreply,
+     socket
+     |> assign(:open_picker, false)
+     |> assign(:edit_anchor, nil)
+     |> assign(:pending, nil)}
   end
 
   # --- dispatch helpers -----------------------------------------------------
 
-  defp dispatch_payment(socket, params) do
-    case Map.get(params, "pay") do
-      nil ->
-        :ok
+  # The payment value control carries a hidden `__payment` marker so its status,
+  # count-range, suspended flag and period are dispatched independently (each
+  # sub-control commits its own slice; none depends on another being set).
+  defp dispatch_payment(socket, %{"__payment" => _} = params) do
+    dispatch_payment_filter(socket, params)
+    dispatch_suspended(socket, params)
+    dispatch_payment_period(socket, params)
+  end
 
-      value ->
-        filter = PaymentAging.parse_filter(value)
-        maybe_send(filter != socket.assigns.payment_filter, {:payment_filter_changed, filter})
+  defp dispatch_payment(_socket, _params), do: :ok
 
-        period = %{
-          from: parse_date(Map.get(params, "pay_from")),
-          to: parse_date(Map.get(params, "pay_to"))
-        }
+  defp dispatch_payment_filter(socket, params) do
+    filter =
+      case Map.get(params, "pay") do
+        "fully_paid" ->
+          :fully_paid
 
-        maybe_send(period != socket.assigns.payment_period, {:payment_period_changed, period})
-    end
+        "has_unpaid" ->
+          {:unpaid_range, parse_count(Map.get(params, "pay_min"), 1),
+           parse_count(Map.get(params, "pay_max"), nil)}
+
+        _ ->
+          nil
+      end
+
+    maybe_send(filter != socket.assigns.payment_filter, {:payment_filter_changed, filter})
+  end
+
+  defp dispatch_suspended(socket, params) do
+    suspended = Map.get(params, "suspended") == "1"
+    maybe_send(suspended != socket.assigns.suspended, {:suspended_changed, suspended})
+  end
+
+  defp dispatch_payment_period(socket, params) do
+    period = %{
+      from: parse_date(Map.get(params, "pay_from")),
+      to: parse_date(Map.get(params, "pay_to"))
+    }
+
+    maybe_send(period != socket.assigns.payment_period, {:payment_period_changed, period})
   end
 
   defp dispatch_quick(socket, params) do
@@ -671,6 +824,31 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     end
   end
 
+  defp dispatch_stichtag(socket, params) do
+    if Map.has_key?(params, "stichtag") do
+      date = parse_date(Map.get(params, "stichtag"))
+      maybe_send(date != socket.assigns.stichtag, {:stichtag_changed, date})
+    end
+  end
+
+  # The exit-date "Eigener Zeitraum" range writes only the exit_date slice
+  # (mode :custom + bounds), preserving join_date and custom-date entries — so
+  # editing the exit range never wipes another active date filter. Committing an
+  # empty range simply parks exit_date in :custom with nil bounds (no chip, no
+  # DB predicate), matching the join-date control's empty-range behaviour.
+  defp dispatch_exit_range(socket, params) do
+    if Map.has_key?(params, "ed_from") or Map.has_key?(params, "ed_to") do
+      new_filters =
+        Map.put(socket.assigns.date_filters, :exit_date, %{
+          mode: :custom,
+          from: parse_date(Map.get(params, "ed_from")),
+          to: parse_date(Map.get(params, "ed_to"))
+        })
+
+      maybe_send(new_filters != socket.assigns.date_filters, {:date_filters_changed, new_filters})
+    end
+  end
+
   defp dispatch_prefix(socket, params, prefix, message, valid_records) do
     if Enum.any?(params, fn {k, _} -> String.starts_with?(k, prefix) end) do
       dispatch_prefix_entries(socket, params, prefix, message, valid_records)
@@ -720,9 +898,12 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     end
   end
 
+  # The exit-date range is dispatched separately (dispatch_exit_range/2) so it
+  # only touches the exit_date slice; from_params/2 here rebuilds the whole date
+  # map, so ed_* params are intentionally excluded from this trigger.
   defp has_date_param?(params) do
     Enum.any?(params, fn {k, _} ->
-      k in ["ed_mode", "ed_from", "ed_to", "jd_from", "jd_to"] or
+      k in ["jd_from", "jd_to"] or
         String.starts_with?(k, @custom_date_filter_prefix)
     end)
   end
@@ -735,6 +916,9 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     send(self(), {:payment_period_changed, PaymentAging.default_period()})
   end
 
+  defp remove_chip("suspended", _id, _socket), do: send(self(), {:suspended_changed, false})
+  defp remove_chip("stichtag", _id, _socket), do: send(self(), {:stichtag_changed, nil})
+
   defp remove_chip("group", id, _socket), do: send(self(), {:group_filter_changed, id, nil})
   defp remove_chip("fee_type", id, _socket), do: send(self(), {:fee_type_filter_changed, id, nil})
   defp remove_chip("boolean", id, _socket), do: send(self(), {:boolean_filter_changed, id, nil})
@@ -749,6 +933,11 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   defp maybe_send(true, message), do: send(self(), message)
   defp maybe_send(false, _message), do: :ok
 
+  # Whether `chip` is the one currently being edited (§1.18): the edit anchor is
+  # the clicked chip's {kind, id}, uniquely identifying it in the row.
+  defp editing_chip?({kind, id}, %{kind: kind, id: id}), do: true
+  defp editing_chip?(_anchor, _chip), do: false
+
   # --------------------------------------------------------------------------
   # Chips
   # --------------------------------------------------------------------------
@@ -758,7 +947,9 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       fee_type_chips(assigns) ++
       boolean_chips(assigns) ++
       date_chips(assigns) ++
-      payment_chips(assigns)
+      stichtag_chip(assigns) ++
+      payment_chips(assigns) ++
+      suspended_chip(assigns)
   end
 
   defp group_chips(assigns) do
@@ -771,7 +962,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
           :not_in -> gettext("Group: not %{name}", name: Map.get(names, id, id))
         end
 
-      %{kind: "group", id: id, label: label}
+      %{kind: "group", id: id, edit_key: "group", label: label}
     end
   end
 
@@ -785,7 +976,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
           :not_in -> gettext("Fee type: not %{name}", name: Map.get(names, id, id))
         end
 
-      %{kind: "fee_type", id: id, label: label}
+      %{kind: "fee_type", id: id, edit_key: "fee_type", label: label}
     end
   end
 
@@ -794,7 +985,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
 
     for {id, value} <- assigns.boolean_filters do
       state = if value, do: gettext("Yes"), else: gettext("No")
-      %{kind: "boolean", id: id, label: "#{Map.get(names, id, id)}: #{state}"}
+      %{kind: "boolean", id: id, edit_key: id, label: "#{Map.get(names, id, id)}: #{state}"}
     end
   end
 
@@ -810,15 +1001,35 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     # :active_only is the default exit-date state, so it is not a user-applied
     # filter and renders no chip; only the non-default states do.
     case DateFilter.quick_state(filters) do
-      :active -> []
-      :former -> [%{kind: "date", id: "exit_date", label: gettext("Former")}]
-      :custom -> range_chip("date", "exit_date", gettext("Exited"), Map.get(filters, :exit_date))
-      :all -> [%{kind: "date", id: "exit_date", label: gettext("All (incl. former)")}]
+      :active ->
+        []
+
+      :former ->
+        [%{kind: "date", id: "exit_date", edit_key: "active_former", label: gettext("Former")}]
+
+      :custom ->
+        range_chip(
+          "date",
+          "exit_date",
+          "active_former",
+          gettext("Exited"),
+          Map.get(filters, :exit_date)
+        )
+
+      :all ->
+        [
+          %{
+            kind: "date",
+            id: "exit_date",
+            edit_key: "active_former",
+            label: gettext("All (incl. former)")
+          }
+        ]
     end
   end
 
   defp builtin_range_chip(filters, field, prefix) do
-    range_chip("date", to_string(field), prefix, Map.get(filters, field))
+    range_chip("date", to_string(field), to_string(field), prefix, Map.get(filters, field))
   end
 
   defp custom_date_chips(assigns) do
@@ -827,34 +1038,58 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     assigns.date_filters
     |> Enum.flat_map(fn
       {k, %{} = bounds} when is_binary(k) ->
-        range_chip("date", k, Map.get(names, k, k), bounds)
+        range_chip("date", k, k, Map.get(names, k, k), bounds)
 
       _ ->
         []
     end)
   end
 
-  defp range_chip(kind, id, prefix, %{} = bounds) do
+  defp range_chip(kind, id, edit_key, prefix, %{} = bounds) do
     from = bounds[:from]
     to = bounds[:to]
 
     if from || to do
-      [%{kind: kind, id: id, label: "#{prefix}: #{date_iso(from) || "…"}–#{date_iso(to) || "…"}"}]
+      [
+        %{
+          kind: kind,
+          id: id,
+          edit_key: edit_key,
+          label: "#{prefix}: #{local_range(date_iso(from), date_iso(to))}"
+        }
+      ]
     else
       []
     end
   end
 
-  defp range_chip(_kind, _id, _prefix, _), do: []
+  defp range_chip(_kind, _id, _edit_key, _prefix, _), do: []
 
   defp payment_chips(assigns) do
     filter_chip =
       case assigns.payment_filter do
         :fully_paid ->
-          [%{kind: "payment", id: "payment", label: gettext("Fully paid")}]
+          [%{kind: "payment", id: "payment", edit_key: "payment", label: gettext("All paid")}]
 
         {:has_unpaid, n} ->
-          [%{kind: "payment", id: "payment", label: gettext("≥ %{n} unpaid", n: n)}]
+          [
+            %{
+              kind: "payment",
+              id: "payment",
+              edit_key: "payment",
+              label: gettext("≥ %{n} unpaid", n: n)
+            }
+          ]
+
+        {:unpaid_range, min, max} ->
+          [
+            %{
+              kind: "payment",
+              id: "payment",
+              edit_key: "payment",
+              label: unpaid_range_label(min, max)
+            }
+          ]
 
         _ ->
           []
@@ -865,9 +1100,9 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     period_chip =
       if period[:from] || period[:to] do
         label =
-          "#{gettext("Period")}: #{date_iso(period[:from]) || "…"}–#{date_iso(period[:to]) || "…"}"
+          "#{gettext("Contribution period")}: #{local_range(date_iso(period[:from]), date_iso(period[:to]))}"
 
-        [%{kind: "payment_period", id: "payment_period", label: label}]
+        [%{kind: "payment_period", id: "payment_period", edit_key: "payment", label: label}]
       else
         []
       end
@@ -875,6 +1110,31 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     filter_chip ++ period_chip
   end
 
+  defp suspended_chip(%{suspended: true}),
+    do: [
+      %{kind: "suspended", id: "suspended", edit_key: "payment", label: gettext("Suspended fees")}
+    ]
+
+  defp suspended_chip(_), do: []
+
+  defp stichtag_chip(%{stichtag: %Date{} = date}) do
+    [
+      %{
+        kind: "stichtag",
+        id: "stichtag",
+        edit_key: "active_former",
+        label: gettext("Active on %{date}", date: DateFormatter.format_date(date))
+      }
+    ]
+  end
+
+  defp stichtag_chip(_), do: []
+
+  defp unpaid_range_label(min, nil) when min <= 1, do: gettext("Open contributions")
+  defp unpaid_range_label(min, nil), do: gettext("≥ %{n} unpaid", n: min)
+  defp unpaid_range_label(min, max) when min == max, do: gettext("%{n} unpaid", n: min)
+  defp unpaid_range_label(min, max), do: gettext("%{min}–%{max} unpaid", min: min, max: max)
+
   # --------------------------------------------------------------------------
   # Helpers
   # --------------------------------------------------------------------------
@@ -902,19 +1162,43 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   attr :name, :string, required: true
   attr :current, :atom, default: nil
 
+  # No "All" option (§1.20): a cleared filter is simply the absence of a chip.
+  # Multi-select is OR for `:in` and exclude-all for `:not_in` (§1.29). Uses the
+  # same check/x Ja/Nein join-toggle as the boolean custom-field control so the
+  # two-state operator reads consistently: "Ja" = member is in this value
+  # (`:in`), "Nein" = member is not (`:not_in`).
   defp in_not_in_radios(assigns) do
     ~H"""
-    <label class="join-item btn btn-sm">
-      <input type="radio" name={@name} value="all" class="hidden" checked={@current == nil} />
-      {gettext("All")}
-    </label>
-    <label class="join-item btn btn-sm">
-      <input type="radio" name={@name} value="in" class="hidden" checked={@current == :in} />
+    <.toggle_option name={@name} value="in" icon="hero-check-circle" checked={@current == :in}>
       {gettext("Yes")}
-    </label>
-    <label class="join-item btn btn-sm">
-      <input type="radio" name={@name} value="not_in" class="hidden" checked={@current == :not_in} />
+    </.toggle_option>
+    <.toggle_option
+      name={@name}
+      value="not_in"
+      icon="hero-x-circle"
+      checked={@current == :not_in}
+    >
       {gettext("No")}
+    </.toggle_option>
+    """
+  end
+
+  attr :name, :string, required: true
+  attr :value, :string, required: true
+  attr :checked, :boolean, default: false
+  attr :icon, :string, default: nil
+  slot :inner_block, required: true
+
+  # Shared two-state join toggle used by the boolean and is/is-not controls
+  # (Task 5): a `join-item` button label wrapping a hidden radio, with a visible
+  # selected state (`btn-primary` when the radio is checked) and an optional
+  # leading icon. Consistent look across every two-state selector.
+  defp toggle_option(assigns) do
+    ~H"""
+    <label class="join-item btn btn-sm gap-1 has-[:checked]:btn-primary">
+      <input type="radio" name={@name} value={@value} class="hidden" checked={@checked} />
+      <.icon :if={@icon} name={@icon} class="size-3.5" />
+      {render_slot(@inner_block)}
     </label>
     """
   end
@@ -923,20 +1207,19 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   defp group_label(:membership), do: gettext("Membership")
   defp group_label(:custom_fields), do: gettext("Custom fields")
 
-  defp exit_modes do
-    [
-      {"active_only", gettext("Active only")},
-      {"all", gettext("All")},
-      {"inactive_only", gettext("Former only")},
-      {"custom", gettext("Range")}
-    ]
-  end
-
-  defp exit_mode(%{exit_date: %{mode: mode}}), do: mode
-  defp exit_mode(_), do: :active_only
-
   defp quick(filters), do: DateFilter.quick_state(filters)
 
+  defp has_unpaid?({:has_unpaid, _}), do: true
+  defp has_unpaid?({:unpaid_range, _, _}), do: true
+  defp has_unpaid?(_), do: false
+
+  defp range_min({:unpaid_range, min, _}), do: Integer.to_string(min)
+  defp range_min({:has_unpaid, n}), do: Integer.to_string(n)
+  defp range_min(_), do: "1"
+
+  defp range_max({:unpaid_range, _, max}) when is_integer(max), do: Integer.to_string(max)
+  defp range_max(_), do: ""
+
   defp parse_tri_state("true"), do: true
   defp parse_tri_state("false"), do: false
   defp parse_tri_state(_), do: nil
@@ -944,13 +1227,40 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   defp date_iso(%Date{} = d), do: Date.to_iso8601(d)
   defp date_iso(_), do: nil
 
-  defp date_for(filters, field, bound) do
-    case filters do
-      %{^field => %{^bound => %Date{} = d}} -> Date.to_iso8601(d)
+  # ISO string for a bound of the exit_date custom range, pre-filling the
+  # "Eigener Zeitraum" inputs only when the exit filter is actually in :custom
+  # mode (the quick active/former/all states carry no user range).
+  defp exit_bound_iso(filters, bound) do
+    case Map.get(filters, :exit_date, %{}) do
+      %{mode: :custom} = ed -> date_iso(Map.get(ed, bound)) || ""
       _ -> ""
     end
   end
 
+  # Locally formats an ISO from/to pair as "dd.MM.yyyy–dd.MM.yyyy" (either side
+  # may be blank), reusing the app-wide DateFormatter (§2.8).
+  defp local_range(from_iso, to_iso) do
+    "#{fmt_iso(from_iso)}–#{fmt_iso(to_iso)}"
+  end
+
+  defp fmt_iso(iso) when is_binary(iso) and iso != "" do
+    case Date.from_iso8601(iso) do
+      {:ok, date} -> DateFormatter.format_date(date)
+      _ -> "…"
+    end
+  end
+
+  defp fmt_iso(_), do: "…"
+
+  defp parse_count(value, default) when is_binary(value) do
+    case Integer.parse(String.trim(value)) do
+      {n, ""} when n > 0 -> n
+      _ -> default
+    end
+  end
+
+  defp parse_count(_value, default), do: default
+
   # Builds the {from_name, to_name, from_val, to_val} tuple for a date_range
   # control keyed by a built-in field (:join_date) or a custom date field UUID.
   defp date_range_binding(assigns, :join_date) do
@@ -966,6 +1276,13 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
      date_iso(bounds[:from]) || "", date_iso(bounds[:to]) || ""}
   end
 
+  defp date_for(filters, field, bound) do
+    case filters do
+      %{^field => %{^bound => %Date{} = d}} -> Date.to_iso8601(d)
+      _ -> ""
+    end
+  end
+
   # --- date presets ---------------------------------------------------------
 
   defp date_presets do
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index b39ee175..2173025f 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -472,6 +472,8 @@ defmodule MvWeb.MemberLive.Index do
        %{
          payment_filter: nil,
          payment_period: PaymentAging.default_period(),
+         suspended: false,
+         stichtag: nil,
          group_filters: %{},
          fee_type_filters: %{},
          boolean_filters: %{},
@@ -481,6 +483,46 @@ defmodule MvWeb.MemberLive.Index do
     )
   end
 
+  @impl true
+  def handle_info({:suspended_changed, suspended}, socket) do
+    socket =
+      socket
+      |> assign(:suspended, suspended)
+      |> load_members()
+      |> scroll_list_to_top()
+      |> update_selection_assigns()
+
+    query_params =
+      build_query_params(opts_for_query_params(socket, %{suspended: suspended}))
+      |> maybe_add_field_selection(
+        socket.assigns[:user_field_selection],
+        socket.assigns[:fields_in_url?] || false
+      )
+
+    new_path = ~p"/members?#{query_params}"
+    {:noreply, push_reload(socket, new_path)}
+  end
+
+  @impl true
+  def handle_info({:stichtag_changed, stichtag}, socket) do
+    socket =
+      socket
+      |> assign(:stichtag, stichtag)
+      |> load_members()
+      |> scroll_list_to_top()
+      |> update_selection_assigns()
+
+    query_params =
+      build_query_params(opts_for_query_params(socket, %{stichtag: stichtag}))
+      |> maybe_add_field_selection(
+        socket.assigns[:user_field_selection],
+        socket.assigns[:fields_in_url?] || false
+      )
+
+    new_path = ~p"/members?#{query_params}"
+    {:noreply, push_reload(socket, new_path)}
+  end
+
   @impl true
   def handle_info({:boolean_filter_changed, custom_field_id_str, filter_value}, socket) do
     updated_filters =
@@ -595,6 +637,8 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:fee_type_filters, Map.get(opts, :fee_type_filters, %{}))
       |> assign(:boolean_custom_field_filters, Map.get(opts, :boolean_filters, %{}))
       |> assign(:date_filters, Map.get(opts, :date_filters, DateFilter.default()))
+      |> assign(:suspended, Map.get(opts, :suspended, false))
+      |> assign(:stichtag, Map.get(opts, :stichtag))
       |> load_members()
       |> scroll_list_to_top()
       |> update_selection_assigns()
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index fc4aa559..2a060282 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -63,6 +63,8 @@
       date_filters={@date_filters}
       payment_filter={@payment_filter}
       payment_period={@payment_period}
+      suspended={@suspended}
+      stichtag={@stichtag}
     />
   </div>
 
@@ -471,7 +473,7 @@
             />
             <span
               :if={MvWeb.MemberLive.Index.payment_period_active?(@payment_period)}
-              class="badge badge-soft badge-info badge-sm shrink-0"
+              class="badge badge-soft badge-primary badge-sm font-normal shrink-0"
               title={PaymentAging.period_tooltip(@payment_period)}
               aria-label={PaymentAging.period_tooltip(@payment_period)}
               data-testid="payment-period-badge"
@@ -485,20 +487,28 @@
         <% count = member.unpaid_cycle_count || 0 %>
         <% badge = PaymentAging.badge(count) %>
         <% tip_id = "payment-tip-#{member.id}" %>
-        <button
-          type="button"
-          class={["badge badge-soft badge-md cursor-pointer", badge.color_class]}
-          data-variant={badge.variant}
-          phx-hook={count > 0 && "SortTooltip"}
+        <% anchor = "--pay-#{member.id}" %>
+        <%!-- The badge is a real navigation link (semantic, keyboard- and
+        right-click-friendly) into the member's payment history. Its hover/focus
+        tooltip is a native Popover-API element in the top layer, placed via CSS
+        anchor positioning (see the `payment-tip` class + the HoverPopover hook),
+        so it escapes the members table's `overflow` clipping without any custom
+        coordinate math. No tooltip renders when the member is fully paid. --%>
+        <.link
+          navigate={~p"/members/#{member.id}?tab=membership_fees"}
           id={"payment-badge-#{member.id}"}
-          data-tooltip-id={count > 0 && tip_id}
-          phx-click={JS.navigate(~p"/members/#{member.id}?tab=membership_fees")}
+          class={["badge badge-soft badge-md", badge.color_class]}
+          style={count > 0 && "anchor-name: #{anchor}"}
+          data-variant={badge.variant}
+          phx-hook={count > 0 && "HoverPopover"}
+          data-popover-target={count > 0 && tip_id}
+          aria-details={count > 0 && tip_id}
           aria-label={gettext("%{label} — open payment history", label: badge.label)}
           data-testid="payment-badge"
         >
           <.icon name={badge.icon} class="size-4" />
           {badge.label}
-        </button>
+        </.link>
         <%= if count > 0 do %>
           <% cycles = PaymentAging.open_cycles(member, @payment_period) %>
           <% {shown, overflow} = PaymentAging.tooltip_cycles(cycles) %>
@@ -506,7 +516,8 @@
             id={tip_id}
             popover="manual"
             role="tooltip"
-            class="m-0 w-fit rounded-box border border-base-300 bg-base-100 p-2 text-sm shadow-xl"
+            style={"position-anchor: #{anchor}"}
+            class="payment-tip m-0 w-fit rounded-box border border-base-300 bg-base-100 p-2 text-sm shadow-xl"
             data-testid="payment-tooltip"
           >
             <ul class="m-0 flex list-none flex-col items-stretch gap-1 p-0">
@@ -521,7 +532,8 @@
               </li>
               <li :if={overflow > 0} class="flex">
                 <span class="badge badge-soft badge-sm badge-ghost w-full justify-start">
-                  {gettext("+%{count} more", count: overflow)}
+                  <.icon name="hero-plus-circle" class="size-3.5" />
+                  {gettext("%{count} more", count: overflow)}
                 </span>
               </li>
             </ul>
diff --git a/lib/mv_web/live/member_live/index/date_presets.ex b/lib/mv_web/live/member_live/index/date_presets.ex
index ca671f73..dd886c94 100644
--- a/lib/mv_web/live/member_live/index/date_presets.ex
+++ b/lib/mv_web/live/member_live/index/date_presets.ex
@@ -39,7 +39,7 @@ defmodule MvWeb.MemberLive.Index.DatePresets do
   Returns every preset key in display order (rolling windows first, then the
   period-to-date presets), for rendering the preset radio list.
   """
-  @spec all() :: [preset()]
+  @spec all() :: [preset(), ...]
   def all, do: @presets
 
   @doc """
diff --git a/lib/mv_web/live/member_live/index/filter_descriptor.ex b/lib/mv_web/live/member_live/index/filter_descriptor.ex
index 0e80dc5a..9cbde461 100644
--- a/lib/mv_web/live/member_live/index/filter_descriptor.ex
+++ b/lib/mv_web/live/member_live/index/filter_descriptor.ex
@@ -101,7 +101,12 @@ defmodule MvWeb.MemberLive.Index.FilterDescriptor do
       maybe_fee_type(fee_types) ++
       [
         %{key: :join_date, group: :membership, label: gettext("Join date"), control: :date_range},
-        %{key: :exit_date, group: :membership, label: gettext("Exit date"), control: :exit_date}
+        %{
+          key: :exit_date,
+          group: :membership,
+          label: gettext("Exit date"),
+          control: :active_former
+        }
       ]
   end
 
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index 9fc4cd65..4d6576e1 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -81,7 +81,7 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
       (at least N unpaid cycles in the period)
     * anything else → `nil` (no payment-count filter)
   """
-  @spec parse_filter(term()) :: filter()
+  @spec parse_filter(term()) :: nil | :fully_paid | {:has_unpaid, 1..3}
   def parse_filter("fully_paid"), do: :fully_paid
   def parse_filter("unpaid_1"), do: {:has_unpaid, 1}
   def parse_filter("unpaid_2"), do: {:has_unpaid, 2}
@@ -212,17 +212,31 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   @doc """
   Human-readable tooltip naming the active payment period with locally formatted
-  (`dd.MM.yyyy`) bounds (§1.28). The all-outstanding default names all
-  outstanding cycles; open-ended periods render an open bound as an ellipsis.
+  (`dd.MM.yyyy`) bounds (§1.28). Explains that the shown figures refer to the
+  filtered contribution period, then names it: the all-outstanding default
+  names all outstanding cycles; open-ended periods render an open bound as an
+  ellipsis.
   """
   @spec period_tooltip(period()) :: String.t()
-  def period_tooltip(%{from: nil, to: nil}), do: gettext("Fees across all outstanding cycles")
+  def period_tooltip(%{from: nil, to: nil}),
+    do:
+      gettext(
+        "The values refer to the filtered contribution period. Fees across all outstanding cycles"
+      )
 
   def period_tooltip(%{from: from, to: to}) do
-    gettext("Fees in period %{from}–%{to}", from: period_bound(from), to: period_bound(to))
+    gettext(
+      "The values refer to the filtered contribution period. Fees in period %{from}–%{to}",
+      from: period_bound(from),
+      to: period_bound(to)
+    )
   end
 
-  def period_tooltip(_), do: gettext("Fees across all outstanding cycles")
+  def period_tooltip(_),
+    do:
+      gettext(
+        "The values refer to the filtered contribution period. Fees across all outstanding cycles"
+      )
 
   defp period_bound(%Date{} = d), do: DateFormatter.format_date(d)
   defp period_bound(_), do: "…"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index d6f9123f..1a8682ad 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -89,11 +89,6 @@ msgstr "Aktionen"
 msgid "Active members"
 msgstr "Aktive Mitglieder"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Active only"
-msgstr "Nur aktive"
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Add Member"
@@ -1244,7 +1239,6 @@ msgstr "Beispiele"
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
@@ -2725,11 +2719,6 @@ msgstr "Vierteljährlich"
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Range"
-msgstr "Zeitraum"
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Reactivate member"
@@ -4102,7 +4091,6 @@ msgstr "Aktiv / ehemalig"
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Payment"
@@ -4168,16 +4156,6 @@ msgstr "Filtern nach …"
 msgid "Former"
 msgstr "Ehemalig"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Former only"
-msgstr "Nur ehemalige"
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fully paid"
-msgstr "Vollständig bezahlt"
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Group: %{name}"
@@ -4188,21 +4166,6 @@ msgstr "Gruppe: %{name}"
 msgid "Group: not %{name}"
 msgstr "Gruppe: nicht %{name}"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 1"
-msgstr "Offen ≥ 1"
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 2"
-msgstr "Offen ≥ 2"
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 3"
-msgstr "Offen ≥ 3"
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Joined"
@@ -4223,21 +4186,6 @@ msgstr "Mitgliedschaft"
 msgid "Payment status"
 msgstr "Zahlungsstatus"
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period"
-msgstr "Zeitraum"
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period from"
-msgstr "Zeitraum von"
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period to"
-msgstr "Zeitraum bis"
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Quick"
@@ -4268,11 +4216,7 @@ msgstr "≥ %{n} offen"
 msgid "%{count} open"
 msgstr "%{count} offen"
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "+%{count} more"
-msgstr "+%{count} weitere"
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
 msgid "All paid"
@@ -4363,12 +4307,152 @@ msgstr "Letzte 7 Tage"
 msgid "This quarter"
 msgstr "Dieses Quartal"
 
-#: lib/mv_web/live/member_live/index/payment_aging.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
-msgid "Fees across all outstanding cycles"
-msgstr "Beiträge über alle offenen Zyklen"
+msgid "%{min}–%{max} unpaid"
+msgstr "%{min}–%{max} offen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "%{n} unpaid"
+msgstr "%{n} offen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on %{date}"
+msgstr "Aktiv am %{date}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on reference date"
+msgstr "Aktiv am Stichtag"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter: %{field}"
+msgstr "Filter: %{field}"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Open cycles"
+msgstr "Offene Zyklen"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Suspended fees"
+msgstr "Ausgesetzte Beiträge"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "max"
+msgstr "max"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "min"
+msgstr "min"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Custom range"
+msgstr "Eigener Zeitraum"
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{count} more"
+msgstr "%{count} weitere"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Open contributions"
+msgstr "offene Beiträge"
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution period"
+msgstr "Beitragszeitraum"
 
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
-msgid "Fees in period %{from}–%{to}"
-msgstr "Beiträge im Zeitraum %{from}–%{to}"
+msgid "The values refer to the filtered contribution period. Fees across all outstanding cycles"
+msgstr "Die Angaben beziehen sich auf den gefilterten Beitragszeitraum. Beiträge über alle offenen Zyklen"
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "The values refer to the filtered contribution period. Fees in period %{from}–%{to}"
+msgstr "Die Angaben beziehen sich auf den gefilterten Beitragszeitraum. Beiträge im Zeitraum %{from}–%{to}"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Active only"
+#~ msgstr "Nur aktive"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Apply"
+#~ msgstr "Übernehmen"
+
+#~ #: lib/mv_web/live/member_live/index/payment_aging.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fees across all outstanding cycles"
+#~ msgstr "Beiträge über alle offenen Zyklen"
+
+#~ #: lib/mv_web/live/member_live/index/payment_aging.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fees in period %{from}–%{to}"
+#~ msgstr "Beiträge im Zeitraum %{from}–%{to}"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Former only"
+#~ msgstr "Nur ehemalige"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fully paid"
+#~ msgstr "Vollständig bezahlt"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Has unpaid"
+#~ msgstr "Hat offene"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Has unpaid ≥ 1"
+#~ msgstr "Offen ≥ 1"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Has unpaid ≥ 3"
+#~ msgstr "Offen ≥ 3"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period"
+#~ msgstr "Zeitraum"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period from"
+#~ msgstr "Zeitraum von"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period to"
+#~ msgstr "Zeitraum bis"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Range"
+#~ msgstr "Zeitraum"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "is"
+#~ msgstr "ist"
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "is not"
+#~ msgstr "ist nicht"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index d0f9425b..ae7e899b 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -90,11 +90,6 @@ msgstr ""
 msgid "Active members"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Active only"
-msgstr ""
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Add Member"
@@ -1245,7 +1240,6 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
@@ -2726,11 +2720,6 @@ msgstr ""
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Range"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Reactivate member"
@@ -4102,7 +4091,6 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Payment"
@@ -4168,16 +4156,6 @@ msgstr ""
 msgid "Former"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Former only"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fully paid"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Group: %{name}"
@@ -4188,21 +4166,6 @@ msgstr ""
 msgid "Group: not %{name}"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 1"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 2"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 3"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Joined"
@@ -4223,21 +4186,6 @@ msgstr ""
 msgid "Payment status"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period from"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period to"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Quick"
@@ -4268,11 +4216,7 @@ msgstr ""
 msgid "%{count} open"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format
-msgid "+%{count} more"
-msgstr ""
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
 msgid "All paid"
@@ -4363,12 +4307,77 @@ msgstr ""
 msgid "This quarter"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index/payment_aging.ex
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
-msgid "Fees across all outstanding cycles"
+msgid "%{min}–%{max} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "%{n} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on %{date}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on reference date"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter: %{field}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Open cycles"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Suspended fees"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "max"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "min"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Custom range"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format
+msgid "%{count} more"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Open contributions"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Contribution period"
 msgstr ""
 
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
-msgid "Fees in period %{from}–%{to}"
+msgid "The values refer to the filtered contribution period. Fees across all outstanding cycles"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "The values refer to the filtered contribution period. Fees in period %{from}–%{to}"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 427fb998..9f43b72f 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -90,11 +90,6 @@ msgstr ""
 msgid "Active members"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Active only"
-msgstr ""
-
 #: lib/mv_web/live/group_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Add Member"
@@ -1245,7 +1240,6 @@ msgstr ""
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format, fuzzy
@@ -2726,11 +2720,6 @@ msgstr ""
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Range"
-msgstr ""
-
 #: lib/mv_web/live/member_live/show/deactivate_component.ex
 #, elixir-autogen, elixir-format
 msgid "Reactivate member"
@@ -3956,6 +3945,7 @@ msgid "email %{email} has already been taken"
 msgstr ""
 
 #: lib/mv_web/components/bulk_actions_dropdown.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #, elixir-autogen, elixir-format
 msgid "filtered"
 msgstr ""
@@ -4101,7 +4091,6 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/filter_descriptor.ex
 #, elixir-autogen, elixir-format
 msgid "Payment"
@@ -4167,16 +4156,6 @@ msgstr ""
 msgid "Former"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Former only"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Fully paid"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Group: %{name}"
@@ -4187,21 +4166,6 @@ msgstr ""
 msgid "Group: not %{name}"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 1"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 2"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Has unpaid ≥ 3"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Joined"
@@ -4212,11 +4176,6 @@ msgstr ""
 msgid "Last 30 days"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Last year"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Membership"
@@ -4227,21 +4186,6 @@ msgstr ""
 msgid "Payment status"
 msgstr ""
 
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period from"
-msgstr ""
-
-#: lib/mv_web/live/components/add_filter_builder_component.ex
-#, elixir-autogen, elixir-format
-msgid "Period to"
-msgstr ""
-
 #: lib/mv_web/live/components/add_filter_builder_component.ex
 #, elixir-autogen, elixir-format
 msgid "Quick"
@@ -4272,11 +4216,7 @@ msgstr ""
 msgid "%{count} open"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.html.heex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "+%{count} more"
-msgstr ""
-
+#: lib/mv_web/live/components/add_filter_builder_component.ex
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "All paid"
@@ -4307,11 +4247,6 @@ msgstr ""
 msgid "Fees"
 msgstr ""
 
-#: lib/mv_web/live/member_live/index.ex
-#, elixir-autogen, elixir-format
-msgid "Fees · %{range}"
-msgstr ""
-
 #: lib/mv_web/live/member_live/index/payment_aging.ex
 #, elixir-autogen, elixir-format
 msgid "January"
@@ -4347,11 +4282,166 @@ msgstr ""
 msgid "September"
 msgstr ""
 
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Click to sort by open payment cycles"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 12 months"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Last 3 months"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Last 7 days"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "This quarter"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "%{min}–%{max} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{n} unpaid"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on %{date}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Active on reference date"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Filter: %{field}"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Open cycles"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Suspended fees"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "max"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "min"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom range"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index.html.heex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{count} more"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format
+msgid "Open contributions"
+msgstr ""
+
+#: lib/mv_web/live/components/add_filter_builder_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Contribution period"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "The values refer to the filtered contribution period. Fees across all outstanding cycles"
+msgstr ""
+
+#: lib/mv_web/live/member_live/index/payment_aging.ex
+#, elixir-autogen, elixir-format
+msgid "The values refer to the filtered contribution period. Fees in period %{from}–%{to}"
+msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Active only"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Apply"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Click for member details"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/member_live/index/payment_aging.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fees across all outstanding cycles"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index/payment_aging.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fees in period %{from}–%{to}"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fees · %{range}"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Former only"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Fully paid"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Has unpaid"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Has unpaid ≥ 1"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Has unpaid ≥ 3"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Last year"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "No open cycles for this period"
@@ -4362,6 +4452,26 @@ msgstr ""
 #~ msgid "Payment · %{range}"
 #~ msgstr ""
 
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period from"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Period to"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Range"
+#~ msgstr ""
+
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Suspended: %{date}"
@@ -4371,3 +4481,13 @@ msgstr ""
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Unpaid until %{date}"
 #~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "is"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/components/add_filter_builder_component.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "is not"
+#~ msgstr ""
diff --git a/test/mv_web/member_live/index_active_former_test.exs b/test/mv_web/member_live/index_active_former_test.exs
index 55093117..4bb2c731 100644
--- a/test/mv_web/member_live/index_active_former_test.exs
+++ b/test/mv_web/member_live/index_active_former_test.exs
@@ -61,4 +61,96 @@ defmodule MvWeb.MemberLive.IndexActiveFormerTest do
     assert has_element?(view, "#row-#{ctx.future.id}")
     assert has_element?(view, "#row-#{ctx.former.id}")
   end
+
+  describe "Stichtag paragraph (§1.24)" do
+    test "the active/former control carries a separate 'active on reference date' input", ctx do
+      {:ok, view, _html} = live(ctx.conn, ~p"/members")
+
+      pick_field(view, "active_former")
+
+      # The Stichtag input sits in its own paragraph, not inside the
+      # Active/Former button-join.
+      assert has_element?(view, "[data-testid='stichtag-paragraph'] input[name='stichtag']")
+      refute has_element?(view, ".join input[name='stichtag']")
+    end
+
+    test "setting a reference date activates the point-in-time membership filter", ctx do
+      {:ok, view, _html} = live(ctx.conn, ~p"/members")
+
+      pick_field(view, "active_former")
+
+      view
+      |> element("[data-testid='value-control-active-former']")
+      |> render_change(%{"quick" => "active", "stichtag" => "2024-06-15"})
+
+      _ = render(view)
+      path = assert_patch(view)
+      assert path =~ "stichtag=2024-06-15"
+    end
+  end
+
+  describe "Eigener Zeitraum exit-date range (§1.24)" do
+    test "the exit-date control carries a separate native From/To range paragraph", ctx do
+      {:ok, view, _html} = live(ctx.conn, ~p"/members")
+
+      pick_field(view, "active_former")
+
+      # Third paragraph, same native two-input range control the join-date
+      # builder uses — separate from the Active/Former join and the Stichtag box.
+      assert has_element?(view, "[data-testid='value-control-exit-range']")
+
+      assert has_element?(
+               view,
+               "[data-testid='value-control-exit-range'] input[type='date'][name='ed_from']"
+             )
+
+      assert has_element?(
+               view,
+               "[data-testid='value-control-exit-range'] input[type='date'][name='ed_to']"
+             )
+    end
+
+    test "typing an exit-date range commits ed_mode=custom with bounds and filters to it", ctx do
+      from = Date.add(Date.utc_today(), -60)
+      to = Date.add(Date.utc_today(), -1)
+
+      {:ok, view, _html} = live(ctx.conn, ~p"/members")
+
+      pick_field(view, "active_former")
+
+      view
+      |> element("[data-testid='value-control-exit-range']")
+      |> render_change(%{"ed_from" => Date.to_iso8601(from), "ed_to" => Date.to_iso8601(to)})
+
+      _ = render(view)
+      path = assert_patch(view)
+      assert path =~ "ed_mode=custom"
+      assert path =~ "ed_from=#{Date.to_iso8601(from)}"
+      assert path =~ "ed_to=#{Date.to_iso8601(to)}"
+
+      # Only the member whose exit date falls within [from, to] is shown.
+      assert has_element?(view, "#row-#{ctx.former.id}")
+      refute has_element?(view, "#row-#{ctx.active.id}")
+      refute has_element?(view, "#row-#{ctx.future.id}")
+    end
+
+    test "an exit-date range preserves an existing join-date filter", ctx do
+      from = Date.add(Date.utc_today(), -60)
+      to = Date.add(Date.utc_today(), -1)
+
+      {:ok, view, _html} = live(ctx.conn, ~p"/members?jd_from=2020-01-01")
+
+      pick_field(view, "active_former")
+
+      view
+      |> element("[data-testid='value-control-exit-range']")
+      |> render_change(%{"ed_from" => Date.to_iso8601(from), "ed_to" => Date.to_iso8601(to)})
+
+      _ = render(view)
+      path = assert_patch(view)
+      # The exit range must not wipe the pre-existing join-date bound.
+      assert path =~ "jd_from=2020-01-01"
+      assert path =~ "ed_mode=custom"
+    end
+  end
 end
diff --git a/test/mv_web/member_live/index_chip_edit_test.exs b/test/mv_web/member_live/index_chip_edit_test.exs
new file mode 100644
index 00000000..a79dc675
--- /dev/null
+++ b/test/mv_web/member_live/index_chip_edit_test.exs
@@ -0,0 +1,91 @@
+defmodule MvWeb.MemberLive.IndexChipEditTest do
+  @moduledoc """
+  §1.18 — clicking an applied-filter chip body re-opens that filter's value
+  control pre-filled with the current value; a changed selection re-commits and
+  updates the chip; the × still removes the filter.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Membership.Group
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, member} =
+      Mv.Membership.create_member(
+        %{first_name: "Edit", last_name: "Member", email: "edit@example.com"},
+        actor: actor
+      )
+
+    {:ok, group} =
+      Group |> Ash.Changeset.for_create(:create, %{name: "Board"}) |> Ash.create(actor: actor)
+
+    {:ok, _mg} =
+      Mv.Membership.create_member_group(%{member_id: member.id, group_id: group.id}, actor: actor)
+
+    %{conn: conn_with_oidc_user(conn), group: group}
+  end
+
+  test "clicking the chip body opens the value control pre-filled with the current value", %{
+    conn: conn,
+    group: group
+  } do
+    {:ok, view, _html} = live(conn, "/members?group_#{group.id}=in")
+
+    refute has_element?(view, "[data-testid='value-control-group']")
+
+    view |> element("[data-testid='filter-chip-edit']") |> render_click()
+
+    # The group control opens with this group's "is" (in) operator pre-selected.
+    assert has_element?(view, "[data-testid='value-control-group']")
+    assert has_element?(view, "input[name='group_#{group.id}'][value='in'][checked]")
+  end
+
+  test "the value control opens anchored under the edited chip, not as a new pending chip", %{
+    conn: conn,
+    group: group
+  } do
+    {:ok, view, _html} = live(conn, "/members?group_#{group.id}=in")
+
+    view |> element("[data-testid='filter-chip-edit']") |> render_click()
+
+    # §1.18: the control is a descendant of the chip's own list item (anchored in
+    # place under that chip), and no separate pending chip is spun up at the row.
+    assert has_element?(
+             view,
+             "[data-testid='filter-chip-item'] [data-testid='value-control-group']"
+           )
+
+    refute has_element?(view, "[data-testid='pending-chip']")
+    refute has_element?(view, "[data-testid='pending-filter']")
+  end
+
+  test "changing the value from the re-opened control re-commits and updates the URL", %{
+    conn: conn,
+    group: group
+  } do
+    {:ok, view, _html} = live(conn, "/members?group_#{group.id}=in")
+
+    view |> element("[data-testid='filter-chip-edit']") |> render_click()
+
+    view
+    |> element("[data-testid='value-control-group']")
+    |> render_change(%{"group_#{group.id}" => "not_in"})
+
+    _ = render(view)
+    path = assert_patch(view)
+    assert path =~ "group_#{group.id}=not_in"
+  end
+
+  test "the × still removes the filter", %{conn: conn, group: group} do
+    {:ok, view, _html} = live(conn, "/members?group_#{group.id}=in")
+
+    view |> element("[data-testid='filter-chip-remove']") |> render_click()
+
+    path = assert_patch(view)
+    refute path =~ "group_#{group.id}"
+    refute has_element?(view, "[data-testid='filter-chip']")
+  end
+end
diff --git a/test/mv_web/member_live/index_date_range_test.exs b/test/mv_web/member_live/index_date_range_test.exs
new file mode 100644
index 00000000..30df18f4
--- /dev/null
+++ b/test/mv_web/member_live/index_date_range_test.exs
@@ -0,0 +1,74 @@
+defmodule MvWeb.MemberLive.IndexDateRangeTest do
+  @moduledoc """
+  §1.25 / §3.12 (native-first) — the date-range value control combines the
+  relative presets with a separate "Eigener Zeitraum" (custom range) paragraph
+  holding two native `<input type="date">` fields (Von/Bis). cally is removed.
+
+  Picking a preset commits a concrete range; typing into the native Von/Bis
+  inputs commits the custom range through the shared date-filter dispatch.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, _member} =
+      Mv.Membership.create_member(
+        %{first_name: "Range", last_name: "Member", email: "range@example.com"},
+        actor: actor
+      )
+
+    %{conn: conn_with_oidc_user(conn)}
+  end
+
+  test "the join-date control shows presets and native Von/Bis date inputs", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "join_date")
+
+    assert has_element?(view, "[data-testid='value-control-date-range']")
+    assert has_element?(view, "[data-testid='date-presets']")
+    # Separate "Eigener Zeitraum" paragraph with two native date inputs side by side.
+    assert has_element?(view, "[data-testid='custom-range']")
+    assert has_element?(view, "[data-testid='custom-range'] input[type='date'][name='jd_from']")
+    assert has_element?(view, "[data-testid='custom-range'] input[type='date'][name='jd_to']")
+  end
+
+  test "cally is fully removed from the date-range control", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "join_date")
+
+    refute has_element?(view, "[data-testid='date-range-cally']")
+    refute has_element?(view, "calendar-range")
+    refute has_element?(view, "[phx-hook='DateRangeCally']")
+  end
+
+  test "picking a preset commits a concrete range to the URL", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "join_date")
+    view |> element("[data-testid='date-preset-this_year']") |> render_click()
+
+    path = assert_patch(view)
+    today = Date.utc_today()
+    assert path =~ "jd_from=#{today.year}-01-01"
+    assert path =~ "jd_to=#{Date.to_iso8601(today)}"
+  end
+
+  test "typing a native custom range commits it to the URL", %{conn: conn} do
+    {:ok, view, _html} = live(conn, ~p"/members")
+
+    pick_field(view, "join_date")
+
+    view
+    |> element("[data-testid='value-control-date-range']")
+    |> render_change(%{"jd_from" => "2024-03-01", "jd_to" => "2024-03-31"})
+
+    path = assert_patch(view)
+    assert path =~ "jd_from=2024-03-01"
+    assert path =~ "jd_to=2024-03-31"
+  end
+end
diff --git a/test/mv_web/member_live/index_filter_row_test.exs b/test/mv_web/member_live/index_filter_row_test.exs
new file mode 100644
index 00000000..a4593465
--- /dev/null
+++ b/test/mv_web/member_live/index_filter_row_test.exs
@@ -0,0 +1,48 @@
+defmodule MvWeb.MemberLive.IndexFilterRowTest do
+  @moduledoc """
+  §1.19 — the filter row renders "+ Add filter", the applied-filter chips and
+  "Clear all" as one uniform button size (all share the `btn-sm` sizing), and
+  each chip is composed of real, focusable buttons.
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Membership.Group
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, member} =
+      Mv.Membership.create_member(
+        %{first_name: "Row", last_name: "Member", email: "row@example.com"},
+        actor: actor
+      )
+
+    {:ok, group} =
+      Group |> Ash.Changeset.for_create(:create, %{name: "Board"}) |> Ash.create(actor: actor)
+
+    {:ok, _mg} =
+      Mv.Membership.create_member_group(%{member_id: member.id, group_id: group.id}, actor: actor)
+
+    %{conn: conn_with_oidc_user(conn), group: group}
+  end
+
+  test "add-filter trigger, chips and clear-all share the uniform btn-sm size", %{
+    conn: conn,
+    group: group
+  } do
+    {:ok, view, _html} = live(conn, "/members?group_#{group.id}=in")
+
+    assert has_element?(view, "[data-testid='add-filter-trigger'].btn-sm")
+    assert has_element?(view, "[data-testid='clear-all-filters'].btn-sm")
+    # The chip body and its remove control are real, focusable buttons at btn-sm.
+    assert has_element?(view, "button[data-testid='filter-chip-edit'].btn-sm")
+    assert has_element?(view, "button[data-testid='filter-chip-remove'].btn-sm")
+
+    # The join seam must be a single hairline: the remove button drops its own
+    # left border so the body's right border is the only one at the seam (no
+    # doubled 1px border that sub-pixel-rounds to 1px/2px and flips on zoom).
+    assert has_element?(view, "button[data-testid='filter-chip-remove'].border-l-0")
+  end
+end
diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index 4dd92c73..ae6e5657 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -57,7 +57,7 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
       assert html =~ "Paid"
     end
 
-    test "the badge is a focusable control that drills into the member fees history", %{
+    test "the badge is a real navigation link that drills into the member fees history", %{
       conn: conn
     } do
       fee_type = create_fee_type(%{interval: :yearly})
@@ -66,13 +66,33 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
 
       {:ok, view, _html} = live(conn, "/members")
 
-      assert has_element?(
-               view,
-               "button[data-testid='payment-badge']##{"payment-badge-#{member.id}"}"
-             )
+      badge = "a[data-testid='payment-badge']#payment-badge-#{member.id}"
+      href = "/members/#{member.id}?tab=membership_fees"
 
-      # A tooltip popover lists the open cycles for the period.
-      assert has_element?(view, "##{"payment-tip-#{member.id}"}[popover]")
+      # A semantic <a> navigating to the member's membership-fees section — not a
+      # div with JS.navigate — so it is keyboard- and right-click-friendly.
+      assert has_element?(view, "#{badge}[href='#{href}']")
+
+      # Its hover/focus tooltip is a top-layer native Popover opened via the
+      # HoverPopover hook (no SortTooltip id-linking on the badge anymore).
+      assert has_element?(view, "#{badge}[phx-hook='HoverPopover']")
+      assert has_element?(view, "#{badge}[data-popover-target='payment-tip-#{member.id}']")
+      refute has_element?(view, "[data-testid='payment-badge'][data-tooltip-id]")
+
+      # The tooltip popover lists the open cycles for the period.
+      assert has_element?(view, "#payment-tip-#{member.id}[popover]")
+    end
+
+    test "a fully-paid member renders the badge but no tooltip popover", %{conn: conn} do
+      fee_type = create_fee_type(%{interval: :yearly})
+      member = create_member(%{first_name: "Clean", membership_fee_type_id: fee_type.id})
+      create_cycle(member, fee_type, %{cycle_start: ~D[2023-01-01], status: :paid})
+
+      {:ok, view, _html} = live(conn, "/members")
+
+      assert has_element?(view, "a[data-testid='payment-badge']#payment-badge-#{member.id}")
+      refute has_element?(view, "#payment-tip-#{member.id}")
+      refute has_element?(view, "a#payment-badge-#{member.id}[phx-hook]")
     end
 
     test "members without cycles render without error", %{conn: conn} do
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
index 5f1977ac..be256316 100644
--- a/test/mv_web/member_live/index_payment_period_test.exs
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -75,6 +75,20 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
       tip = PaymentAging.period_tooltip(%{from: nil, to: nil})
       assert is_binary(tip) and tip =~ "outstanding"
     end
+
+    test "explains that the values refer to the filtered contribution period" do
+      # The header badge falls back to a plain "filtered" label whenever no
+      # compact short code fits (arbitrary or open-ended ranges); its tooltip
+      # must spell out what "filtered" means, not just repeat the range.
+      for period <- [
+            %{from: nil, to: nil},
+            %{from: ~D[2026-02-03], to: ~D[2026-08-17]},
+            %{from: ~D[2026-01-01], to: nil}
+          ] do
+        tip = PaymentAging.period_tooltip(period)
+        assert tip =~ "refer to the filtered contribution period"
+      end
+    end
   end
 
   describe "payment-count filter codec" do
diff --git a/test/mv_web/member_live/index_payment_wiring_test.exs b/test/mv_web/member_live/index_payment_wiring_test.exs
index 8c7b0547..1186cbbd 100644
--- a/test/mv_web/member_live/index_payment_wiring_test.exs
+++ b/test/mv_web/member_live/index_payment_wiring_test.exs
@@ -88,6 +88,7 @@ defmodule MvWeb.MemberLive.IndexPaymentWiringTest do
       badge = view |> element("[data-testid='payment-period-badge']") |> render()
       assert badge =~ "03.02.2026"
       assert badge =~ "17.08.2026"
+      assert badge =~ "refer to the filtered contribution period"
     end
   end
 end
diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index d8946529..3e3b3d3a 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -1411,9 +1411,9 @@ defmodule MvWeb.MemberLive.IndexTest do
         )
 
       # Both filters are reflected as chips: the boolean field at "Yes" and the
-      # period-scoped payment filter as "Fully paid".
+      # period-scoped payment filter as "All paid".
       assert boolean_chip?(view, boolean_field, "Yes")
-      assert render(view) =~ "Fully paid"
+      assert render(view) =~ "All paid"
 
       # Both should be in URL when triggering search
       view
diff --git a/test/mv_web/member_live/index_value_control_test.exs b/test/mv_web/member_live/index_value_control_test.exs
new file mode 100644
index 00000000..4c92b948
--- /dev/null
+++ b/test/mv_web/member_live/index_value_control_test.exs
@@ -0,0 +1,257 @@
+defmodule MvWeb.MemberLive.IndexValueControlTest do
+  @moduledoc """
+  §1.20 / §1.21 / §1.22 / §1.23 — the reworked value controls of the add-filter
+  builder:
+
+    * no "All"/"Alle" option in the boolean / group value controls (§1.20);
+    * the field picker's search input is a live type-ahead (§1.21);
+    * the payment control reveals a two-sided open-cycle count range under
+      "Has unpaid" and offers a suspended-status option (§1.22, §1.23).
+  """
+  use MvWeb.ConnCase, async: false
+
+  import Phoenix.LiveViewTest
+
+  alias Mv.Membership.CustomField
+  alias Mv.Membership.Group
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, _member} =
+      Mv.Membership.create_member(
+        %{first_name: "Val", last_name: "Member", email: "val@example.com"},
+        actor: actor
+      )
+
+    {:ok, group} =
+      Group |> Ash.Changeset.for_create(:create, %{name: "Board"}) |> Ash.create(actor: actor)
+
+    {:ok, field} =
+      CustomField
+      |> Ash.Changeset.for_create(:create, %{
+        name: "newsletter_#{System.unique_integer([:positive])}",
+        value_type: :boolean,
+        show_in_overview: true
+      })
+      |> Ash.create(actor: actor)
+
+    %{conn: conn_with_oidc_user(conn), group: group, field: field}
+  end
+
+  describe "unified popover shell (§3.11)" do
+    test "every value control shares the 'Filter: <field>' shell title", %{
+      conn: conn,
+      field: field
+    } do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "group")
+      assert has_element?(view, "[data-testid='control-title']", "Filter:")
+
+      pick_field(view, field.id)
+      assert has_element?(view, "[data-testid='control-title']", "Filter:")
+
+      pick_field(view, "payment")
+      assert has_element?(view, "[data-testid='control-title']", "Filter:")
+    end
+  end
+
+  describe "no All option (§1.20)" do
+    test "the group control offers is / is-not but no 'all' option", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "group")
+
+      assert has_element?(view, "[data-testid='value-control-group'] input[value='in']")
+      assert has_element?(view, "[data-testid='value-control-group'] input[value='not_in']")
+      refute has_element?(view, "[data-testid='value-control-group'] input[value='all']")
+    end
+
+    test "the group operator uses the boolean-consistent Ja/Nein check/x toggle", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "group")
+
+      # Same join-toggle presentation as the boolean custom-field control: a
+      # check icon on the ":in" (Ja) option and an x-mark on ":not_in" (Nein),
+      # with a visible selected state.
+      assert has_element?(view, "[data-testid='value-control-group'] .join .hero-check-circle")
+      assert has_element?(view, "[data-testid='value-control-group'] .join .hero-x-circle")
+
+      assert has_element?(
+               view,
+               "[data-testid='value-control-group'] label.has-\\[\\:checked\\]\\:btn-primary"
+             )
+    end
+
+    test "the fee-type operator uses the boolean-consistent Ja/Nein check/x toggle", %{conn: conn} do
+      _fee_type = Mv.Fixtures.create_fee_type()
+
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "fee_type")
+
+      assert has_element?(view, "[data-testid='value-control-fee-type'] .join .hero-check-circle")
+      assert has_element?(view, "[data-testid='value-control-fee-type'] .join .hero-x-circle")
+    end
+
+    test "the boolean control offers Yes / No but no 'all' option", %{conn: conn, field: field} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, field.id)
+
+      assert has_element?(view, "[data-testid='value-control-boolean'] input[value='true']")
+      assert has_element?(view, "[data-testid='value-control-boolean'] input[value='false']")
+      refute has_element?(view, "[data-testid='value-control-boolean'] input[value='all']")
+    end
+
+    test "the boolean control renders a check-icon Yes and an x-icon No join toggle", %{
+      conn: conn,
+      field: field
+    } do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, field.id)
+
+      # Join-toggle with a check icon on Yes and an x-mark icon on No (Task 5).
+      assert has_element?(view, "[data-testid='value-control-boolean'] .join .hero-check-circle")
+      assert has_element?(view, "[data-testid='value-control-boolean'] .join .hero-x-circle")
+      # A checked option shows a visible selected state (btn-primary via has-[:checked]).
+      assert has_element?(
+               view,
+               "[data-testid='value-control-boolean'] label.has-\\[\\:checked\\]\\:btn-primary"
+             )
+    end
+  end
+
+  describe "field picker search (§1.21)" do
+    test "the search input is a live type-ahead hook and narrows the field list", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      open_picker(view)
+
+      assert has_element?(view, "[data-testid='field-combobox'][phx-hook='FilterComboboxSearch']")
+      # The search input must live inside a form carrying the change binding —
+      # LiveView rejects `phx-change` on an input that is not inside a <form>
+      # ("form events require the input to be inside a form"), which silently
+      # broke the live filtering in the browser (§1.21).
+      assert has_element?(view, "form[phx-change='filter_fields'] [data-testid='field-combobox']")
+
+      # A non-matching query removes the Group option from the listbox.
+      view
+      |> form("[data-testid='field-search-form']", %{"picker_query" => "zzzznomatch"})
+      |> render_change()
+
+      refute has_element?(view, "#member-filter-field-opt-group")
+    end
+  end
+
+  describe "payment status labels" do
+    test "the toggle reads 'All paid' / 'Open contributions'", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "payment")
+
+      assert has_element?(view, "[data-testid='value-control-payment']", "All paid")
+      assert has_element?(view, "[data-testid='value-control-payment']", "Open contributions")
+      refute has_element?(view, "[data-testid='value-control-payment']", "Fully paid")
+      refute has_element?(view, "[data-testid='value-control-payment']", "Has unpaid")
+    end
+
+    test "the applied fully-paid chip reads 'All paid'", %{conn: conn} do
+      {:ok, view, _html} = live(conn, "/members?pay_filter=fully_paid")
+
+      assert has_element?(view, "[data-testid='filter-chip']", "All paid")
+      refute render(view) =~ "Fully paid"
+    end
+  end
+
+  describe "payment control (§1.22, §1.23)" do
+    test "'Has unpaid' reveals the two-sided open-cycle count range", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "payment")
+      refute has_element?(view, "[data-testid='payment-count-range']")
+
+      view
+      |> element("[data-testid='value-control-payment']")
+      |> render_change(%{
+        "__payment" => "1",
+        "pay" => "has_unpaid",
+        "pay_min" => "1",
+        "pay_max" => ""
+      })
+
+      _ = render(view)
+      assert_patch(view)
+
+      assert has_element?(view, "[data-testid='payment-count-range'] input[name='pay_min']")
+      assert has_element?(view, "[data-testid='payment-count-range'] input[name='pay_max']")
+    end
+
+    test "the suspended option activates the suspended-status filter in the URL", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "payment")
+      assert has_element?(view, "[data-testid='payment-suspended'] input[name='suspended']")
+
+      view
+      |> element("[data-testid='value-control-payment']")
+      |> render_change(%{"__payment" => "1", "suspended" => "1"})
+
+      _ = render(view)
+      path = assert_patch(view)
+      assert path =~ "suspended=1"
+    end
+  end
+
+  describe "unified date-range controls" do
+    # Every date-range value control (payment period, join date, exit date, and
+    # custom date fields) renders the same shared native Von/Bis row: a
+    # non-wrapping flex row whose two `<input type="date">` are each wrapped in
+    # `min-w-0 flex-1` so they share width equally and stay on one line.
+    test "payment period, join, exit and custom date all render the shared row", %{conn: conn} do
+      actor = Mv.Helpers.SystemActor.get_system_actor()
+
+      {:ok, date_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{
+          name: "birthday_#{System.unique_integer([:positive])}",
+          value_type: :date,
+          show_in_overview: true
+        })
+        |> Ash.create(actor: actor)
+
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      assert_shared_range(view, "payment", "payment-period-range", "pay_from", "pay_to")
+      assert_shared_range(view, "join_date", "custom-range", "jd_from", "jd_to")
+      assert_shared_range(view, "active_former", "exit-custom-range", "ed_from", "ed_to")
+
+      cd_from = "cdf_#{date_field.id}_from"
+      cd_to = "cdf_#{date_field.id}_to"
+      assert_shared_range(view, date_field.id, "custom-range", cd_from, cd_to)
+    end
+  end
+
+  # Opens the given field's value control and asserts its date-range row is the
+  # shared native Von/Bis layout: a `flex` (non-wrapping) row whose two date
+  # inputs are each wrapped in `min-w-0 flex-1` (equal width, single line).
+  defp assert_shared_range(view, field, testid, from_name, to_name) do
+    pick_field(view, field)
+
+    assert has_element?(view, "[data-testid='#{testid}'].flex")
+    refute has_element?(view, "[data-testid='#{testid}'].flex-wrap")
+
+    assert has_element?(
+             view,
+             "[data-testid='#{testid}'] .min-w-0.flex-1 input[type='date'][name='#{from_name}']"
+           )
+
+    assert has_element?(
+             view,
+             "[data-testid='#{testid}'] .min-w-0.flex-1 input[type='date'][name='#{to_name}']"
+           )
+  end
+end
diff --git a/test/support/filter_builder_helpers.ex b/test/support/filter_builder_helpers.ex
index 54a88953..6e851c48 100644
--- a/test/support/filter_builder_helpers.ex
+++ b/test/support/filter_builder_helpers.ex
@@ -60,16 +60,23 @@ defmodule MvWeb.FilterBuilderHelpers do
   end
 
   @doc """
-  Applies a payment-count filter (and optionally a period) through the builder.
-  `filter` is one of `"all"`, `"fully_paid"`, `"unpaid_1"`, `"unpaid_2"`,
-  `"unpaid_3"`; `from`/`to` are ISO-8601 strings or `""`.
+  Applies a payment status filter (and optionally a period) through the builder.
+  `status` is `"fully_paid"` or `"has_unpaid"`; `from`/`to` are ISO-8601 strings
+  or `""`. For `"has_unpaid"` the open-cycle range defaults to `min` 1 / no max.
   """
-  def apply_payment_filter(view, filter, from \\ "", to \\ "") do
+  def apply_payment_filter(view, status, from \\ "", to \\ "", min \\ "1", max \\ "") do
     pick_field(view, "payment")
 
     view
     |> element("[data-testid='value-control-payment']")
-    |> render_change(%{"pay" => filter, "pay_from" => from, "pay_to" => to})
+    |> render_change(%{
+      "__payment" => "1",
+      "pay" => status,
+      "pay_min" => min,
+      "pay_max" => max,
+      "pay_from" => from,
+      "pay_to" => to
+    })
 
     flush_and_patch(view)
   end

From ce877463d6b872a4c3ef363deda800facb24b9f0 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:15 +0200
Subject: [PATCH 25/30] fix(overview): make filter-builder toggles
 keyboard-operable

---
 .../add_filter_builder_component.ex           | 13 ++++++---
 .../index_add_filter_flow_test.exs            | 27 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/lib/mv_web/live/components/add_filter_builder_component.ex b/lib/mv_web/live/components/add_filter_builder_component.ex
index ccafd01e..fc1ee34b 100644
--- a/lib/mv_web/live/components/add_filter_builder_component.ex
+++ b/lib/mv_web/live/components/add_filter_builder_component.ex
@@ -1190,13 +1190,20 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   slot :inner_block, required: true
 
   # Shared two-state join toggle used by the boolean and is/is-not controls
-  # (Task 5): a `join-item` button label wrapping a hidden radio, with a visible
+  # (Task 5): a `join-item` button label wrapping a native radio, with a visible
   # selected state (`btn-primary` when the radio is checked) and an optional
   # leading icon. Consistent look across every two-state selector.
+  #
+  # The radio is `sr-only` (visually hidden) rather than `hidden`/`display:none`
+  # so it stays keyboard-focusable and in the tab order: Tab reaches the group,
+  # native same-`name` radio semantics move the selection with the arrow keys
+  # (WCAG 2.1.1). `has-[:focus-visible]:*` surfaces a visible ring on the styled
+  # label while its input has keyboard focus (WCAG 2.4.7); `z-10` lifts the
+  # focused item so the ring is not clipped by adjacent join-items.
   defp toggle_option(assigns) do
     ~H"""
-    <label class="join-item btn btn-sm gap-1 has-[:checked]:btn-primary">
-      <input type="radio" name={@name} value={@value} class="hidden" checked={@checked} />
+    <label class="join-item btn btn-sm gap-1 has-[:checked]:btn-primary has-[:focus-visible]:z-10 has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-offset-2 has-[:focus-visible]:ring-offset-base-100 has-[:focus-visible]:ring-base-content/60">
+      <input type="radio" name={@name} value={@value} class="sr-only" checked={@checked} />
       <.icon :if={@icon} name={@icon} class="size-3.5" />
       {render_slot(@inner_block)}
     </label>
diff --git a/test/mv_web/member_live/index_add_filter_flow_test.exs b/test/mv_web/member_live/index_add_filter_flow_test.exs
index acee2755..d52bd32c 100644
--- a/test/mv_web/member_live/index_add_filter_flow_test.exs
+++ b/test/mv_web/member_live/index_add_filter_flow_test.exs
@@ -82,6 +82,33 @@ defmodule MvWeb.MemberLive.IndexAddFilterFlowTest do
     refute has_element?(view, "[data-testid='filter-chip']")
   end
 
+  describe "§3.7 join-toggles are keyboard-operable (WCAG 2.1.1 / 2.4.7)" do
+    test "the shared toggle radios are focusable (not display:none) with a visible focus ring",
+         %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/members")
+
+      pick_field(view, "group")
+
+      scope = "[data-testid='value-control-group']"
+
+      assert has_element?(view, "#{scope} input[type='radio']"),
+             "expected the join-toggle to render native radio inputs"
+
+      # A `hidden`/`display:none` (or negative-tabindex) input is skipped by Tab
+      # and cannot be reached with the keyboard — the WCAG 2.1.1 failure.
+      refute has_element?(view, "#{scope} input[type='radio'].hidden"),
+             "toggle radio must not be display:none-hidden (keyboard-unreachable)"
+
+      refute has_element?(view, "#{scope} input[type='radio'][tabindex='-1']"),
+             "toggle radio must stay in the natural tab order (no tabindex=-1)"
+
+      # WCAG 2.4.7: the styled label must surface a visible focus indicator when
+      # its (visually-hidden) input is keyboard-focused.
+      assert render(element(view, scope)) =~ "focus-visible",
+             "toggle label must carry a :focus-visible ring indicator"
+    end
+  end
+
   defp refute_patched(view) do
     assert_raise ArgumentError, fn -> assert_patch(view, 50) end
   end

From 0acd12360f297456a8e8608d1913105b389f8454 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:16 +0200
Subject: [PATCH 26/30] refactor(overview): use English identifier as_of_date
 for point-in-time filter

---
 lib/mv/constants.ex                           | 10 ++--
 .../add_filter_builder_component.ex           | 46 +++++++++----------
 lib/mv_web/live/member_live/index.ex          | 38 +++++++--------
 lib/mv_web/live/member_live/index.html.heex   |  2 +-
 .../live/member_live/index/as_of_date.ex      | 37 +++++++++++++++
 .../live/member_live/index/overview_query.ex  | 10 ++--
 lib/mv_web/live/member_live/index/stichtag.ex | 36 ---------------
 .../member_live/index_active_former_test.exs  | 16 +++----
 ...exs => index_as_of_date_property_test.exs} |  8 ++--
 .../index_filter_url_roundtrip_test.exs       |  8 ++--
 .../index_status_params_codec_test.exs        | 14 +++---
 11 files changed, 113 insertions(+), 112 deletions(-)
 create mode 100644 lib/mv_web/live/member_live/index/as_of_date.ex
 delete mode 100644 lib/mv_web/live/member_live/index/stichtag.ex
 rename test/mv_web/member_live/{index_stichtag_property_test.exs => index_as_of_date_property_test.exs} (92%)

diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex
index f60f77ad..a0607078 100644
--- a/lib/mv/constants.ex
+++ b/lib/mv/constants.ex
@@ -50,7 +50,7 @@ defmodule Mv.Constants do
 
   @suspended_param "suspended"
 
-  @stichtag_param "stichtag"
+  @as_of_date_param "as_of_date"
 
   @max_boolean_filters 50
 
@@ -240,16 +240,16 @@ defmodule Mv.Constants do
   def suspended_param, do: @suspended_param
 
   @doc """
-  Returns the URL parameter name for the point-in-time membership ("Stichtag")
+  Returns the URL parameter name for the point-in-time "active on X" membership
   filter: keeps members who were active on the given ISO-8601 date X, i.e.
   `join_date <= X and (exit_date is nil or exit_date > X)`.
 
   ## Examples
 
-      iex> Mv.Constants.stichtag_param()
-      "stichtag"
+      iex> Mv.Constants.as_of_date_param()
+      "as_of_date"
   """
-  def stichtag_param, do: @stichtag_param
+  def as_of_date_param, do: @as_of_date_param
 
   @doc """
   Returns the maximum number of boolean custom field filters allowed per request.
diff --git a/lib/mv_web/live/components/add_filter_builder_component.ex b/lib/mv_web/live/components/add_filter_builder_component.ex
index fc1ee34b..4cc2c619 100644
--- a/lib/mv_web/live/components/add_filter_builder_component.ex
+++ b/lib/mv_web/live/components/add_filter_builder_component.ex
@@ -35,7 +35,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     * `{:payment_filter_changed, nil | :fully_paid | {:has_unpaid, 1..3} | {:unpaid_range, pos_integer(), pos_integer() | nil}}`
     * `{:payment_period_changed, %{from: Date.t() | nil, to: Date.t() | nil}}`
     * `{:suspended_changed, boolean()}`
-    * `{:stichtag_changed, Date.t() | nil}`
+    * `{:as_of_date_changed, Date.t() | nil}`
 
   and `{:clear_all_filters}` for Clear all.
   """
@@ -91,7 +91,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     |> assign(:payment_filter, assigns[:payment_filter])
     |> assign(:payment_period, assigns[:payment_period] || PaymentAging.default_period())
     |> assign(:suspended, assigns[:suspended] || false)
-    |> assign(:stichtag, assigns[:stichtag])
+    |> assign(:as_of_date, assigns[:as_of_date])
   end
 
   # --------------------------------------------------------------------------
@@ -461,23 +461,23 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
         </fieldset>
 
         <%!-- Separate paragraph (not part of the Active/Former button-join): the
-        point-in-time "active on X" Stichtag filter (§1.24). --%>
-        <div class="flex flex-col gap-1" data-testid="stichtag-paragraph">
+        point-in-time "active on X" as-of-date filter (§1.24). --%>
+        <div class="flex flex-col gap-1" data-testid="as-of-date-paragraph">
           <.input
             type="date"
-            name="stichtag"
+            name="as_of_date"
             label={gettext("Active on reference date")}
             class="input input-sm input-bordered"
-            value={date_iso(@stichtag)}
-            data-testid="stichtag-input"
+            value={date_iso(@as_of_date)}
+            data-testid="as-of-date-input"
           />
         </div>
       </form>
 
-      <%!-- Third paragraph "Eigener Zeitraum": the same native From/To range the
+      <%!-- Third paragraph, a custom range: the same native From/To range the
         join-date builder uses, wired to the exit_date custom mode — members whose
         exit date falls within [from, to] (§1.24). A sibling form (not the
-        quick/Stichtag one) so committing a bound only touches the exit_date
+        quick/as-of-date one) so committing a bound only touches the exit_date
         slice and never re-reads the quick radios. --%>
       <form
         phx-change="commit"
@@ -614,7 +614,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
         {local_range(@from_val, @to_val)}
       </p>
 
-      <%!-- Separate "Eigener Zeitraum" paragraph: two native <input type="date">
+      <%!-- Separate custom-range paragraph: two native <input type="date">
       controls side by side (§3.12 native-first — no cally). Committing a bound
       through the shared date dispatch applies the custom range; the browser's
       own date popup gives year-jump, manual entry and WCAG a11y for free. --%>
@@ -722,7 +722,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   def handle_event("commit", params, socket) do
     dispatch_payment(socket, params)
     dispatch_quick(socket, params)
-    dispatch_stichtag(socket, params)
+    dispatch_as_of_date(socket, params)
     dispatch_exit_range(socket, params)
 
     dispatch_prefix(
@@ -824,14 +824,14 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
     end
   end
 
-  defp dispatch_stichtag(socket, params) do
-    if Map.has_key?(params, "stichtag") do
-      date = parse_date(Map.get(params, "stichtag"))
-      maybe_send(date != socket.assigns.stichtag, {:stichtag_changed, date})
+  defp dispatch_as_of_date(socket, params) do
+    if Map.has_key?(params, "as_of_date") do
+      date = parse_date(Map.get(params, "as_of_date"))
+      maybe_send(date != socket.assigns.as_of_date, {:as_of_date_changed, date})
     end
   end
 
-  # The exit-date "Eigener Zeitraum" range writes only the exit_date slice
+  # The exit-date custom range writes only the exit_date slice
   # (mode :custom + bounds), preserving join_date and custom-date entries — so
   # editing the exit range never wipes another active date filter. Committing an
   # empty range simply parks exit_date in :custom with nil bounds (no chip, no
@@ -917,7 +917,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   end
 
   defp remove_chip("suspended", _id, _socket), do: send(self(), {:suspended_changed, false})
-  defp remove_chip("stichtag", _id, _socket), do: send(self(), {:stichtag_changed, nil})
+  defp remove_chip("as_of_date", _id, _socket), do: send(self(), {:as_of_date_changed, nil})
 
   defp remove_chip("group", id, _socket), do: send(self(), {:group_filter_changed, id, nil})
   defp remove_chip("fee_type", id, _socket), do: send(self(), {:fee_type_filter_changed, id, nil})
@@ -947,7 +947,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
       fee_type_chips(assigns) ++
       boolean_chips(assigns) ++
       date_chips(assigns) ++
-      stichtag_chip(assigns) ++
+      as_of_date_chip(assigns) ++
       payment_chips(assigns) ++
       suspended_chip(assigns)
   end
@@ -1117,18 +1117,18 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
 
   defp suspended_chip(_), do: []
 
-  defp stichtag_chip(%{stichtag: %Date{} = date}) do
+  defp as_of_date_chip(%{as_of_date: %Date{} = date}) do
     [
       %{
-        kind: "stichtag",
-        id: "stichtag",
+        kind: "as_of_date",
+        id: "as_of_date",
         edit_key: "active_former",
         label: gettext("Active on %{date}", date: DateFormatter.format_date(date))
       }
     ]
   end
 
-  defp stichtag_chip(_), do: []
+  defp as_of_date_chip(_), do: []
 
   defp unpaid_range_label(min, nil) when min <= 1, do: gettext("Open contributions")
   defp unpaid_range_label(min, nil), do: gettext("≥ %{n} unpaid", n: min)
@@ -1235,7 +1235,7 @@ defmodule MvWeb.Components.AddFilterBuilderComponent do
   defp date_iso(_), do: nil
 
   # ISO string for a bound of the exit_date custom range, pre-filling the
-  # "Eigener Zeitraum" inputs only when the exit filter is actually in :custom
+  # custom-range inputs only when the exit filter is actually in :custom
   # mode (the quick active/former/all states carry no user range).
   defp exit_bound_iso(filters, bound) do
     case Map.get(filters, :exit_date, %{}) do
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 2173025f..af0214e7 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -49,6 +49,7 @@ defmodule MvWeb.MemberLive.Index do
   alias Mv.MembershipFees
   alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.DateFormatter
+  alias MvWeb.MemberLive.Index.AsOfDate
   alias MvWeb.MemberLive.Index.CustomFieldValueLookup
   alias MvWeb.MemberLive.Index.DateFilter
   alias MvWeb.MemberLive.Index.ExportPayload
@@ -59,7 +60,6 @@ defmodule MvWeb.MemberLive.Index do
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
   alias MvWeb.MemberLive.Index.OverviewQuery
   alias MvWeb.MemberLive.Index.PaymentAging
-  alias MvWeb.MemberLive.Index.Stichtag
   alias MvWeb.MemberLive.Index.ViewSettings
 
   require Ash.Query
@@ -179,7 +179,7 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:payment_filter, nil)
       |> assign(:payment_period, PaymentAging.default_period())
       |> assign(:suspended, false)
-      |> assign(:stichtag, nil)
+      |> assign(:as_of_date, nil)
       |> assign(:group_filters, %{})
       |> assign(:groups, groups)
       |> assign(:fee_type_filters, %{})
@@ -473,7 +473,7 @@ defmodule MvWeb.MemberLive.Index do
          payment_filter: nil,
          payment_period: PaymentAging.default_period(),
          suspended: false,
-         stichtag: nil,
+         as_of_date: nil,
          group_filters: %{},
          fee_type_filters: %{},
          boolean_filters: %{},
@@ -504,16 +504,16 @@ defmodule MvWeb.MemberLive.Index do
   end
 
   @impl true
-  def handle_info({:stichtag_changed, stichtag}, socket) do
+  def handle_info({:as_of_date_changed, as_of_date}, socket) do
     socket =
       socket
-      |> assign(:stichtag, stichtag)
+      |> assign(:as_of_date, as_of_date)
       |> load_members()
       |> scroll_list_to_top()
       |> update_selection_assigns()
 
     query_params =
-      build_query_params(opts_for_query_params(socket, %{stichtag: stichtag}))
+      build_query_params(opts_for_query_params(socket, %{as_of_date: as_of_date}))
       |> maybe_add_field_selection(
         socket.assigns[:user_field_selection],
         socket.assigns[:fields_in_url?] || false
@@ -638,7 +638,7 @@ defmodule MvWeb.MemberLive.Index do
       |> assign(:boolean_custom_field_filters, Map.get(opts, :boolean_filters, %{}))
       |> assign(:date_filters, Map.get(opts, :date_filters, DateFilter.default()))
       |> assign(:suspended, Map.get(opts, :suspended, false))
-      |> assign(:stichtag, Map.get(opts, :stichtag))
+      |> assign(:as_of_date, Map.get(opts, :as_of_date))
       |> load_members()
       |> scroll_list_to_top()
       |> update_selection_assigns()
@@ -727,7 +727,7 @@ defmodule MvWeb.MemberLive.Index do
       |> maybe_update_payment_filter(params)
       |> maybe_update_payment_period(params)
       |> maybe_update_suspended(params)
-      |> maybe_update_stichtag(params)
+      |> maybe_update_as_of_date(params)
       |> maybe_update_group_filters(params)
       |> maybe_update_fee_type_filters(params)
       |> maybe_update_boolean_filters(params)
@@ -778,7 +778,7 @@ defmodule MvWeb.MemberLive.Index do
       socket.assigns.payment_filter,
       socket.assigns.payment_period,
       socket.assigns[:suspended],
-      socket.assigns[:stichtag],
+      socket.assigns[:as_of_date],
       socket.assigns[:group_filters],
       socket.assigns[:fee_type_filters],
       socket.assigns.boolean_custom_field_filters,
@@ -934,17 +934,17 @@ defmodule MvWeb.MemberLive.Index do
     base_params = add_group_filters(base_params, opts.group_filters || %{})
     base_params = add_fee_type_filters(base_params, opts.fee_type_filters || %{})
     base_params = add_payment_params(base_params, opts.payment_filter, opts.payment_period)
-    base_params = add_status_params(base_params, opts[:suspended], opts[:stichtag])
+    base_params = add_status_params(base_params, opts[:suspended], opts[:as_of_date])
     base_params = add_boolean_filters(base_params, opts.boolean_filters || %{})
     add_date_filters(base_params, opts.date_filters)
   end
 
-  # Suspended-status flag and Stichtag date serialize additively into the flat
-  # URL contract (suspended=1 / stichtag=<iso>), omitted when inactive (§2.1).
-  defp add_status_params(params, suspended, stichtag) do
+  # Suspended-status flag and as-of date serialize additively into the flat
+  # URL contract (suspended=1 / as_of_date=<iso>), omitted when inactive (§2.1).
+  defp add_status_params(params, suspended, as_of_date) do
     params
     |> Map.merge(PaymentAging.suspended_to_params(suspended))
-    |> Map.merge(Stichtag.to_params(stichtag))
+    |> Map.merge(AsOfDate.to_params(as_of_date))
   end
 
   # Period-scoped payment model (§3.3): the payment-count filter and the active
@@ -967,7 +967,7 @@ defmodule MvWeb.MemberLive.Index do
       payment_filter: socket.assigns.payment_filter,
       payment_period: socket.assigns.payment_period,
       suspended: socket.assigns[:suspended] || false,
-      stichtag: socket.assigns[:stichtag],
+      as_of_date: socket.assigns[:as_of_date],
       group_filters: socket.assigns[:group_filters] || %{},
       boolean_filters: socket.assigns.boolean_custom_field_filters || %{},
       fee_type_filters: socket.assigns[:fee_type_filters] || %{},
@@ -1429,7 +1429,7 @@ defmodule MvWeb.MemberLive.Index do
       payment_filter: socket.assigns.payment_filter,
       payment_period: socket.assigns.payment_period,
       suspended: socket.assigns[:suspended] || false,
-      stichtag: socket.assigns[:stichtag],
+      as_of_date: socket.assigns[:as_of_date],
       sort_field: socket.assigns.sort_field,
       sort_order: socket.assigns.sort_order,
       custom_fields: socket.assigns.all_custom_fields
@@ -1644,14 +1644,14 @@ defmodule MvWeb.MemberLive.Index do
   defp maybe_update_payment_period(socket, params),
     do: assign(socket, :payment_period, PaymentAging.parse_period(params))
 
-  # Suspended-status filter (§1.23) and point-in-time Stichtag (§1.24/§2.6):
+  # Suspended-status filter (§1.23) and point-in-time as-of date (§1.24/§2.6):
   # both decoded straight from the URL so `handle_params` remains the single
   # source of truth. Absent params fall back to no filter.
   defp maybe_update_suspended(socket, params),
     do: assign(socket, :suspended, PaymentAging.parse_suspended(params))
 
-  defp maybe_update_stichtag(socket, params),
-    do: assign(socket, :stichtag, Stichtag.parse(params))
+  defp maybe_update_as_of_date(socket, params),
+    do: assign(socket, :as_of_date, AsOfDate.parse(params))
 
   defp maybe_update_group_filters(socket, params) when is_map(params) do
     prefix = @group_filter_prefix
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 2a060282..e1de0fff 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -64,7 +64,7 @@
       payment_filter={@payment_filter}
       payment_period={@payment_period}
       suspended={@suspended}
-      stichtag={@stichtag}
+      as_of_date={@as_of_date}
     />
   </div>
 
diff --git a/lib/mv_web/live/member_live/index/as_of_date.ex b/lib/mv_web/live/member_live/index/as_of_date.ex
new file mode 100644
index 00000000..6ec9d9a1
--- /dev/null
+++ b/lib/mv_web/live/member_live/index/as_of_date.ex
@@ -0,0 +1,37 @@
+defmodule MvWeb.MemberLive.Index.AsOfDate do
+  @moduledoc """
+  URL codec for the point-in-time "active on X" membership filter (§1.24/§2.6).
+
+  The as-of date is a single ISO-8601 date X carried in the flat URL contract
+  under the `as_of_date` key. When set, the overview keeps members who were
+  active on X (`join_date <= X and (exit_date is nil or exit_date > X)`); the
+  predicate itself lives in `OverviewQuery`. Absent or malformed values decode
+  to nil (no filter), and nil encodes to the empty map so a fresh URL stays
+  canonical.
+  """
+
+  @as_of_date_param Mv.Constants.as_of_date_param()
+
+  @doc """
+  Decodes the as-of date from a params map. Missing or malformed ISO-8601
+  values yield nil.
+  """
+  @spec parse(map()) :: Date.t() | nil
+  def parse(params) when is_map(params), do: parse_date(Map.get(params, @as_of_date_param))
+
+  @doc """
+  Encodes an as-of date into URL params. nil yields the empty map.
+  """
+  @spec to_params(Date.t() | nil) :: %{optional(String.t()) => String.t()}
+  def to_params(%Date{} = date), do: %{@as_of_date_param => Date.to_iso8601(date)}
+  def to_params(_), do: %{}
+
+  defp parse_date(value) when is_binary(value) do
+    case Date.from_iso8601(String.trim(value)) do
+      {:ok, date} -> date
+      _ -> nil
+    end
+  end
+
+  defp parse_date(_), do: nil
+end
diff --git a/lib/mv_web/live/member_live/index/overview_query.ex b/lib/mv_web/live/member_live/index/overview_query.ex
index dc125d65..fa5559ca 100644
--- a/lib/mv_web/live/member_live/index/overview_query.ex
+++ b/lib/mv_web/live/member_live/index/overview_query.ex
@@ -46,7 +46,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
       opts[:boolean_custom_fields]
     )
     |> apply_date_filters(opts[:date_filters])
-    |> apply_stichtag_filter(opts[:stichtag])
+    |> apply_as_of_date_filter(opts[:as_of_date])
     |> apply_custom_date_filters(opts[:date_filters], opts[:date_custom_fields])
     |> apply_payment_filter(opts[:payment_filter], payment_period(opts))
     |> apply_suspended_filter(opts[:suspended], payment_period(opts))
@@ -285,20 +285,20 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
   defp apply_custom_date_filters(query, _filters, _custom_fields), do: query
 
   # ---------------------------------------------------------------------------
-  # Point-in-time membership ("Stichtag"): a member counts as a member on the
+  # Point-in-time membership (as-of date): a member counts as a member on the
   # reference date X iff it had joined by X and had not yet left as of X
   # (§1.24/§2.6). "Left as of X" means a non-nil exit_date at or before X, so an
   # exit_date strictly after X (or nil) still counts as a member on X.
   # ---------------------------------------------------------------------------
 
-  defp apply_stichtag_filter(query, %Date{} = x) do
+  defp apply_as_of_date_filter(query, %Date{} = x) do
     Ash.Query.filter(
       query,
       expr(join_date <= ^x and (is_nil(exit_date) or exit_date > ^x))
     )
   end
 
-  defp apply_stichtag_filter(query, _), do: query
+  defp apply_as_of_date_filter(query, _), do: query
 
   # ---------------------------------------------------------------------------
   # Sort (always append the unique id tie-breaker for keyset stability)
@@ -327,7 +327,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
     ])
   end
 
-  # "Beiträge" (payment) column: sort DB-side by the period-scoped unpaid-cycle
+  # Fees (payment) column: sort DB-side by the period-scoped unpaid-cycle
   # count (§1.27). The count calculation takes the active period as arguments so
   # the sort key matches the displayed value; the id tie-breaker keeps keyset
   # pages stable across equal counts.
diff --git a/lib/mv_web/live/member_live/index/stichtag.ex b/lib/mv_web/live/member_live/index/stichtag.ex
deleted file mode 100644
index 647d609d..00000000
--- a/lib/mv_web/live/member_live/index/stichtag.ex
+++ /dev/null
@@ -1,36 +0,0 @@
-defmodule MvWeb.MemberLive.Index.Stichtag do
-  @moduledoc """
-  URL codec for the point-in-time membership ("Stichtag") filter (§1.24/§2.6).
-
-  The Stichtag is a single ISO-8601 date X carried in the flat URL contract
-  under the `stichtag` key. When set, the overview keeps members who were active
-  on X (`join_date <= X and (exit_date is nil or exit_date > X)`); the predicate
-  itself lives in `OverviewQuery`. Absent or malformed values decode to nil (no
-  filter), and nil encodes to the empty map so a fresh URL stays canonical.
-  """
-
-  @stichtag_param Mv.Constants.stichtag_param()
-
-  @doc """
-  Decodes the Stichtag date from a params map. Missing or malformed ISO-8601
-  values yield nil.
-  """
-  @spec parse(map()) :: Date.t() | nil
-  def parse(params) when is_map(params), do: parse_date(Map.get(params, @stichtag_param))
-
-  @doc """
-  Encodes a Stichtag date into URL params. nil yields the empty map.
-  """
-  @spec to_params(Date.t() | nil) :: %{optional(String.t()) => String.t()}
-  def to_params(%Date{} = date), do: %{@stichtag_param => Date.to_iso8601(date)}
-  def to_params(_), do: %{}
-
-  defp parse_date(value) when is_binary(value) do
-    case Date.from_iso8601(String.trim(value)) do
-      {:ok, date} -> date
-      _ -> nil
-    end
-  end
-
-  defp parse_date(_), do: nil
-end
diff --git a/test/mv_web/member_live/index_active_former_test.exs b/test/mv_web/member_live/index_active_former_test.exs
index 4bb2c731..e959643d 100644
--- a/test/mv_web/member_live/index_active_former_test.exs
+++ b/test/mv_web/member_live/index_active_former_test.exs
@@ -62,16 +62,16 @@ defmodule MvWeb.MemberLive.IndexActiveFormerTest do
     assert has_element?(view, "#row-#{ctx.former.id}")
   end
 
-  describe "Stichtag paragraph (§1.24)" do
+  describe "as-of-date paragraph (§1.24)" do
     test "the active/former control carries a separate 'active on reference date' input", ctx do
       {:ok, view, _html} = live(ctx.conn, ~p"/members")
 
       pick_field(view, "active_former")
 
-      # The Stichtag input sits in its own paragraph, not inside the
+      # The as-of-date input sits in its own paragraph, not inside the
       # Active/Former button-join.
-      assert has_element?(view, "[data-testid='stichtag-paragraph'] input[name='stichtag']")
-      refute has_element?(view, ".join input[name='stichtag']")
+      assert has_element?(view, "[data-testid='as-of-date-paragraph'] input[name='as_of_date']")
+      refute has_element?(view, ".join input[name='as_of_date']")
     end
 
     test "setting a reference date activates the point-in-time membership filter", ctx do
@@ -81,22 +81,22 @@ defmodule MvWeb.MemberLive.IndexActiveFormerTest do
 
       view
       |> element("[data-testid='value-control-active-former']")
-      |> render_change(%{"quick" => "active", "stichtag" => "2024-06-15"})
+      |> render_change(%{"quick" => "active", "as_of_date" => "2024-06-15"})
 
       _ = render(view)
       path = assert_patch(view)
-      assert path =~ "stichtag=2024-06-15"
+      assert path =~ "as_of_date=2024-06-15"
     end
   end
 
-  describe "Eigener Zeitraum exit-date range (§1.24)" do
+  describe "custom exit-date range (§1.24)" do
     test "the exit-date control carries a separate native From/To range paragraph", ctx do
       {:ok, view, _html} = live(ctx.conn, ~p"/members")
 
       pick_field(view, "active_former")
 
       # Third paragraph, same native two-input range control the join-date
-      # builder uses — separate from the Active/Former join and the Stichtag box.
+      # builder uses — separate from the Active/Former join and the as-of-date box.
       assert has_element?(view, "[data-testid='value-control-exit-range']")
 
       assert has_element?(
diff --git a/test/mv_web/member_live/index_stichtag_property_test.exs b/test/mv_web/member_live/index_as_of_date_property_test.exs
similarity index 92%
rename from test/mv_web/member_live/index_stichtag_property_test.exs
rename to test/mv_web/member_live/index_as_of_date_property_test.exs
index 017d08fb..a30fef52 100644
--- a/test/mv_web/member_live/index_stichtag_property_test.exs
+++ b/test/mv_web/member_live/index_as_of_date_property_test.exs
@@ -1,8 +1,8 @@
-defmodule MvWeb.MemberLive.IndexStichtagPropertyTest do
+defmodule MvWeb.MemberLive.IndexAsOfDatePropertyTest do
   @moduledoc """
   §2.6 — Point-in-time membership ("member on the reference date X").
 
-  For arbitrary (join_date, exit_date) pairs and reference dates X, the Stichtag
+  For arbitrary (join_date, exit_date) pairs and reference dates X, the as-of-date
   filter keeps a member iff `join_date <= X and (exit_date is nil or exit_date > X)`.
   Verified at the `OverviewQuery` layer against an in-memory oracle.
   """
@@ -42,7 +42,7 @@ defmodule MvWeb.MemberLive.IndexStichtagPropertyTest do
     end)
   end
 
-  property "Stichtag filter keeps exactly the members active on X" do
+  property "as-of-date filter keeps exactly the members active on X" do
     actor = Mv.Helpers.SystemActor.get_system_actor()
 
     check all(
@@ -67,7 +67,7 @@ defmodule MvWeb.MemberLive.IndexStichtagPropertyTest do
             do: id
 
       actual =
-        %{stichtag: x}
+        %{as_of_date: x}
         |> OverviewQuery.build()
         |> Ash.read!(actor: actor)
         |> MapSet.new(& &1.id)
diff --git a/test/mv_web/member_live/index_filter_url_roundtrip_test.exs b/test/mv_web/member_live/index_filter_url_roundtrip_test.exs
index 8fe3405a..b01a9705 100644
--- a/test/mv_web/member_live/index_filter_url_roundtrip_test.exs
+++ b/test/mv_web/member_live/index_filter_url_roundtrip_test.exs
@@ -1,7 +1,7 @@
 defmodule MvWeb.MemberLive.IndexFilterUrlRoundtripTest do
   @moduledoc """
   §2.1 (extended) — the v2 filter keys survive the LiveView decode→encode round
-  trip. Loading `/members` with a Stichtag date, the suspended flag, and a
+  trip. Loading `/members` with an as-of date, the suspended flag, and a
   two-sided payment count range, then triggering an unrelated re-patch (a sort
   click), preserves every one of those keys in the pushed URL.
   """
@@ -21,15 +21,15 @@ defmodule MvWeb.MemberLive.IndexFilterUrlRoundtripTest do
     %{conn: conn_with_oidc_user(conn)}
   end
 
-  test "stichtag, suspended and payment count range persist through a re-patch", %{conn: conn} do
-    url = "/members?stichtag=2026-03-15&suspended=1&pay_filter=has_unpaid&pay_min=2&pay_max=4"
+  test "as-of date, suspended and payment count range persist through a re-patch", %{conn: conn} do
+    url = "/members?as_of_date=2026-03-15&suspended=1&pay_filter=has_unpaid&pay_min=2&pay_max=4"
     {:ok, view, _html} = live(conn, url)
 
     # Trigger an unrelated URL re-patch by sorting a stable column.
     view |> element("[data-testid='payment']") |> render_click()
     path = assert_patch(view)
 
-    assert path =~ "stichtag=2026-03-15"
+    assert path =~ "as_of_date=2026-03-15"
     assert path =~ "suspended=1"
     assert path =~ "pay_filter=has_unpaid"
     assert path =~ "pay_min=2"
diff --git a/test/mv_web/member_live/index_status_params_codec_test.exs b/test/mv_web/member_live/index_status_params_codec_test.exs
index b1438969..bf32962e 100644
--- a/test/mv_web/member_live/index_status_params_codec_test.exs
+++ b/test/mv_web/member_live/index_status_params_codec_test.exs
@@ -1,28 +1,28 @@
 defmodule MvWeb.MemberLive.IndexStatusParamsCodecTest do
   @moduledoc """
   §2.1 (extended) — URL codec round-trip for the new v2 filter keys: the
-  point-in-time Stichtag date and the suspended-status flag. Encoding a state to
+  point-in-time as-of date and the suspended-status flag. Encoding a state to
   params then decoding yields the canonical state, and the default (no filter)
   encodes to the empty map so a fresh URL is canonical.
   """
   use ExUnit.Case, async: true
 
+  alias MvWeb.MemberLive.Index.AsOfDate
   alias MvWeb.MemberLive.Index.PaymentAging
-  alias MvWeb.MemberLive.Index.Stichtag
 
-  describe "Stichtag date" do
+  describe "as-of date" do
     test "a set date round-trips" do
       date = ~D[2026-03-15]
-      assert date |> Stichtag.to_params() |> Stichtag.parse() == date
+      assert date |> AsOfDate.to_params() |> AsOfDate.parse() == date
     end
 
     test "nil encodes to the empty map and decodes to nil" do
-      assert Stichtag.to_params(nil) == %{}
-      assert Stichtag.parse(%{}) == nil
+      assert AsOfDate.to_params(nil) == %{}
+      assert AsOfDate.parse(%{}) == nil
     end
 
     test "a malformed date param decodes to nil" do
-      assert Stichtag.parse(%{"stichtag" => "not-a-date"}) == nil
+      assert AsOfDate.parse(%{"as_of_date" => "not-a-date"}) == nil
     end
   end
 

From e967cb59e9465283368a20c6cb705314c584aea1 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:16 +0200
Subject: [PATCH 27/30] refactor(overview): derive payment badge colour from
 shared status variant

---
 lib/mv_web/live/member_live/index.html.heex   |  9 ++++---
 .../live/member_live/index/payment_aging.ex   | 25 ++++++++++++-------
 .../member_live/index_payment_period_test.exs |  8 +++---
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index e1de0fff..0a5b9280 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -471,15 +471,17 @@
               sort_field={@sort_field}
               sort_order={@sort_order}
             />
-            <span
+            <.badge
               :if={MvWeb.MemberLive.Index.payment_period_active?(@payment_period)}
-              class="badge badge-soft badge-primary badge-sm font-normal shrink-0"
+              variant="primary"
+              size="sm"
+              class="font-normal shrink-0"
               title={PaymentAging.period_tooltip(@payment_period)}
               aria-label={PaymentAging.period_tooltip(@payment_period)}
               data-testid="payment-period-badge"
             >
               {PaymentAging.period_short_code(@payment_period) || gettext("filtered")}
-            </span>
+            </.badge>
           </div>
           """
         }
@@ -499,7 +501,6 @@
           id={"payment-badge-#{member.id}"}
           class={["badge badge-soft badge-md", badge.color_class]}
           style={count > 0 && "anchor-name: #{anchor}"}
-          data-variant={badge.variant}
           phx-hook={count > 0 && "HoverPopover"}
           data-popover-target={count > 0 && tip_id}
           aria-details={count > 0 && tip_id}
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index 4d6576e1..644a1597 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -158,13 +158,12 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
   def suspended_to_params(_), do: %{}
 
   @doc """
-  Badge descriptor for an unpaid-cycle count. A count of 0 reads "Alle bezahlt"
-  (success/green); a positive count reads "N offen" (error/red). Reuses the
-  established cycle-status color and hero-icon codes so the overview badge reads
-  consistently with the member show page.
+  Badge descriptor for an unpaid-cycle count. A count of 0 reads "All paid"
+  (success/green); a positive count reads "N open" (error/red). The color class
+  is derived from the shared `MembershipFeeHelpers.status_variant/1` mapping, so
+  the overview badge reads consistently with the member show page.
   """
   @spec badge(non_neg_integer()) :: %{
-          variant: atom(),
           color_class: String.t(),
           icon: String.t(),
           label: String.t(),
@@ -172,8 +171,7 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
         }
   def badge(0) do
     %{
-      variant: :success,
-      color_class: cycle_color_class(:paid),
+      color_class: status_badge_class(:paid),
       icon: MembershipFeeHelpers.status_icon(:paid),
       label: gettext("All paid"),
       count: 0
@@ -182,14 +180,23 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
 
   def badge(count) when is_integer(count) and count > 0 do
     %{
-      variant: MembershipFeeHelpers.status_variant(:unpaid),
-      color_class: cycle_color_class(:unpaid),
+      color_class: status_badge_class(:unpaid),
       icon: MembershipFeeHelpers.status_icon(:unpaid),
       label: gettext("%{count} open", count: count),
       count: count
     }
   end
 
+  @doc """
+  DaisyUI badge color class for a cycle status, derived from the single shared
+  `MembershipFeeHelpers.status_variant/1` mapping so the overview badges, the
+  tooltip badges and the member show page all stay in lock-step. daisyUI emits
+  all `badge-*` component colors, so the interpolated class is always bundled.
+  """
+  @spec status_badge_class(:paid | :unpaid | :suspended) :: String.t()
+  def status_badge_class(status),
+    do: "badge-#{MembershipFeeHelpers.status_variant(status)}"
+
   @doc """
   Compact short code for a payment period (§1.28), or nil when the period is not
   compactly codeable (the header then falls back to a plain "filtered" badge).
diff --git a/test/mv_web/member_live/index_payment_period_test.exs b/test/mv_web/member_live/index_payment_period_test.exs
index be256316..554aaf6a 100644
--- a/test/mv_web/member_live/index_payment_period_test.exs
+++ b/test/mv_web/member_live/index_payment_period_test.exs
@@ -144,16 +144,16 @@ defmodule MvWeb.MemberLive.IndexPaymentPeriodTest do
   end
 
   describe "badge/1" do
-    test "0 renders as All paid (success/green)" do
+    test "0 renders as All paid (success/green), color derived from the shared status variant" do
       badge = PaymentAging.badge(0)
-      assert badge.variant == :success
+      refute Map.has_key?(badge, :variant)
       assert badge.color_class == "badge-success"
       assert badge.label == "All paid"
     end
 
-    test "N > 0 renders as N open (error/red)" do
+    test "N > 0 renders as N open (error/red), color derived from the shared status variant" do
       badge = PaymentAging.badge(2)
-      assert badge.variant == :error
+      refute Map.has_key?(badge, :variant)
       assert badge.color_class == "badge-error"
       assert badge.label =~ "2"
       assert badge.label =~ "open"

From 4d6294771a91a2e1dc3884f13a7901ffba99ad85 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 16:27:16 +0200
Subject: [PATCH 28/30] feat(overview): show suspended cycles separately in the
 payment tooltip

---
 lib/mv_web/live/member_live/index.ex          |  1 +
 lib/mv_web/live/member_live/index.html.heex   | 47 +++++++++++++++----
 .../live/member_live/index/payment_aging.ex   | 46 +++++++++---------
 priv/gettext/de/LC_MESSAGES/default.po        |  1 +
 priv/gettext/default.pot                      |  1 +
 priv/gettext/en/LC_MESSAGES/default.po        |  1 +
 .../index_membership_fee_status_test.exs      | 25 ++++++++++
 7 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index af0214e7..62a82026 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -49,6 +49,7 @@ defmodule MvWeb.MemberLive.Index do
   alias Mv.MembershipFees
   alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.DateFormatter
+  alias MvWeb.Helpers.MembershipFeeHelpers
   alias MvWeb.MemberLive.Index.AsOfDate
   alias MvWeb.MemberLive.Index.CustomFieldValueLookup
   alias MvWeb.MemberLive.Index.DateFilter
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 0a5b9280..39182330 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -511,8 +511,9 @@
           {badge.label}
         </.link>
         <%= if count > 0 do %>
-          <% cycles = PaymentAging.open_cycles(member, @payment_period) %>
-          <% {shown, overflow} = PaymentAging.tooltip_cycles(cycles) %>
+          <% %{unpaid: unpaid, suspended: suspended} =
+            PaymentAging.partition_open_cycles(member, @payment_period) %>
+          <% {shown, overflow} = PaymentAging.tooltip_cycles(unpaid) %>
           <div
             id={tip_id}
             popover="manual"
@@ -521,15 +522,21 @@
             class="payment-tip m-0 w-fit rounded-box border border-base-300 bg-base-100 p-2 text-sm shadow-xl"
             data-testid="payment-tooltip"
           >
-            <ul class="m-0 flex list-none flex-col items-stretch gap-1 p-0">
+            <ul
+              class="m-0 flex list-none flex-col items-stretch gap-1 p-0"
+              data-testid="payment-tooltip-unpaid"
+            >
               <li :for={cycle <- shown} class="flex">
-                <span class={[
-                  "badge badge-soft badge-sm w-full justify-start",
-                  PaymentAging.cycle_color_class(cycle.status)
-                ]}>
-                  <.icon name={PaymentAging.cycle_icon(cycle.status)} class="size-3.5" />
+                <.badge
+                  variant={MembershipFeeHelpers.status_variant(cycle.status)}
+                  size="sm"
+                  class="w-full justify-start"
+                >
+                  <:icon>
+                    <.icon name={MembershipFeeHelpers.status_icon(cycle.status)} class="size-3.5" />
+                  </:icon>
                   {PaymentAging.short_period(cycle)}
-                </span>
+                </.badge>
               </li>
               <li :if={overflow > 0} class="flex">
                 <span class="badge badge-soft badge-sm badge-ghost w-full justify-start">
@@ -538,6 +545,28 @@
                 </span>
               </li>
             </ul>
+            <%!-- Suspended cycles are shown separately under their own label so
+            the status distinction is not color-only (§1.14). --%>
+            <div :if={suspended != []} class="mt-2" data-testid="payment-tooltip-suspended">
+              <p class="mb-1 text-xs font-medium opacity-70">{gettext("Suspended")}</p>
+              <ul class="m-0 flex list-none flex-col items-stretch gap-1 p-0">
+                <li :for={cycle <- suspended} class="flex">
+                  <.badge
+                    variant={MembershipFeeHelpers.status_variant(cycle.status)}
+                    size="sm"
+                    class="w-full justify-start"
+                  >
+                    <:icon>
+                      <.icon
+                        name={MembershipFeeHelpers.status_icon(cycle.status)}
+                        class="size-3.5"
+                      />
+                    </:icon>
+                    {PaymentAging.short_period(cycle)}
+                  </.badge>
+                </li>
+              </ul>
+            </div>
           </div>
         <% end %>
       </:col>
diff --git a/lib/mv_web/live/member_live/index/payment_aging.ex b/lib/mv_web/live/member_live/index/payment_aging.ex
index 644a1597..4f48c326 100644
--- a/lib/mv_web/live/member_live/index/payment_aging.ex
+++ b/lib/mv_web/live/member_live/index/payment_aging.ex
@@ -272,14 +272,32 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
     |> Enum.sort_by(& &1.cycle_start, Date)
   end
 
+  @doc """
+  Partitions a member's open cycles for the period into the unpaid cycles (which
+  drive the count and the badge) and the suspended cycles, which the tooltip
+  surfaces in their own labeled section rather than by color alone (§1.14).
+  Both lists stay in chronological order.
+  """
+  @spec partition_open_cycles(map(), period()) :: %{unpaid: [map()], suspended: [map()]}
+  def partition_open_cycles(member, period) do
+    {unpaid, suspended} =
+      member
+      |> open_cycles(period)
+      |> Enum.split_with(&(&1.status == :unpaid))
+
+    %{unpaid: unpaid, suspended: suspended}
+  end
+
   @tooltip_slots 5
 
   @doc """
-  Partitions open cycles into the tooltip's fixed five-slot budget: at most
-  five badges total. Five or fewer cycles show in full with no overflow. More
-  than five collapse to the first four chronological cycles plus a single
-  overflow count (total − 4), so the tooltip renders four cycle badges and one
-  grey overflow badge — five items.
+  Partitions the tooltip's unpaid sub-list into a fixed five-slot budget: at
+  most five badges for the unpaid cycles. Five or fewer unpaid cycles show in
+  full with no overflow. More than five collapse to the first four chronological
+  cycles plus a single overflow count (total − 4), so the unpaid sub-list
+  renders four cycle badges and one grey overflow badge — five items. Suspended
+  cycles are listed separately (in their own labeled section) and are not capped
+  by this budget, so the tooltip's overall badge count can exceed five.
   """
   @spec tooltip_cycles([map()]) :: {[map()], non_neg_integer()}
   def tooltip_cycles(cycles) when is_list(cycles) do
@@ -290,22 +308,6 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
     end
   end
 
-  @doc """
-  Static daisyUI badge color token for a cycle status, matching the codes used
-  on the member show page. Literal strings so Tailwind's content scanner keeps
-  them in the bundle (a runtime `badge-\#{status}` would be tree-shaken).
-  """
-  @spec cycle_color_class(:paid | :unpaid | :suspended) :: String.t()
-  def cycle_color_class(:paid), do: "badge-success"
-  def cycle_color_class(:unpaid), do: "badge-error"
-  def cycle_color_class(:suspended), do: "badge-warning"
-
-  @doc """
-  Hero-icon name for a cycle status (reuses the established status icons).
-  """
-  @spec cycle_icon(:paid | :unpaid | :suspended) :: String.t()
-  def cycle_icon(status), do: MembershipFeeHelpers.status_icon(status)
-
   @doc """
   Short, human-readable period label for a cycle, derived from its `cycle_start`
   and the fee-type interval:
@@ -313,7 +315,7 @@ defmodule MvWeb.MemberLive.Index.PaymentAging do
     * yearly → `"2025"`
     * quarterly → `"Q1 2026"`
     * half-yearly → `"H1 2026"`
-    * monthly → `"März 2026"`
+    * monthly → `"March 2026"`
 
   Falls back to a `dd.MM.yyyy–dd.MM.yyyy` date range when the interval is not
   loaded/known.
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 1a8682ad..5706d57b 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -3259,6 +3259,7 @@ msgid "Summary"
 msgstr "Zusammenfassung"
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index ae7e899b..309f5ae4 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -3260,6 +3260,7 @@ msgid "Summary"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 9f43b72f..a8decc87 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -3260,6 +3260,7 @@ msgid "Summary"
 msgstr ""
 
 #: lib/mv/membership/members_pdf.ex
+#: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/index/membership_fee_status.ex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/live/member_live/show/membership_fees_component.ex
diff --git a/test/mv_web/member_live/index_membership_fee_status_test.exs b/test/mv_web/member_live/index_membership_fee_status_test.exs
index ae6e5657..f4a2afdc 100644
--- a/test/mv_web/member_live/index_membership_fee_status_test.exs
+++ b/test/mv_web/member_live/index_membership_fee_status_test.exs
@@ -83,6 +83,31 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
       assert has_element?(view, "#payment-tip-#{member.id}[popover]")
     end
 
+    test "the tooltip lists suspended cycles in a separate labeled section (§1.14)", %{conn: conn} do
+      fee_type = create_fee_type(%{interval: :yearly})
+      member = create_member(%{first_name: "Mixed", membership_fee_type_id: fee_type.id})
+      create_cycle(member, fee_type, %{cycle_start: ~D[2023-01-01], status: :unpaid})
+      create_cycle(member, fee_type, %{cycle_start: ~D[2024-01-01], status: :suspended})
+
+      {:ok, view, _html} = live(conn, "/members")
+
+      tip = "#payment-tip-#{member.id}"
+
+      # Suspended cycles are shown separately, under their own text label — the
+      # distinction is not color-only. The suspended cycle's period lives in the
+      # suspended section and is absent from the unpaid list.
+      assert has_element?(view, "#{tip} [data-testid='payment-tooltip-suspended']", "Suspended")
+
+      suspended =
+        view |> element("#{tip} [data-testid='payment-tooltip-suspended']") |> render()
+
+      assert suspended =~ "2024"
+
+      unpaid = view |> element("#{tip} [data-testid='payment-tooltip-unpaid']") |> render()
+      assert unpaid =~ "2023"
+      refute unpaid =~ "2024"
+    end
+
     test "a fully-paid member renders the badge but no tooltip popover", %{conn: conn} do
       fee_type = create_fee_type(%{interval: :yearly})
       member = create_member(%{first_name: "Clean", membership_fee_type_id: fee_type.id})

From fc634813d8ac5f208c8ddfbb1ef6edf1c50299da Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Fri, 10 Jul 2026 17:11:25 +0200
Subject: [PATCH 29/30] docs(changelog): record member-overview filter redesign
 under Unreleased

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f734002b..af124bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - **Members overview – view settings** – A new "View" dropdown switches the table between compact and comfortable density and controls how the Member and Address fields are shown: as combined composite cells or split into their underlying columns (Vorname/Nachname/E-Mail resp. Straße/PLZ/Ort). Every choice is remembered per browser.
 - **Members overview – reset columns to default** – The column-visibility menu gained a reset button that restores the curated default column set.
+- **Members overview – add-filter builder** – A searchable, grouped field picker adds filters as editable chips instead of a fixed panel; the active filters are encoded in the URL, so a filtered view is bookmarkable and survives a reload.
+- **Members overview – more filters** – New filters for members active on a chosen date (point-in-time), members with suspended cycles in the period, matching any of several selected groups (OR), and a range on the number of open payment cycles.
+- **Members overview – payment aging column** – The fees column shows how many billing cycles each member has left unpaid in the selected period (cycles are member-relative), is sortable by that count, carries a period indicator on its header, and lists the open — and separately, the suspended — cycles in a hover tooltip.
 
 ### Changed
 - **Members overview – loads on demand** – The overview no longer reads every member into memory. Filtering, sorting and pagination now run in the database, and rows stream in via infinite scroll as you reach the bottom of the list, so large member lists open quickly. The exact number of matching members is announced (for example "250 Members").
 - **Members overview – condensed name and address** – By default a member shows as a composite name cell and a two-line address cell (street / postal code + city); both columns are sortable and city and postal code stay findable via search. A clear (×) button was added to the search field.
 - **Members overview – bulk actions span the full result set** – Select-all, copy e-mail addresses, and export now act on the complete filtered set rather than only the rows currently loaded, and the count reflects the full filtered total.
 - **Members overview – sticky header, pinned column and sortable headers** – The table keeps a sticky header and pinned identifier column, sort headers that expose the active sort direction, boolean columns rendered as ✓/✗ icons, larger touch targets in both densities, and result-count and loading changes announced through a polite live region — meeting WCAG 2.2 AA for accessibility.
+- **Members overview – filter panel replaced** – The vertical filter panel is replaced by the add-filter builder, and date ranges now use native date inputs with relative presets, with a quick year jump and manual entry.
+
+### Fixed
+- **Members overview – keyboard-operable filter toggles** – The filter builder's Yes/No and status toggles can now be reached and switched with the keyboard and show a visible focus indicator (WCAG 2.1.1 Keyboard, 2.4.7 Focus Visible).
 
 ## [1.3.0] - 2026-06-16
 

From 051183689574149ea69fcdde3fb36a121d1e5856 Mon Sep 17 00:00:00 2001
From: Simon <s.thiessen@local-it.org>
Date: Sat, 11 Jul 2026 14:29:32 +0200
Subject: [PATCH 30/30] fix(deps): pin ash_authentication below 4.14 to unblock
 OIDC build

---
 mix.exs  | 6 +++++-
 mix.lock | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 02861f93..63a91671 100644
--- a/mix.exs
+++ b/mix.exs
@@ -45,7 +45,11 @@ defmodule Mv.MixProject do
       {:ash_phoenix, "~> 2.0"},
       {:ash, "~> 3.0"},
       {:bcrypt_elixir, "~> 3.0"},
-      {:ash_authentication, "~> 4.9"},
+      # Pinned below 4.14 until the identity_resource / UserIdentity migration lands.
+      # 4.14 makes an `identity_resource` mandatory for OIDC strategies; our custom
+      # `oidc_id` design already resolves users by the `sub` claim (never by email),
+      # so there is no live security gap. Unpin once UserIdentity + data migration exist.
+      {:ash_authentication, "~> 4.13.0"},
       {:ash_authentication_phoenix, "~> 2.10"},
       {:igniter, "~> 0.8", only: [:dev, :test]},
       {:phoenix, "~> 1.8.0-rc.4", override: true},
diff --git a/mix.lock b/mix.lock
index 17cb540d..cb724e83 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,7 +1,7 @@
 %{
   "ash": {:hex, :ash, "3.29.3", "ba3c286c10fef489e01e1896bb6e80dbcac357c55b6d375da9e9eb7b49e88234", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.14", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.6.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2a7a45d3a3b980457b5cc7e339a84a35c232a7ab99047bbf7ce55e7dc36df357"},
   "ash_admin": {:hex, :ash_admin, "1.1.0", "df7c8075347ca9229f132648534a33319f29ae5aceed6c1015d138bba1a4811f", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.20 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:cinder, "~> 0.9", [hex: :cinder, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "f8bd6c08b584a315a9574c7bbe9c1c914bc5c51838045994b0e5369871f9b3d8"},
-  "ash_authentication": {:hex, :ash_authentication, "4.14.1", "67ce78459f1064d0a0374beced5bf6bd106e98d59f3253a96525f3073c2493fb", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "e149234fc70dc2544aac7a52656318bebca89a58ecbe98fb884ae41cf76fe6d7"},
+  "ash_authentication": {:hex, :ash_authentication, "4.13.7", "421b5ddb516026f6794435980a632109ec116af2afa68a45e15fb48b41c92cfa", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "0d45ac3fdcca6902dabbe161ce63e9cea8f90583863c2e14261c9309e5837121"},
   "ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.16.0", "02045ecde9eeb30ab1bfffbdf693c64426af24902bcd533765eba725b9b9f46f", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, "~> 4.10", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "1107a45af771ee7c02ebe82abcaf9a778096e66b3e6cb2b6e614d22d1fe385f7"},
   "ash_phoenix": {:hex, :ash_phoenix, "2.3.22", "f59a347ee09e1fa9973fe1b2faf7f8f793acc14dc09341062783b8eb1a9f5c99", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "4b34ea84e122c238ad1843888b8fd4d21aec27605b9b1e6e27e1b70329560fbb"},
   "ash_postgres": {:hex, :ash_postgres, "2.10.0", "831d3b70b80560a6894cb17c98e3f72e3dbbc06e835dbac36363c27e186b1940", [:mix], [{:ash, "~> 3.29", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, "~> 0.6", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.13", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.4 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "e73298910d29b8051b30af390094165848b588288204ab12990f365c9fc653cc"},