@@ -88,4 +88,8 @@ it("compares everyone at the inspected moment and carries the view to a player",
 
   fireEvent.click(screen.getByLabelText("Select Bob"));
   expect(nav.state.params.get("players")).toBe(B);
+  // "Only selected" lives in the URL, so a copied link shows the same players.
+  fireEvent.click(await screen.findByLabelText(/Only selected/));
+  expect(nav.state.params.get("only")).toBe("1");
+  await screen.findByText(/1 of 1 players observed/);
 });
@@ -44,7 +44,7 @@ type Load =
   | { kind: "loading"; previous: Movement | null }
   | { kind: GateKind }
   | { kind: "failed"; message: string; previous: Movement | null }
-  | { kind: "ready"; data: Movement };
+  | { kind: "ready"; data: Movement; key: string };
 
 function intParam(value: string | null): number | null {
   return value !== null && /^-?\d+$/.test(value) ? Number(value) : null;
@@ -86,7 +86,7 @@ export default function EveryoneMovement() {
   const at = intParam(search.get("at"));
   const pin = pinParam(search.get("pin"));
   const chosen = useMemo(() => new Set((search.get("players") ?? "").split(",").filter(Boolean)), [search]);
-  const [onlyChosen, setOnlyChosen] = useState(false);
+  const onlyChosen = search.get("only") === "1";
   const [query, setQuery] = useState("");
   const [highlight, setHighlight] = useState<string | null>(null);
 
@@ -115,7 +115,7 @@ export default function EveryoneMovement() {
       previous: prev.kind === "ready" ? prev.data : prev.kind === "loading" || prev.kind === "failed" ? prev.previous : null,
     }));
     getEveryoneMovement(range.from, range.to)
-      .then((data) => live && setLoad({ kind: "ready", data }))
+      .then((data) => live && setLoad({ kind: "ready", data, key: viewKey }))
       .catch((err) => {
         if (!live) return;
         const gate = gateKind(err);
@@ -151,8 +151,8 @@ export default function EveryoneMovement() {
   const since = data?.since ?? range.from;
   const until = data?.until ?? range.to;
   const times = useMemo(
-    () => observationTimes(drawn.flatMap((t) => clipStretches(t.stretches, since, until))),
-    [drawn, since, until]
+    () => observationTimes(drawn.flatMap((t) => t.stretches), data?.complete_from ?? since, until),
+    [drawn, data, since, until]
   );
 
   if (load.kind === "forbidden") {
@@ -230,18 +230,18 @@ export default function EveryoneMovement() {
               onChange={(e) => setQuery(e.target.value)}
             />
             <div className="flex flex-wrap items-center gap-3 text-sm text-[var(--tfmc-cream)]">
-              <label className="flex items-center gap-2">
+              <label className="flex min-h-11 items-center gap-2">
                 <input
                   type="checkbox"
                   className="h-4 w-4 accent-[var(--tfmc-accent)]"
                   checked={onlyChosen}
                   disabled={!chosen.size}
-                  onChange={(e) => setOnlyChosen(e.target.checked)}
+                  onChange={(e) => update({ only: e.target.checked ? "1" : null }, true)}
                 />
                 Only selected ({chosen.size})
               </label>
               {chosen.size ? (
-                <button type="button" className="text-[var(--tfmc-stone)] underline" onClick={() => update({ players: null }, true)}>
+                <button type="button" className="text-[var(--tfmc-stone)] underline" onClick={() => update({ players: null, only: null }, true)}>
                   Clear selection
                 </button>
               ) : null}
@@ -254,13 +254,16 @@ export default function EveryoneMovement() {
                   onMouseEnter={() => setHighlight(trail.key)}
                   onMouseLeave={() => setHighlight(null)}
                 >
-                  <input
-                    type="checkbox"
-                    aria-label={`Select ${trail.label}`}
-                    className="h-4 w-4 shrink-0 accent-[var(--tfmc-accent)]"
-                    checked={chosen.has(trail.key)}
-                    onChange={() => toggle(trail.key)}
-                  />
+                  {/* A 44 px target around a small box. */}
+                  <label className="-my-1 flex h-11 w-11 shrink-0 cursor-pointer items-center justify-center">
+                    <input
+                      type="checkbox"
+                      aria-label={`Select ${trail.label}`}
+                      className="h-4 w-4 accent-[var(--tfmc-accent)]"
+                      checked={chosen.has(trail.key)}
+                      onChange={() => toggle(trail.key)}
+                    />
+                  </label>
                   <span className="h-2.5 w-2.5 shrink-0 rounded-full" style={{ background: trail.colour }} />
                   <Link
                     href={playerHref(trail.key)}
@@ -308,7 +311,7 @@ export default function EveryoneMovement() {
                 hold={hold}
                 highlight={highlight}
                 pin={pin}
-                fitKey={load.kind === "ready" ? viewKey : null}
+                fitKey={load.kind === "ready" && load.key === viewKey ? viewKey : null}
                 onInspect={(time) => update({ at: String(time) }, true)}
                 className="h-[60vh] min-h-[22rem] rounded-sm lg:h-[calc(100dvh-24rem)]"
               />
 
@@ -18,13 +18,12 @@ import {
   zoneLabel,
 } from "../../../lib/admin/movement";
 
-export const chipClass =
-  "min-h-11 rounded-sm border px-3 py-1 text-sm transition-colors disabled:opacity-40 sm:min-h-0";
+export const chipClass = "min-h-11 rounded-sm border px-3 py-1 text-sm transition-colors disabled:opacity-40";
 export const chipOn = "border-[var(--tfmc-accent)] text-[var(--tfmc-cream)]";
 export const chipOff =
   "border-[color-mix(in_srgb,var(--tfmc-cream)_20%,transparent)] text-[var(--tfmc-stone)] hover:text-[var(--tfmc-cream)]";
 export const inputClass =
-  "min-h-11 w-full rounded-sm border border-[color-mix(in_srgb,var(--tfmc-cream)_20%,transparent)] bg-transparent px-2 py-1 text-sm text-[var(--tfmc-cream)] [color-scheme:dark] sm:min-h-0";
+  "min-h-11 w-full rounded-sm border border-[color-mix(in_srgb,var(--tfmc-cream)_20%,transparent)] bg-transparent px-2 py-1 text-sm text-[var(--tfmc-cream)] [color-scheme:dark]";
 export const mutedClass = "text-sm text-[var(--tfmc-mist)]";
 const errorClass = "text-sm text-[#e8a0a0]";
 
@@ -102,10 +101,14 @@ export function RangeForm({
   const [toText, setToText] = useState(toLocalInput(value.to));
   const [seen, setSeen] = useState(value);
   const [error, setError] = useState<string | null>(null);
+  // Typed but not applied: following the clock must not overwrite it.
+  const [dirty, setDirty] = useState(false);
   if (seen.from !== value.from || seen.to !== value.to) {
     setSeen(value);
-    setFromText(toLocalInput(value.from));
-    setToText(toLocalInput(value.to));
+    if (!dirty) {
+      setFromText(toLocalInput(value.from));
+      setToText(toLocalInput(value.to));
+    }
   }
 
   const apply = (follow: boolean) => {
@@ -116,6 +119,7 @@ export function RangeForm({
     if (from.time! >= to.time!) return setError("From must be before To.");
     if (to.time! - from.time! > longest) return setError(`Choose a range of up to ${formatDuration(longest).toLowerCase()}.`);
     setError(null);
+    setDirty(false);
     onApply({ from: from.time!, to: to.time!, follow });
   };
 
@@ -137,6 +141,9 @@ export function RangeForm({
             if (!preset) return;
             const [from, to] = preset.range(Math.floor(Date.now() / 1000));
             setError(null);
+            setDirty(false);
+            setFromText(toLocalInput(from));
+            setToText(toLocalInput(to));
             onApply({ from, to, follow: false });
           }}
         >
@@ -149,11 +156,11 @@ export function RangeForm({
       <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2">
         <label className="flex flex-col gap-1 text-sm text-[var(--tfmc-mist)]">
           From
-          <input type="datetime-local" className={inputClass} value={fromText} onChange={(e) => setFromText(e.target.value)} />
+          <input type="datetime-local" className={inputClass} value={fromText} onChange={(e) => { setFromText(e.target.value); setDirty(true); }} />
         </label>
         <label className="flex flex-col gap-1 text-sm text-[var(--tfmc-mist)]">
           To
-          <input type="datetime-local" className={inputClass} value={toText} onChange={(e) => setToText(e.target.value)} />
+          <input type="datetime-local" className={inputClass} value={toText} onChange={(e) => { setToText(e.target.value); setDirty(true); }} />
         </label>
       </div>
       <div className="flex flex-wrap gap-2">
@@ -163,19 +170,25 @@ export function RangeForm({
         <button
           type="button"
           className={`${chipClass} ${chipOff}`}
-          onClick={() => setToText(toLocalInput(Math.floor(Date.now() / 1000)))}
+          onClick={() => {
+            setToText(toLocalInput(Math.floor(Date.now() / 1000)));
+            setDirty(true);
+          }}
         >
           To now
         </button>
       </div>
-      <label className="flex items-center gap-2 text-sm text-[var(--tfmc-cream)]">
+      <label className="flex min-h-11 items-center gap-2 text-sm text-[var(--tfmc-cream)]">
         <input
           type="checkbox"
           className="h-4 w-4 accent-[var(--tfmc-accent)]"
           checked={value.follow}
           onChange={(event) => {
             if (event.target.checked) {
               const now = Math.floor(Date.now() / 1000);
+              setDirty(false);
+              setFromText(toLocalInput(now - (value.to - value.from)));
+              setToText(toLocalInput(now));
               onApply({ from: now - (value.to - value.from), to: now, follow: true });
             } else {
               onApply({ ...value, follow: false });
@@ -270,17 +283,20 @@ export function Timeline({
         {ticks.map((t) => (
           <div key={t} className="absolute bottom-0 h-2 border-l border-[color-mix(in_srgb,var(--tfmc-cream)_35%,transparent)]" style={{ left: pct(t) }} />
         ))}
-        <div className="pointer-events-none absolute inset-y-[-3px] w-0.5 bg-white shadow" style={{ left: pct(cursor) }} />
         <input
           type="range"
           aria-label="Inspected moment"
+          aria-valuetext={formatMoment(cursor, true)}
           min={since}
           max={until}
-          step={1}
+          step={60}
           value={Math.min(until, Math.max(since, cursor))}
           onChange={(event) => onCursor(Number(event.target.value))}
-          className="absolute inset-0 h-full w-full cursor-pointer opacity-0"
+          className="peer absolute inset-0 z-10 h-full w-full cursor-pointer opacity-0"
         />
+        {/* The input is invisible, so its keyboard focus is drawn here. */}
+        <div className="pointer-events-none absolute inset-0 rounded-sm peer-focus-visible:ring-2 peer-focus-visible:ring-[var(--tfmc-accent)]" />
+        <div className="pointer-events-none absolute inset-y-[-3px] w-0.5 bg-white shadow" style={{ left: pct(cursor) }} />
       </div>
       <div className="relative h-4 text-[11px] text-[var(--tfmc-mist)]">
         {ticks.map((t) => (
 
@@ -144,7 +144,9 @@ function endpointLabels(trail: MovementTrail, mapWorld: string): { sample: Sampl
   const first = shown[0].samples[0];
   const lastStretch = shown[shown.length - 1].samples;
   const last = lastStretch[lastStretch.length - 1];
-  const start = `${first.action === ACTION_LOGIN ? "Logged in" : "First observation shown"} ${formatClock(first.time)}`;
+  const start = first.estimated
+    ? `Shown from ${formatClock(first.time)} (estimated position)`
+    : `${first.action === ACTION_LOGIN ? "Logged in" : "First observation shown"} ${formatClock(first.time)}`;
   const end = `${last.action === ACTION_LOGOUT ? "Logged out" : "Last observation shown"} ${formatClock(last.time)}`;
   if (first === last) return [{ sample: first, text: start }];
   return [
@@ -251,6 +253,12 @@ export default function MovementMap({
   const single = trails.length === 1 ? markers[0]?.at : null;
   const scaleBlocks = displayScale > 0 ? niceLength(100 / displayScale) : 0;
   const halo = { stroke: "#10160f", strokeWidth: 3 * unit, paintOrder: "stroke" as const };
+  /** Text beside a map point, flipped to its left when it would run off the right of the view. */
+  const beside = (x: number, gap: number) => {
+    const screenX = (x + 0.5) * displayScale + viewport.translateX;
+    const flip = screenX > viewport.viewportSize.w - 220;
+    return { x: x + 0.5 + (flip ? -gap : gap) * unit, textAnchor: flip ? ("end" as const) : ("start" as const) };
+  };
 
   const dotTitle = (trail: MovementTrail, s: Sample) =>
     `${trail.label} — ${formatClock(s.time, true)}${
@@ -349,7 +357,8 @@ export default function MovementMap({
                   stretch.world === mapWorld
                     ? stretch.samples.map((s, i) => {
                         const edge = s.action === ACTION_LOGIN || s.action === ACTION_LOGOUT;
-                        if (!edge && !dots) return null;
+                        // A point made up at the range's edge is drawn through, never as a recorded dot.
+                        if (s.estimated || (!edge && !dots)) return null;
                         const fill =
                           s.action === ACTION_LOGIN
                             ? "#7fd18b"
@@ -410,7 +419,7 @@ export default function MovementMap({
                 return labels.map((label, i) => (
                   <text
                     key={`${trail.key}:label:${i}`}
-                    x={label.sample.x + 0.5 + 9 * unit}
+                    {...beside(label.sample.x, 9)}
                     y={label.sample.z + 0.5 - 7 * unit}
                     fontSize={12 * unit}
                     fontWeight={600}
@@ -433,7 +442,7 @@ export default function MovementMap({
                 strokeWidth={1.5 * unit}
               />
               <text
-                x={pin.x + 0.5 + 12 * unit}
+                {...beside(pin.x, 12)}
                 y={pin.z + 0.5 + 16 * unit}
                 fontSize={12 * unit}
                 fontWeight={600}
@@ -462,7 +471,7 @@ export default function MovementMap({
                 />
                 {trails.length > 1 ? (
                   <text
-                    x={at.x + 0.5 + 12 * unit}
+                    {...beside(at.x, 12)}
                     y={at.z + 0.5 + 4 * unit}
                     fontSize={13 * unit}
                     fontWeight={600}
@@ -485,13 +494,13 @@ export default function MovementMap({
             title={button.title}
             aria-label={button.title}
             onClick={button.run}
-            className="h-11 w-11 rounded-sm border border-[color-mix(in_srgb,var(--tfmc-cream)_25%,transparent)] bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_85%,transparent)] text-lg text-[var(--tfmc-cream)] hover:border-[var(--tfmc-accent)] sm:h-9 sm:w-9 sm:text-base"
+            className="h-11 w-11 rounded-sm border border-[color-mix(in_srgb,var(--tfmc-cream)_25%,transparent)] bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_85%,transparent)] text-lg text-[var(--tfmc-cream)] hover:border-[var(--tfmc-accent)]"
           >
             {button.label}
           </button>
         ))}
       </div>
-      <div className="pointer-events-none absolute bottom-2 left-2 z-20 flex flex-col gap-1 rounded-sm bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_82%,transparent)] px-2.5 py-1.5 text-[11px] text-[var(--tfmc-cream)]">
+      <div className="pointer-events-none absolute bottom-2 left-2 right-2 z-20 flex w-fit max-w-[calc(100%-1rem)] flex-col gap-1 rounded-sm bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_82%,transparent)] px-2.5 py-1.5 text-[11px] text-[var(--tfmc-cream)]">
         {trails.length === 1 && !trails[0].colour ? (
           <span className="flex items-center gap-1.5">
             older
@@ -502,18 +511,18 @@ export default function MovementMap({
             newer
           </span>
         ) : null}
-        <span className="flex items-center gap-1.5">
+        <span className="flex flex-wrap items-center gap-1.5">
           <span className="inline-block h-2.5 w-2.5 rounded-full border-2 border-white bg-[#f4c96b]" /> recorded
           <span className="ml-2 inline-block h-2.5 w-2.5 rounded-full border-2 border-[#f4c96b]" /> estimate or last seen
         </span>
-        <span className="flex items-center gap-1.5">
+        <span className="flex flex-wrap items-center gap-1.5">
           <span className="inline-block w-5 border-t-2 border-dashed border-[#e8e4d9]" /> unobserved transition
           <span className="ml-2 inline-block h-2 w-2 rounded-full bg-[#7fd18b]" /> logged in
           <span className="inline-block h-2 w-2 rounded-full bg-[#e8796f]" /> logged out
         </span>
       </div>
       {scaleBlocks ? (
-        <div className="pointer-events-none absolute bottom-2 right-2 z-20 rounded-sm bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_82%,transparent)] px-2 py-1 text-[11px] text-[var(--tfmc-cream)]">
+        <div className="pointer-events-none absolute left-2 top-2 z-20 rounded-sm bg-[color-mix(in_srgb,var(--tfmc-forest-deep)_82%,transparent)] px-2 py-1 text-[11px] text-[var(--tfmc-cream)]">
           <div
             className="border-x-2 border-b-2 border-[var(--tfmc-cream)]"
             style={{ width: scaleBlocks * displayScale, height: 5 }}
 
@@ -144,3 +144,21 @@ it("tells non-admins the page is not for them", async () => {
   render(<PlayerMovementPage uuid={UUID} />);
   await screen.findByText("Movement is for admins and the owner only.");
 });
+
+it("frames a new session only once its own answer is in", async () => {
+  render(<PlayerMovementPage uuid={UUID} />);
+  await screen.findByText(/recorded at 30, 64, 0/);
+  expect(screen.getByTestId("map").dataset.fit).toBe("session:s1");
+  let answer: (value: unknown) => void = () => undefined;
+  vi.mocked(getSessionMovement).mockReturnValueOnce(new Promise((resolve) => (answer = resolve)) as never);
+  act(() => nav.go("/x?session=s2"));
+  // Still showing s1's answer: the map must not take s2's key against s1's trail.
+  expect(screen.getByTestId("map").dataset.fit).toBe("");
+  await act(async () =>
+    answer({
+      session: { ...SESSION, id: "s2" }, since: T, until: T + 600, worlds: ["TFMC_Map"],
+      points: [[T, 0, 500, 64, 0, 1]], complete_from: T, pings_since: null, as_of: T, coreprotect: status,
+    })
+  );
+  await waitFor(() => expect(screen.getByTestId("map").dataset.fit).toBe("session:s2"));
+});