diff --git a/frontend/src/components/FilterPanel.tsx b/frontend/src/components/FilterPanel.tsx
index 111f992..b7d922f 100644
--- a/frontend/src/components/FilterPanel.tsx
+++ b/frontend/src/components/FilterPanel.tsx
@@ -375,20 +375,25 @@ export function FilterPanel({ onSubmit, currentMetric, isLoading, listingCount,
                                                         { value: FurnishType.FURNISHED, label: 'Furnished' },
                                                         { value: FurnishType.PART_FURNISHED, label: 'Part' },
                                                         { value: FurnishType.UNFURNISHED, label: 'Unfurn.' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            type="button"
-                                                            onClick={() => toggleFurnishType(option.value)}
-                                                            className={`px-2 py-1 text-xs rounded-md border transition-colors ${
-                                                                selectedFurnishTypes.includes(option.value)
-                                                                    ? 'bg-primary text-primary-foreground border-primary'
-                                                                    : 'bg-background hover:bg-muted border-input'
-                                                            }`}
-                                                        >
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
+                                                    ].map((option) => {
+                                                        const isSelected = selectedFurnishTypes.includes(option.value);
+                                                        return (
+                                                            <button
+                                                                key={option.value}
+                                                                type="button"
+                                                                onClick={() => toggleFurnishType(option.value)}
+                                                                aria-pressed={isSelected}
+                                                                data-state={isSelected ? 'on' : 'off'}
+                                                                className={`px-2 py-1 text-xs rounded-md border transition-colors ${
+                                                                    isSelected
+                                                                        ? 'bg-primary text-primary-foreground border-primary'
+                                                                        : 'bg-background hover:bg-muted border-input'
+                                                                }`}
+                                                            >
+                                                                {option.label}
+                                                            </button>
+                                                        );
+                                                    })}
                                                 </div>
                                             </div>
                                         )}
diff --git a/frontend/src/components/ListView.tsx b/frontend/src/components/ListView.tsx
index 344fbff..bc2c29c 100644
--- a/frontend/src/components/ListView.tsx
+++ b/frontend/src/components/ListView.tsx
@@ -134,23 +134,31 @@ export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl,
             {/* Sort controls */}
             <div className="flex items-center gap-1 p-2 border-b overflow-x-auto">
                 <span className="text-xs text-muted-foreground mr-1 shrink-0">Sort:</span>
-                {sortOptions.map((option) => (
-                    <Button
-                        key={option.field}
-                        variant={sortConfig.field === option.field ? 'secondary' : 'ghost'}
-                        size="sm"
-                        className="h-7 px-2 text-xs shrink-0"
-                        onClick={() => handleSort(option.field)}
-                    >
-                        {option.label}
-                        <SortIcon field={option.field} />
-                    </Button>
-                ))}
+                {sortOptions.map((option) => {
+                    const isActive = sortConfig.field === option.field;
+                    const ariaSort: 'ascending' | 'descending' | 'none' = isActive
+                        ? (sortConfig.order === 'asc' ? 'ascending' : 'descending')
+                        : 'none';
+                    return (
+                        <Button
+                            key={option.field}
+                            variant={isActive ? 'secondary' : 'ghost'}
+                            size="sm"
+                            className="h-7 px-2 text-xs shrink-0"
+                            onClick={() => handleSort(option.field)}
+                            aria-pressed={isActive}
+                            aria-sort={ariaSort}
+                        >
+                            {option.label}
+                            <SortIcon field={option.field} />
+                        </Button>
+                    );
+                })}
             </div>
 
             {/* Listing count */}
-            <div className="px-3 py-2 text-sm text-muted-foreground border-b">
-                Showing {sortedFeatures.length.toLocaleString()} properties
+            <div className="px-3 py-2 text-sm text-muted-foreground border-b tabular-nums">
+                Showing {sortedFeatures.length.toLocaleString('en-GB')} {sortedFeatures.length === 1 ? 'property' : 'properties'}
             </div>
 
             {/* Property list */}
diff --git a/frontend/src/components/Map.tsx b/frontend/src/components/Map.tsx
index 5afec72..3cb2adb 100644
--- a/frontend/src/components/Map.tsx
+++ b/frontend/src/components/Map.tsx
@@ -42,6 +42,7 @@ export function Map(props: MapProps) {
     const updateTimeoutRef = useRef<number | null>(null);
     const isMapLoadedRef = useRef<boolean>(false);
     const lastDataLengthRef = useRef<number>(0);
+    const hasFittedOnceRef = useRef<boolean>(false);
     const poiMarkersRef = useRef<mapboxgl.Marker[]>([]);
     const isPickingPOIRef = useRef(props.isPickingPOI ?? false);
     const onPoiLocationPickRef = useRef(props.onPoiLocationPick);
@@ -103,8 +104,10 @@ export function Map(props: MapProps) {
 
         heatmap.update();
 
-        // Fit bounds only on first load or significant data change
-        if (lastDataLengthRef.current === 0 && data.features.length > 0) {
+        // Fit bounds ONLY on the very first load with data; preserve user pan/zoom forever after
+        // (without this, going from N → 0 → M results re-fits because lastDataLengthRef resets to 0)
+        if (!hasFittedOnceRef.current && data.features.length > 0) {
+            hasFittedOnceRef.current = true;
             const boundsResult = await heatmap.computeBounds({
                 clipMin: PERCENTILE_CONFIG.BOUNDS_CLIP_MIN,
                 clipMax: PERCENTILE_CONFIG.BOUNDS_CLIP_MAX,
@@ -133,6 +136,7 @@ export function Map(props: MapProps) {
         mapRef.current.on('load', function () {
             isMapLoadedRef.current = true;
             lastDataLengthRef.current = 0;
+            hasFittedOnceRef.current = false;
             updateHeatmap();
         });
         mapRef.current.on('click', function (e: mapboxgl.MapMouseEvent) {
diff --git a/frontend/src/components/StatsBar.tsx b/frontend/src/components/StatsBar.tsx
index 1c14211..e74f848 100644
--- a/frontend/src/components/StatsBar.tsx
+++ b/frontend/src/components/StatsBar.tsx
@@ -78,23 +78,23 @@ export function StatsBar({
             <div className="flex items-center gap-4 text-muted-foreground">
                 <div className="flex items-center gap-1.5">
                     <MapPin className="h-4 w-4" />
-                    <span className="font-medium text-foreground">{stats.count.toLocaleString()}</span>
-                    <span className="hidden sm:inline">listings</span>
+                    <span className="font-medium text-foreground tabular-nums">{stats.count.toLocaleString('en-GB')}</span>
+                    <span className="hidden sm:inline">{stats.count === 1 ? 'listing' : 'listings'}</span>
                 </div>
 
                 {stats.avgPrice > 0 && (
                     <>
                         <div className="hidden md:flex items-center gap-1.5">
                             <PoundSterling className="h-4 w-4" />
-                            <span>Avg: <span className="font-medium text-foreground">{formatCurrency(stats.avgPrice)}</span></span>
+                            <span>Avg price <span className="font-medium text-foreground tabular-nums">{formatCurrency(stats.avgPrice)}</span></span>
                         </div>
                         <div className="hidden lg:flex items-center gap-1.5">
                             <BarChart3 className="h-4 w-4" />
-                            <span>Avg &pound;/m&sup2;: <span className="font-medium text-foreground">{formatCurrency(stats.avgPricePerSqm)}</span></span>
+                            <span><span className="font-medium text-foreground tabular-nums">{formatCurrency(stats.avgPricePerSqm)}</span>/m&sup2;</span>
                         </div>
                         <div className="hidden lg:flex items-center gap-1.5">
                             <Maximize2 className="h-4 w-4" />
-                            <span>Avg: <span className="font-medium text-foreground">{Math.round(stats.avgSize)} m&sup2;</span></span>
+                            <span>Size <span className="font-medium text-foreground tabular-nums">{Math.round(stats.avgSize)} m&sup2;</span></span>
                         </div>
                     </>
                 )}
diff --git a/frontend/src/components/StreamingProgressBar.tsx b/frontend/src/components/StreamingProgressBar.tsx
index 74da47c..d3ac4ef 100644
--- a/frontend/src/components/StreamingProgressBar.tsx
+++ b/frontend/src/components/StreamingProgressBar.tsx
@@ -33,8 +33,8 @@ export function StreamingProgressBar({ progress, isLoading, onCancel }: Streamin
               <div
                 className="h-full bg-primary transition-all duration-300 ease-out rounded-full"
                 style={{
-                  width: progress.total
-                    ? `${Math.min((progress.count / progress.total) * 100, 100)}%`
+                  width: progress.total && progress.total > 0
+                    ? `${Math.min(Math.max((progress.count / progress.total) * 100, 0), 100)}%`
                     : '100%',
                   animation: progress.total ? undefined : 'pulse 1.5s ease-in-out infinite',
                 }}
diff --git a/frontend/src/components/TaskIndicator.tsx b/frontend/src/components/TaskIndicator.tsx
index b5afead..0f6f960 100644
--- a/frontend/src/components/TaskIndicator.tsx
+++ b/frontend/src/components/TaskIndicator.tsx
@@ -63,7 +63,10 @@ export function TaskIndicator({
     const activeTask = activeTaskId ? tasks[activeTaskId] : undefined;
     const taskStatus = activeTask ? (activeTask.status as TaskStatus) : null;
     const taskResult = activeTask?.phase ? taskStateToResult(activeTask) : null;
-    const progressPercentage = (activeTask?.progress ?? 0) * 100;
+    const rawProgress = activeTask?.progress ?? 0;
+    const progressPercentage = Number.isFinite(rawProgress)
+        ? Math.min(Math.max(rawProgress * 100, 0), 100)
+        : 0;
     const processed = activeTask?.processed ?? null;
     const total = activeTask?.total ?? null;