docs/docs/configuration/reference.md

@@ -810,8 +810,6 @@ cameras:
       # NOTE: This must be different than any camera names, but can match with another zone on another
       #       camera.
       front_steps:
-        # Optional: A friendly name or descriptive text for the zones
-        friendly_name: ""
         # Required: List of x,y coordinates to define the polygon of the zone.
         # NOTE: Presence in a zone is evaluated only based on the bottom center of the objects bounding box.
         coordinates: 0.033,0.306,0.324,0.138,0.439,0.185,0.042,0.428

docs/docs/configuration/zones.md

@@ -27,7 +27,6 @@ cameras:
           - entire_yard
     zones:
       entire_yard:
-        friendly_name: Entire yard # You can use characters from any language text
         coordinates: ...
 ```
 
@@ -45,10 +44,8 @@ cameras:
           - edge_yard
     zones:
       edge_yard:
-        friendly_name: Edge yard # You can use characters from any language text
         coordinates: ...
       inner_yard:
-        friendly_name: Inner yard # You can use characters from any language text
         coordinates: ...
 ```
 
@@ -62,7 +59,6 @@ cameras:
         - entire_yard
     zones:
       entire_yard:
-        friendly_name: Entire yard
         coordinates: ...
 ```
 
@@ -86,7 +82,6 @@ cameras:
 
 Only car objects can trigger the `front_yard_street` zone and only person can trigger the `entire_yard`. Objects will be tracked for any `person` that enter anywhere in the yard, and for cars only if they enter the street.
 
-
 ### Zone Loitering
 
 Sometimes objects are expected to be passing through a zone, but an object loitering in an area is unexpected. Zones can be configured to have a minimum loitering time after which the object will be considered in the zone.

frigate/api/classification.py

@@ -662,11 +662,8 @@ def delete_classification_dataset_images(
         if os.path.isfile(file_path):
             os.unlink(file_path)
 
-    if os.path.exists(folder) and not os.listdir(folder):
-        os.rmdir(folder)
-
     return JSONResponse(
-        content=({"success": True, "message": "Successfully deleted images."}),
+        content=({"success": True, "message": "Successfully deleted faces."}),
         status_code=200,
     )
 
@@ -726,7 +723,7 @@ def categorize_classification_image(request: Request, name: str, body: dict = No
     os.unlink(training_file)
 
     return JSONResponse(
-        content=({"success": True, "message": "Successfully categorized image."}),
+        content=({"success": True, "message": "Successfully deleted faces."}),
         status_code=200,
     )
 
@@ -764,7 +761,7 @@ def delete_classification_train_images(request: Request, name: str, body: dict =
             os.unlink(file_path)
 
     return JSONResponse(
-        content=({"success": True, "message": "Successfully deleted images."}),
+        content=({"success": True, "message": "Successfully deleted faces."}),
         status_code=200,
     )
 

frigate/config/camera/zone.py

@@ -13,9 +13,6 @@ logger = logging.getLogger(__name__)
 
 
 class ZoneConfig(BaseModel):
-    friendly_name: Optional[str] = Field(
-        None, title="Zone friendly name used in the Frigate UI."
-    )
     filters: dict[str, FilterConfig] = Field(
         default_factory=dict, title="Zone filters."
     )

frigate/data_processing/post/audio_transcription.py

@@ -9,6 +9,7 @@ from typing import Optional
 from faster_whisper import WhisperModel
 from peewee import DoesNotExist
 
+from frigate.comms.embeddings_updater import EmbeddingsRequestEnum
 from frigate.comms.inter_process import InterProcessRequestor
 from frigate.config import FrigateConfig
 from frigate.const import (
@@ -31,13 +32,11 @@ class AudioTranscriptionPostProcessor(PostProcessorApi):
         self,
         config: FrigateConfig,
         requestor: InterProcessRequestor,
-        embeddings,
         metrics: DataProcessorMetrics,
     ):
         super().__init__(config, metrics, None)
         self.config = config
         self.requestor = requestor
-        self.embeddings = embeddings
         self.recognizer = None
         self.transcription_lock = threading.Lock()
         self.transcription_thread = None
@@ -129,7 +128,10 @@ class AudioTranscriptionPostProcessor(PostProcessorApi):
             )
 
             # Embed the description
-            self.embeddings.embed_description(event_id, transcription)
+            self.requestor.send_data(
+                EmbeddingsRequestEnum.embed_description.value,
+                {"id": event_id, "description": transcription},
+            )
 
         except DoesNotExist:
             logger.debug("No recording found for audio transcription post-processing")

frigate/embeddings/maintainer.py

@@ -226,9 +226,7 @@ class EmbeddingMaintainer(threading.Thread):
             for c in self.config.cameras.values()
         ):
             self.post_processors.append(
-                AudioTranscriptionPostProcessor(
+                AudioTranscriptionPostProcessor(self.config, self.requestor, metrics)
-                    self.config, self.requestor, self.embeddings, metrics
-                )
             )
 
         semantic_trigger_processor: SemanticTriggerProcessor | None = None

frigate/util/model.py

@@ -369,10 +369,6 @@ def get_ort_providers(
                     "enable_cpu_mem_arena": False,
                 }
             )
-        elif provider == "AzureExecutionProvider":
-            # Skip Azure provider - not typically available on local hardware
-            # and prevents fallback to OpenVINO when it's the first provider
-            continue
         else:
             providers.append(provider)
             options.append({})

web/src/components/camera/CameraNameLabel.tsx

@@ -2,19 +2,12 @@ import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { useCameraFriendlyName } from "@/hooks/use-camera-friendly-name";
 import { CameraConfig } from "@/types/frigateConfig";
-import { useZoneFriendlyName } from "@/hooks/use-zone-friendly-name";
 
 interface CameraNameLabelProps
   extends React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> {
   camera?: string | CameraConfig;
 }
 
-interface ZoneNameLabelProps
-  extends React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> {
-  zone: string;
-  camera?: string;
-}
-
 const CameraNameLabel = React.forwardRef<
   React.ElementRef<typeof LabelPrimitive.Root>,
   CameraNameLabelProps
@@ -28,17 +21,4 @@ const CameraNameLabel = React.forwardRef<
 });
 CameraNameLabel.displayName = LabelPrimitive.Root.displayName;
 
-const ZoneNameLabel = React.forwardRef<
+export { CameraNameLabel };
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  ZoneNameLabelProps
->(({ className, zone, camera, ...props }, ref) => {
-  const displayName = useZoneFriendlyName(zone, camera);
-  return (
-    <LabelPrimitive.Root ref={ref} className={className} {...props}>
-      {displayName}
-    </LabelPrimitive.Root>
-  );
-});
-ZoneNameLabel.displayName = LabelPrimitive.Root.displayName;
-
-export { CameraNameLabel, ZoneNameLabel };

web/src/components/card/SearchThumbnailFooter.tsx

@@ -14,6 +14,7 @@ type SearchThumbnailProps = {
   findSimilar: () => void;
   refreshResults: () => void;
   showTrackingDetails: () => void;
+  showSnapshot: () => void;
   addTrigger: () => void;
 };
 
@@ -23,6 +24,7 @@ export default function SearchThumbnailFooter({
   findSimilar,
   refreshResults,
   showTrackingDetails,
+  showSnapshot,
   addTrigger,
 }: SearchThumbnailProps) {
   const { t } = useTranslation(["views/search"]);
@@ -60,6 +62,7 @@ export default function SearchThumbnailFooter({
           findSimilar={findSimilar}
           refreshResults={refreshResults}
           showTrackingDetails={showTrackingDetails}
+          showSnapshot={showSnapshot}
           addTrigger={addTrigger}
         />
       </div>

web/src/components/filter/CameraGroupSelector.tsx

@@ -76,7 +76,7 @@ import { CameraStreamingDialog } from "../settings/CameraStreamingDialog";
 import { DialogTrigger } from "@radix-ui/react-dialog";
 import { useStreamingSettings } from "@/context/streaming-settings-provider";
 import { Trans, useTranslation } from "react-i18next";
-import { CameraNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 import { useAllowedCameras } from "@/hooks/use-allowed-cameras";
 import { useIsCustomRole } from "@/hooks/use-is-custom-role";
 

web/src/components/filter/CamerasFilterButton.tsx

@@ -190,7 +190,7 @@ export function CamerasFilterContent({
               key={item}
               isChecked={currentCameras?.includes(item) ?? false}
               label={item}
-              type={"camera"}
+              isCameraName={true}
               disabled={
                 mainCamera !== undefined &&
                 currentCameras !== undefined &&

web/src/components/filter/FilterSwitch.tsx

@@ -1,39 +1,29 @@
 import { Switch } from "../ui/switch";
 import { Label } from "../ui/label";
-import { CameraNameLabel, ZoneNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 
 type FilterSwitchProps = {
   label: string;
   disabled?: boolean;
   isChecked: boolean;
   isCameraName?: boolean;
-  type?: string;
-  extraValue?: string;
   onCheckedChange: (checked: boolean) => void;
 };
 export default function FilterSwitch({
   label,
   disabled = false,
   isChecked,
-  type = "",
+  isCameraName = false,
-  extraValue = "",
   onCheckedChange,
 }: FilterSwitchProps) {
   return (
     <div className="flex items-center justify-between gap-1">
-      {type === "camera" ? (
+      {isCameraName ? (
         <CameraNameLabel
           className={`mx-2 w-full cursor-pointer text-sm font-medium leading-none text-primary smart-capitalize peer-disabled:cursor-not-allowed peer-disabled:opacity-70 ${disabled ? "text-secondary-foreground" : ""}`}
           htmlFor={label}
           camera={label}
         />
-      ) : type === "zone" ? (
-        <ZoneNameLabel
-          className={`mx-2 w-full cursor-pointer text-sm font-medium leading-none text-primary smart-capitalize peer-disabled:cursor-not-allowed peer-disabled:opacity-70 ${disabled ? "text-secondary-foreground" : ""}`}
-          htmlFor={label}
-          camera={extraValue}
-          zone={label}
-        />
       ) : (
         <Label
           className={`mx-2 w-full cursor-pointer text-primary smart-capitalize ${disabled ? "text-secondary-foreground" : ""}`}

web/src/components/filter/ReviewFilterGroup.tsx

@@ -550,8 +550,7 @@ export function GeneralFilterContent({
               {allZones.map((item) => (
                 <FilterSwitch
                   key={item}
-                  label={item}
+                  label={item.replaceAll("_", " ")}
-                  type={"zone"}
                   isChecked={filter.zones?.includes(item) ?? false}
                   onCheckedChange={(isChecked) => {
                     if (isChecked) {

web/src/components/input/InputWithTags.tsx

@@ -53,7 +53,7 @@ import { FrigateConfig } from "@/types/frigateConfig";
 import { MdImageSearch } from "react-icons/md";
 import { useTranslation } from "react-i18next";
 import { getTranslatedLabel } from "@/utils/i18n";
-import { CameraNameLabel, ZoneNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 
 type InputWithTagsProps = {
   inputFocused: boolean;
@@ -831,8 +831,6 @@ export default function InputWithTags({
                               getTranslatedLabel(value)
                             ) : filterType === "cameras" ? (
                               <CameraNameLabel camera={value} />
-                            ) : filterType === "zones" ? (
-                              <ZoneNameLabel zone={value} />
                             ) : (
                               value.replaceAll("_", " ")
                             )}
@@ -936,11 +934,6 @@ export default function InputWithTags({
                         <CameraNameLabel camera={suggestion} />
                         {")"}
                       </>
-                    ) : currentFilterType === "zones" ? (
-                      <>
-                        {suggestion} {" ("} <ZoneNameLabel zone={suggestion} />
-                        {")"}
-                      </>
                     ) : (
                       suggestion
                     )
@@ -950,8 +943,6 @@ export default function InputWithTags({
                       {currentFilterType ? (
                         currentFilterType === "cameras" ? (
                           <CameraNameLabel camera={suggestion} />
-                        ) : currentFilterType === "zones" ? (
-                          <ZoneNameLabel zone={suggestion} />
                         ) : (
                           formatFilterValues(currentFilterType, suggestion)
                         )

web/src/components/menu/LiveContextMenu.tsx

@@ -47,7 +47,7 @@ import {
 import { useTranslation } from "react-i18next";
 import { useDateLocale } from "@/hooks/use-date-locale";
 import { useIsAdmin } from "@/hooks/use-is-admin";
-import { CameraNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 
 type LiveContextMenuProps = {
   className?: string;

web/src/components/menu/SearchResultActions.tsx

@@ -6,7 +6,10 @@ import { toast } from "sonner";
 import axios from "axios";
 import { LuCamera, LuDownload, LuTrash2 } from "react-icons/lu";
 import { FiMoreVertical } from "react-icons/fi";
+import { FaArrowsRotate } from "react-icons/fa6";
 import { MdImageSearch } from "react-icons/md";
+import FrigatePlusIcon from "@/components/icons/FrigatePlusIcon";
+import { isMobileOnly } from "react-device-detect";
 import { buttonVariants } from "@/components/ui/button";
 import {
   ContextMenu,
@@ -30,18 +33,23 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import useSWR from "swr";
 
 import { Trans, useTranslation } from "react-i18next";
 import { BsFillLightningFill } from "react-icons/bs";
 import BlurredIconButton from "../button/BlurredIconButton";
-import { PiPath } from "react-icons/pi";
 
 type SearchResultActionsProps = {
   searchResult: SearchResult;
   findSimilar: () => void;
   refreshResults: () => void;
   showTrackingDetails: () => void;
+  showSnapshot: () => void;
   addTrigger: () => void;
   isContextMenu?: boolean;
   children?: ReactNode;
@@ -52,6 +60,7 @@ export default function SearchResultActions({
   findSimilar,
   refreshResults,
   showTrackingDetails,
+  showSnapshot,
   addTrigger,
   isContextMenu = false,
   children,
@@ -120,7 +129,7 @@ export default function SearchResultActions({
           aria-label={t("itemMenu.viewTrackingDetails.aria")}
           onClick={showTrackingDetails}
         >
-          <PiPath className="mr-2 size-4" />
+          <FaArrowsRotate className="mr-2 size-4" />
           <span>{t("itemMenu.viewTrackingDetails.label")}</span>
         </MenuItem>
       )}
@@ -143,14 +152,18 @@ export default function SearchResultActions({
             <span>{t("itemMenu.addTrigger.label")}</span>
           </MenuItem>
         )}
-      {config?.semantic_search?.enabled &&
+      {isMobileOnly &&
-        searchResult.data.type == "object" && (
+        config?.plus?.enabled &&
+        searchResult.has_snapshot &&
+        searchResult.end_time &&
+        searchResult.data.type == "object" &&
+        !searchResult.plus_id && (
           <MenuItem
-            aria-label={t("itemMenu.findSimilar.aria")}
+            aria-label={t("itemMenu.submitToPlus.aria")}
-            onClick={findSimilar}
+            onClick={showSnapshot}
           >
-            <MdImageSearch className="mr-2 size-4" />
+            <FrigatePlusIcon className="mr-2 size-4 cursor-pointer text-primary" />
-            <span>{t("itemMenu.findSimilar.label")}</span>
+            <span>{t("itemMenu.submitToPlus.label")}</span>
           </MenuItem>
         )}
       <MenuItem
@@ -198,6 +211,44 @@ export default function SearchResultActions({
         </ContextMenu>
       ) : (
         <>
+          {config?.semantic_search?.enabled &&
+            searchResult.data.type == "object" && (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <BlurredIconButton
+                    onClick={findSimilar}
+                    aria-label={t("itemMenu.findSimilar.aria")}
+                  >
+                    <MdImageSearch className="size-5" />
+                  </BlurredIconButton>
+                </TooltipTrigger>
+                <TooltipContent>
+                  {t("itemMenu.findSimilar.label")}
+                </TooltipContent>
+              </Tooltip>
+            )}
+
+          {!isMobileOnly &&
+            config?.plus?.enabled &&
+            searchResult.has_snapshot &&
+            searchResult.end_time &&
+            searchResult.data.type == "object" &&
+            !searchResult.plus_id && (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <BlurredIconButton
+                    onClick={showSnapshot}
+                    aria-label={t("itemMenu.submitToPlus.aria")}
+                  >
+                    <FrigatePlusIcon className="size-5" />
+                  </BlurredIconButton>
+                </TooltipTrigger>
+                <TooltipContent>
+                  {t("itemMenu.submitToPlus.label")}
+                </TooltipContent>
+              </Tooltip>
+            )}
+
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
               <BlurredIconButton aria-label={t("itemMenu.more.aria")}>

web/src/components/mobile/MobilePage.tsx

@@ -4,7 +4,6 @@ import {
   useEffect,
   useState,
   useCallback,
-  useRef,
 } from "react";
 import { createPortal } from "react-dom";
 import { motion, AnimatePresence } from "framer-motion";
@@ -122,20 +121,17 @@ export function MobilePagePortal({
 type MobilePageContentProps = {
   children: React.ReactNode;
   className?: string;
-  scrollerRef?: React.RefObject<HTMLDivElement>;
 };
 
 export function MobilePageContent({
   children,
   className,
-  scrollerRef,
 }: MobilePageContentProps) {
   const context = useContext(MobilePageContext);
   if (!context)
     throw new Error("MobilePageContent must be used within MobilePage");
 
   const [isVisible, setIsVisible] = useState(context.open);
-  const containerRef = useRef<HTMLDivElement | null>(null);
 
   useEffect(() => {
     if (context.open) {
@@ -144,27 +140,15 @@ export function MobilePageContent({
   }, [context.open]);
 
   const handleAnimationComplete = () => {
-    if (context.open) {
+    if (!context.open) {
-      // After opening animation completes, ensure scroller is at the top
-      if (scrollerRef?.current) {
-        scrollerRef.current.scrollTop = 0;
-      }
-    } else {
       setIsVisible(false);
     }
   };
 
-  useEffect(() => {
-    if (context.open && scrollerRef?.current) {
-      scrollerRef.current.scrollTop = 0;
-    }
-  }, [context.open, scrollerRef]);
-
   return (
     <AnimatePresence>
       {isVisible && (
         <motion.div
-          ref={containerRef}
           className={cn(
             "fixed inset-0 z-50 mb-12 bg-background",
             isPWA && "mb-16",

web/src/components/overlay/ClassificationSelectionDialog.tsx

@@ -97,12 +97,14 @@ export default function ClassificationSelectionDialog({
 
   return (
     <div className={className ?? "flex"}>
+      {newClass && (
         <TextEntryDialog
-        open={newClass}
+          open={true}
           setOpen={setNewClass}
           title={t("createCategory.new")}
           onSave={(newCat) => onCategorizeImage(newCat)}
         />
+      )}
 
       <Tooltip>
         <Selector>

web/src/components/overlay/CreateRoleDialog.tsx

@@ -25,7 +25,7 @@ import {
 } from "@/components/ui/dialog";
 import { useTranslation } from "react-i18next";
 import { FrigateConfig } from "@/types/frigateConfig";
-import { CameraNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 import { isDesktop, isMobile } from "react-device-detect";
 import { cn } from "@/lib/utils";
 import {

web/src/components/overlay/EditRoleCamerasDialog.tsx

@@ -24,7 +24,7 @@ import {
 } from "@/components/ui/dialog";
 import { Trans, useTranslation } from "react-i18next";
 import { FrigateConfig } from "@/types/frigateConfig";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 
 type EditRoleCamerasOverlayProps = {
   show: boolean;

web/src/components/overlay/MobileCameraDrawer.tsx

@@ -4,7 +4,7 @@ import { Button } from "../ui/button";
 import { FaVideo } from "react-icons/fa";
 import { isMobile } from "react-device-detect";
 import { useTranslation } from "react-i18next";
-import { CameraNameLabel } from "../camera/FriendlyNameLabel";
+import { CameraNameLabel } from "../camera/CameraNameLabel";
 
 type MobileCameraDrawerProps = {
   allCameras: string[];

web/src/components/overlay/ObjectTrackOverlay.tsx

@@ -12,7 +12,6 @@ import { TooltipPortal } from "@radix-ui/react-tooltip";
 import { cn } from "@/lib/utils";
 import { useTranslation } from "react-i18next";
 import { Event } from "@/types/event";
-import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
 
 // Use a small tolerance (10ms) for browsers with seek precision by-design issues
 const TOLERANCE = 0.01;
@@ -115,10 +114,6 @@ export default function ObjectTrackOverlay({
     { revalidateOnFocus: false },
   );
 
-  const getZonesFriendlyNames = (zones: string[], config: FrigateConfig) => {
-    return zones?.map((zone) => resolveZoneName(config, zone)) ?? [];
-  };
-
   const timelineResults = useMemo(() => {
     // Group timeline entries by source_id
     if (!timelineData) return selectedObjectIds.map(() => []);
@@ -132,19 +127,8 @@ export default function ObjectTrackOverlay({
     }
 
     // Return timeline arrays in the same order as selectedObjectIds
-    return selectedObjectIds.map((id) => {
+    return selectedObjectIds.map((id) => grouped[id] || []);
-      const entries = grouped[id] || [];
+  }, [selectedObjectIds, timelineData]);
-      return entries.map((event) => ({
-        ...event,
-        data: {
-          ...event.data,
-          zones_friendly_names: config
-            ? getZonesFriendlyNames(event.data?.zones, config)
-            : [],
-        },
-      }));
-    });
-  }, [selectedObjectIds, timelineData, config]);
 
   const typeColorMap = useMemo(
     () => ({

web/src/components/overlay/detail/AnnotationSettingsPane.tsx

@@ -141,13 +141,12 @@ export function AnnotationSettingsPane({
       <Form {...form}>
         <form
           onSubmit={form.handleSubmit(onSubmit)}
-          className="flex flex-1 flex-col space-y-3"
+          className="flex flex-1 flex-col space-y-6"
         >
           <FormField
             control={form.control}
             name="annotationOffset"
             render={({ field }) => (
-              <>
               <FormItem className="flex flex-row items-start justify-between space-x-2">
                 <div className="flex flex-col gap-1">
                   <FormLabel>
@@ -158,6 +157,20 @@ export function AnnotationSettingsPane({
                       trackingDetails.annotationSettings.offset.millisecondsToOffset
                     </Trans>
                     <FormMessage />
+                    <div className="mt-2">
+                      {t("trackingDetails.annotationSettings.offset.tips")}
+                      <div className="mt-2 flex items-center text-primary">
+                        <Link
+                          to={getLocaleDocUrl("configuration/reference")}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="inline"
+                        >
+                          {t("readTheDocumentation", { ns: "common" })}
+                          <LuExternalLink className="ml-2 inline-flex size-3" />
+                        </Link>
+                      </div>
+                    </div>
                   </FormDescription>
                 </div>
                 <div className="flex flex-col gap-3">
@@ -172,21 +185,6 @@ export function AnnotationSettingsPane({
                   </div>
                 </div>
               </FormItem>
-                <div className="mt-1 text-sm text-secondary-foreground">
-                  {t("trackingDetails.annotationSettings.offset.tips")}
-                  <div className="mt-2 flex items-center text-primary-variant">
-                    <Link
-                      to={getLocaleDocUrl("configuration/reference")}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="inline"
-                    >
-                      {t("readTheDocumentation", { ns: "common" })}
-                      <LuExternalLink className="ml-2 inline-flex size-3" />
-                    </Link>
-                  </div>
-                </div>
-              </>
             )}
           />
 

web/src/components/overlay/detail/DetailActionsMenu.tsx

@@ -111,23 +111,6 @@ export default function DetailActionsMenu({
               </div>
             </DropdownMenuItem>
           )}
-
-          {config?.semantic_search.enabled && search.data.type == "object" && (
-            <DropdownMenuItem
-              onClick={() => {
-                setIsOpen(false);
-                setTimeout(() => {
-                  navigate(
-                    `/settings?page=triggers&camera=${search.camera}&event_id=${search.id}`,
-                  );
-                }, 0);
-              }}
-            >
-              <div className="flex cursor-pointer items-center gap-2">
-                <span>{t("itemMenu.addTrigger.label")}</span>
-              </div>
-            </DropdownMenuItem>
-          )}
         </DropdownMenuContent>
       </DropdownMenuPortal>
     </DropdownMenu>

web/src/components/overlay/detail/ObjectPath.tsx

@@ -8,9 +8,6 @@ import {
 import { TooltipPortal } from "@radix-ui/react-tooltip";
 import { getLifecycleItemDescription } from "@/utils/lifecycleUtil";
 import { useTranslation } from "react-i18next";
-import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
-import { FrigateConfig } from "@/types/frigateConfig";
-import useSWR from "swr";
 
 type ObjectPathProps = {
   positions?: Position[];
@@ -45,31 +42,16 @@ export function ObjectPath({
   visible = true,
 }: ObjectPathProps) {
   const { t } = useTranslation(["views/explore"]);
-  const { data: config } = useSWR<FrigateConfig>("config");
   const getAbsolutePositions = useCallback(() => {
     if (!imgRef.current || !positions) return [];
     const imgRect = imgRef.current.getBoundingClientRect();
-    return positions.map((pos) => {
+    return positions.map((pos) => ({
-      return {
       x: pos.x * imgRect.width,
       y: pos.y * imgRect.height,
       timestamp: pos.timestamp,
-        lifecycle_item: pos.lifecycle_item?.data?.zones
+      lifecycle_item: pos.lifecycle_item,
-          ? {
+    }));
-              ...pos.lifecycle_item,
+  }, [positions, imgRef]);
-              data: {
-                ...pos.lifecycle_item?.data,
-                zones_friendly_names: pos.lifecycle_item?.data.zones.map(
-                  (zone) => {
-                    return resolveZoneName(config, zone);
-                  },
-                ),
-              },
-            }
-          : pos.lifecycle_item,
-      };
-    });
-  }, [imgRef, positions, config]);
 
   const generateStraightPath = useCallback((points: Position[]) => {
     if (!points || points.length < 2) return "";

web/src/components/overlay/detail/SearchDetailDialog.tsx

@@ -80,7 +80,7 @@ import TextEntryDialog from "@/components/overlay/dialog/TextEntryDialog";
 import { Trans, useTranslation } from "react-i18next";
 import { useIsAdmin } from "@/hooks/use-is-admin";
 import { getTranslatedLabel } from "@/utils/i18n";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import { DialogPortal } from "@radix-ui/react-dialog";
 import { useDetailStream } from "@/context/detail-stream-context";
 import { PiSlidersHorizontalBold } from "react-icons/pi";
@@ -1242,9 +1242,6 @@ function ObjectDetailsTab({
         </div>
       </div>
 
-      {search.data.type === "object" &&
-        !search.plus_id &&
-        config?.plus?.enabled && (
       <div
         className={cn(
           "my-2 flex w-full flex-col justify-between gap-1.5",
@@ -1345,7 +1342,6 @@ function ObjectDetailsTab({
           )}
         </div>
       </div>
-        )}
       <div className="flex flex-col gap-1.5">
         {config?.cameras[search.camera].objects.genai.enabled &&
         !search.end_time &&

web/src/components/overlay/detail/TrackingDetails.tsx

@@ -23,7 +23,6 @@ import { Link, useNavigate } from "react-router-dom";
 import { getLifecycleItemDescription } from "@/utils/lifecycleUtil";
 import { useTranslation } from "react-i18next";
 import { getTranslatedLabel } from "@/utils/i18n";
-import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
 import { Badge } from "@/components/ui/badge";
 import { HiDotsHorizontal } from "react-icons/hi";
 import axios from "axios";
@@ -74,12 +73,6 @@ export function TrackingDetails({
 
   const { data: config } = useSWR<FrigateConfig>("config");
 
-  eventSequence?.map((event) => {
-    event.data.zones_friendly_names = event.data?.zones?.map((zone) => {
-      return resolveZoneName(config, zone);
-    });
-  });
-
   // Use manualOverride (set when seeking in image mode) if present so
   // lifecycle rows and overlays follow image-mode seeks. Otherwise fall
   // back to currentTime used for video mode.
@@ -464,7 +457,7 @@ export function TrackingDetails({
         >
           {config?.cameras[event.camera]?.onvif.autotracking
             .enabled_in_config && (
-            <div className="mb-2 ml-3 text-sm text-danger">
+            <div className="mb-2 text-sm text-danger">
               {t("trackingDetails.autoTrackingTips")}
             </div>
           )}
@@ -720,8 +713,7 @@ function LifecycleIconRow({
                           }}
                         />
                         <span className="smart-capitalize">
-                          {item.data?.zones_friendly_names?.[zidx] ??
+                          {zone.replaceAll("_", " ")}
-                            zone.replaceAll("_", " ")}
                         </span>
                       </Badge>
                     );

web/src/components/overlay/dialog/PlatformAwareDialog.tsx

@@ -20,9 +20,7 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { cn } from "@/lib/utils";
 import { isMobile } from "react-device-detect";
-import { useRef } from "react";
 
 type PlatformAwareDialogProps = {
   trigger: JSX.Element;
@@ -81,8 +79,6 @@ export function PlatformAwareSheet({
   open,
   onOpenChange,
 }: PlatformAwareSheetProps) {
-  const scrollerRef = useRef<HTMLDivElement>(null);
-
   if (isMobile) {
     return (
       <MobilePage open={open} onOpenChange={onOpenChange}>
@@ -90,22 +86,14 @@ export function PlatformAwareSheet({
           {trigger}
         </MobilePageTrigger>
         <MobilePagePortal>
-          <MobilePageContent
+          <MobilePageContent className="h-full overflow-hidden">
-            className="flex h-full flex-col"
-            scrollerRef={scrollerRef}
-          >
             <MobilePageHeader
               className="mx-2"
               onClose={() => onOpenChange(false)}
             >
               <MobilePageTitle>{title}</MobilePageTitle>
             </MobilePageHeader>
-            <div
+            <div className={contentClassName}>{content}</div>
-              ref={scrollerRef}
-              className={cn("flex-1 overflow-y-auto", contentClassName)}
-            >
-              {content}
-            </div>
           </MobilePageContent>
         </MobilePagePortal>
       </MobilePage>

web/src/components/overlay/dialog/RestartDialog.tsx

@@ -98,11 +98,7 @@ export default function RestartDialog({
         open={restartingSheetOpen}
         onOpenChange={() => setRestartingSheetOpen(false)}
       >
-        <SheetContent
+        <SheetContent side="top" onInteractOutside={(e) => e.preventDefault()}>
-          side="top"
-          onInteractOutside={(e) => e.preventDefault()}
-          className="[&>button:first-of-type]:hidden"
-        >
           <div className="flex flex-col items-center">
             <ActivityIndicator />
             <SheetHeader className="mt-5 text-center">

web/src/components/overlay/dialog/SearchFilterDialog.tsx

@@ -230,7 +230,6 @@ export default function SearchFilterDialog({
     <PlatformAwareSheet
       trigger={trigger}
       title={t("more")}
-      titleClassName="mb-5 -mt-3"
       content={content}
       contentClassName={cn(
         "w-auto lg:min-w-[275px] scrollbar-container h-full overflow-auto px-4",
@@ -430,8 +429,7 @@ export function ZoneFilterContent({
               {allZones.map((item) => (
                 <FilterSwitch
                   key={item}
-                  label={item}
+                  label={item.replaceAll("_", " ")}
-                  type={"zone"}
                   isChecked={zones?.includes(item) ?? false}
                   onCheckedChange={(isChecked) => {
                     if (isChecked) {

web/src/components/settings/PolygonCanvas.tsx

@@ -262,17 +262,13 @@ export function PolygonCanvas({
   };
 
   useEffect(() => {
-    if (activePolygonIndex === undefined || !polygons?.length) {
+    if (activePolygonIndex === undefined || !polygons) {
       return;
     }
 
     const updatedPolygons = [...polygons];
     const activePolygon = updatedPolygons[activePolygonIndex];
 
-    if (!activePolygon) {
-      return;
-    }
-
     // add default points order for already completed polygons
     if (!activePolygon.pointsOrder && activePolygon.isFinished) {
       updatedPolygons[activePolygonIndex] = {

web/src/components/settings/PolygonItem.tsx

@@ -179,7 +179,7 @@ export default function PolygonItem({
           if (res.status === 200) {
             toast.success(
               t("masksAndZones.form.polygonDrawing.delete.success", {
-                name: polygon?.friendly_name ?? polygon?.name,
+                name: polygon?.name,
               }),
               {
                 position: "top-center",
@@ -261,9 +261,7 @@ export default function PolygonItem({
               }}
             />
           )}
-          <p className="cursor-default">
+          <p className="cursor-default">{polygon.name}</p>
-            {polygon.friendly_name ?? polygon.name}
-          </p>
         </div>
         <AlertDialog
           open={deleteDialogOpen}
@@ -280,7 +278,7 @@ export default function PolygonItem({
                 ns="views/settings"
                 values={{
                   type: polygon.type.replace("_", " "),
-                  name: polygon.friendly_name ?? polygon.name,
+                  name: polygon.name,
                 }}
               >
                 masksAndZones.form.polygonDrawing.delete.desc

web/src/components/settings/ZoneEditPane.tsx

@@ -34,7 +34,6 @@ import { Link } from "react-router-dom";
 import { LuExternalLink } from "react-icons/lu";
 import { useDocDomain } from "@/hooks/use-doc-domain";
 import { getTranslatedLabel } from "@/utils/i18n";
-import NameAndIdFields from "../input/NameAndIdFields";
 
 type ZoneEditPaneProps = {
   polygons?: Polygon[];
@@ -147,37 +146,15 @@ export default function ZoneEditPane({
               "masksAndZones.form.zoneName.error.mustNotContainPeriod",
             ),
           },
-        ),
-      friendly_name: z
-        .string()
-        .min(2, {
-          message: t(
-            "masksAndZones.form.zoneName.error.mustBeAtLeastTwoCharacters",
-          ),
-        })
-        .refine(
-          (value: string) => {
-            return !cameras.map((cam) => cam.name).includes(value);
-          },
-          {
-            message: t(
-              "masksAndZones.form.zoneName.error.mustNotBeSameWithCamera",
-            ),
-          },
         )
-        .refine(
+        .refine((value: string) => /^[a-zA-Z0-9_-]+$/.test(value), {
-          (value: string) => {
+          message: t("masksAndZones.form.zoneName.error.hasIllegalCharacter"),
-            const otherPolygonNames =
+        })
-              polygons
+        .refine((value: string) => /[a-zA-Z]/.test(value), {
-                ?.filter((_, index) => index !== activePolygonIndex)
+          message: t(
-                .map((polygon) => polygon.name) || [];
+            "masksAndZones.form.zoneName.error.mustHaveAtLeastOneLetter",
-
-            return !otherPolygonNames.includes(value);
-          },
-          {
-            message: t("masksAndZones.form.zoneName.error.alreadyExists"),
-          },
           ),
+        }),
       inertia: z.coerce
         .number()
         .min(1, {
@@ -270,7 +247,6 @@ export default function ZoneEditPane({
     mode: "onBlur",
     defaultValues: {
       name: polygon?.name ?? "",
-      friendly_name: polygon?.friendly_name ?? polygon?.name ?? "",
       inertia:
         polygon?.camera &&
         polygon?.name &&
@@ -310,7 +286,6 @@ export default function ZoneEditPane({
     async (
       {
         name: zoneName,
-        friendly_name,
         inertia,
         loitering_time,
         objects: form_objects,
@@ -440,14 +415,9 @@ export default function ZoneEditPane({
         }
       }
 
-      let friendlyNameQuery = "";
-      if (friendly_name) {
-        friendlyNameQuery = `&cameras.${polygon?.camera}.zones.${zoneName}.friendly_name=${encodeURIComponent(friendly_name)}`;
-      }
-
       axios
         .put(
-          `config/set?cameras.${polygon?.camera}.zones.${zoneName}.coordinates=${coordinates}${inertiaQuery}${loiteringTimeQuery}${speedThresholdQuery}${distancesQuery}${objectQueries}${friendlyNameQuery}${alertQueries}${detectionQueries}`,
+          `config/set?cameras.${polygon?.camera}.zones.${zoneName}.coordinates=${coordinates}${inertiaQuery}${loiteringTimeQuery}${speedThresholdQuery}${distancesQuery}${objectQueries}${alertQueries}${detectionQueries}`,
           {
             requires_restart: 0,
             update_topic: `config/cameras/${polygon.camera}/zones`,
@@ -457,7 +427,7 @@ export default function ZoneEditPane({
           if (res.status === 200) {
             toast.success(
               t("masksAndZones.zones.toast.success", {
-                zoneName: friendly_name || zoneName,
+                zoneName,
               }),
               {
                 position: "top-center",
@@ -571,16 +541,26 @@ export default function ZoneEditPane({
 
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)} className="mt-2 space-y-6">
-          <NameAndIdFields
+          <FormField
-            type="zone"
             control={form.control}
-            nameField="friendly_name"
+            name="name"
-            idField="name"
+            render={({ field }) => (
-            nameLabel={t("masksAndZones.zones.name.title")}
+              <FormItem>
-            nameDescription={t("masksAndZones.zones.name.tips")}
+                <FormLabel>{t("masksAndZones.zones.name.title")}</FormLabel>
-            placeholderName={t("masksAndZones.zones.name.inputPlaceHolder")}
+                <FormControl>
+                  <Input
+                    className="text-md w-full border border-input bg-background p-2 hover:bg-accent hover:text-accent-foreground dark:[color-scheme:dark]"
+                    placeholder={t("masksAndZones.zones.name.inputPlaceHolder")}
+                    {...field}
+                  />
+                </FormControl>
+                <FormDescription>
+                  {t("masksAndZones.zones.name.tips")}
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
           />
-
           <Separator className="my-2 flex bg-secondary" />
           <FormField
             control={form.control}

web/src/components/timeline/DetailStream.tsx

@@ -26,7 +26,6 @@ import { Link } from "react-router-dom";
 import { Switch } from "@/components/ui/switch";
 import { usePersistence } from "@/hooks/use-persistence";
 import { isDesktop } from "react-device-detect";
-import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
 import { PiSlidersHorizontalBold } from "react-icons/pi";
 import { MdAutoAwesome } from "react-icons/md";
 
@@ -193,7 +192,7 @@ export default function DetailStream({
       <div className="relative flex h-full flex-col">
         <div
           ref={scrollRef}
-          className="scrollbar-container flex-1 overflow-y-auto overflow-x-hidden pb-14"
+          className="scrollbar-container flex-1 overflow-y-auto pb-14"
         >
           <div className="space-y-4 py-2">
             {reviewItems?.length === 0 ? (
@@ -794,28 +793,17 @@ function ObjectTimeline({
     },
   ]);
 
-  const { data: config } = useSWR<FrigateConfig>("config");
   const timeline = useMemo(() => {
     if (!fullTimeline) {
       return fullTimeline;
     }
 
-    return fullTimeline
+    return fullTimeline.filter(
-      .filter(
       (t) =>
         t.timestamp >= review.start_time &&
         (review.end_time == undefined || t.timestamp <= review.end_time),
-      )
+    );
-      .map((event) => ({
+  }, [fullTimeline, review]);
-        ...event,
-        data: {
-          ...event.data,
-          zones_friendly_names: event.data?.zones?.map((zone) =>
-            resolveZoneName(config, zone),
-          ),
-        },
-      }));
-  }, [config, fullTimeline, review]);
 
   if (isValidating && (!timeline || timeline.length === 0)) {
     return <ActivityIndicator className="ml-2 size-3" />;
@@ -823,7 +811,7 @@ function ObjectTimeline({
 
   if (!timeline || timeline.length === 0) {
     return (
-      <div className="ml-8 text-sm text-muted-foreground">
+      <div className="py-2 text-sm text-muted-foreground">
         {t("detail.noObjectDetailData")}
       </div>
     );

web/src/components/timeline/EventMenu.tsx

@@ -55,24 +55,20 @@ export default function EventMenu({
         </DropdownMenuTrigger>
         <DropdownMenuPortal>
           <DropdownMenuContent>
-            <DropdownMenuItem
+            <DropdownMenuItem onSelect={handleObjectSelect}>
-              className="cursor-pointer"
-              onSelect={handleObjectSelect}
-            >
               {isSelected
                 ? t("itemMenu.hideObjectDetails.label")
                 : t("itemMenu.showObjectDetails.label")}
             </DropdownMenuItem>
             <DropdownMenuSeparator className="my-0.5" />
             <DropdownMenuItem
-              className="cursor-pointer"
               onSelect={() => {
                 navigate(`/explore?event_id=${event.id}`);
               }}
             >
               {t("details.item.button.viewInExplore")}
             </DropdownMenuItem>
-            <DropdownMenuItem className="cursor-pointer" asChild>
+            <DropdownMenuItem asChild>
               <a
                 download
                 href={
@@ -90,7 +86,6 @@ export default function EventMenu({
               event.data.type == "object" &&
               config?.plus?.enabled && (
                 <DropdownMenuItem
-                  className="cursor-pointer"
                   onSelect={() => {
                     setIsOpen(false);
                     onOpenUpload?.(event);
@@ -102,7 +97,6 @@ export default function EventMenu({
 
             {event.has_snapshot && config?.semantic_search?.enabled && (
               <DropdownMenuItem
-                className="cursor-pointer"
                 onSelect={() => {
                   if (onOpenSimilarity) onOpenSimilarity(event);
                   else

web/src/hooks/use-zone-friendly-name.ts

@@ -1,41 +0,0 @@
-import { FrigateConfig } from "@/types/frigateConfig";
-import { useMemo } from "react";
-import useSWR from "swr";
-
-export function resolveZoneName(
-  config: FrigateConfig | undefined,
-  zoneId: string,
-  cameraId?: string,
-) {
-  if (!config) return String(zoneId).replace(/_/g, " ");
-
-  if (cameraId) {
-    const camera = config.cameras?.[String(cameraId)];
-    const zone = camera?.zones?.[zoneId];
-    return zone?.friendly_name || String(zoneId).replace(/_/g, " ");
-  }
-
-  for (const camKey in config.cameras) {
-    if (!Object.prototype.hasOwnProperty.call(config.cameras, camKey)) continue;
-    const cam = config.cameras[camKey];
-    if (!cam?.zones) continue;
-    if (Object.prototype.hasOwnProperty.call(cam.zones, zoneId)) {
-      const zone = cam.zones[zoneId];
-      return zone?.friendly_name || String(zoneId).replace(/_/g, " ");
-    }
-  }
-
-  // Fallback: return a cleaned-up zoneId string
-  return String(zoneId).replace(/_/g, " ");
-}
-
-export function useZoneFriendlyName(zoneId: string, cameraId?: string): string {
-  const { data: config } = useSWR<FrigateConfig>("config");
-
-  const name = useMemo(
-    () => resolveZoneName(config, zoneId, cameraId),
-    [config, cameraId, zoneId],
-  );
-
-  return name;
-}

web/src/pages/Settings.tsx

@@ -42,7 +42,7 @@ import { useInitialCameraState } from "@/api/ws";
 import { useIsAdmin } from "@/hooks/use-is-admin";
 import { useTranslation } from "react-i18next";
 import TriggerView from "@/views/settings/TriggerView";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import {
   Sidebar,
   SidebarContent,
@@ -650,7 +650,7 @@ function CameraSelectButton({
                 key={item.name}
                 isChecked={item.name === selectedCamera}
                 label={item.name}
-                type={"camera"}
+                isCameraName={true}
                 onCheckedChange={(isChecked) => {
                   if (isChecked && (isEnabled || isCameraSettingsPage)) {
                     setSelectedCamera(item.name);

web/src/types/canvas.ts

@@ -11,12 +11,10 @@ export type Polygon = {
   distances: number[];
   isFinished: boolean;
   color: number[];
-  friendly_name?: string;
 };
 
 export type ZoneFormValuesType = {
   name: string;
-  friendly_name: string;
   inertia: number;
   loitering_time: number;
   isFinished: boolean;

web/src/types/frigateConfig.ts

@@ -280,7 +280,6 @@ export interface CameraConfig {
       speed_threshold: number;
       objects: string[];
       color: number[];
-      friendly_name?: string;
     };
   };
 }

web/src/types/timeline.ts

@@ -22,7 +22,6 @@ export type TrackingDetailsSequence = {
     attribute: string;
     attribute_box?: [number, number, number, number];
     zones: string[];
-    zones_friendly_names?: string[];
   };
   class_type: LifecycleClassType;
   source_id: string;

web/src/utils/lifecycleUtil.ts

@@ -1,7 +1,25 @@
 import { TrackingDetailsSequence } from "@/types/timeline";
 import { t } from "i18next";
 import { getTranslatedLabel } from "./i18n";
-import { capitalizeFirstLetter, formatList } from "./stringUtil";
+import { capitalizeFirstLetter } from "./stringUtil";
+
+function formatZonesList(zones: string[]): string {
+  if (zones.length === 0) return "";
+  if (zones.length === 1) return zones[0];
+  if (zones.length === 2) {
+    return t("list.two", {
+      0: zones[0],
+      1: zones[1],
+    });
+  }
+
+  const separatorWithSpace = t("list.separatorWithSpace", { ns: "common" });
+  const allButLast = zones.slice(0, -1).join(separatorWithSpace);
+  return t("list.many", {
+    items: allButLast,
+    last: zones[zones.length - 1],
+  });
+}
 
 export function getLifecycleItemDescription(
   lifecycleItem: TrackingDetailsSequence,
@@ -24,9 +42,7 @@ export function getLifecycleItemDescription(
       return t("trackingDetails.lifecycleItemDesc.entered_zone", {
         ns: "views/explore",
         label,
-        zones: formatList(
+        zones: formatZonesList(lifecycleItem.data.zones),
-          lifecycleItem.data.zones_friendly_names ?? lifecycleItem.data.zones,
-        ),
       });
     case "active":
       return t("trackingDetails.lifecycleItemDesc.active", {

web/src/utils/stringUtil.ts

@@ -1,5 +1,3 @@
-import { t } from "i18next";
-
 export const capitalizeFirstLetter = (text: string): string => {
   return text.charAt(0).toUpperCase() + text.slice(1);
 };
@@ -47,29 +45,3 @@ export function generateFixedHash(name: string, prefix: string = "id"): string {
 export function isValidId(name: string): boolean {
   return /^[a-zA-Z0-9_-]+$/.test(name) && !/^\d+$/.test(name);
 }
-
-/**
- * Formats a list of strings into a human-readable format with proper localization.
- * Handles different cases for empty, single-item, two-item, and multi-item lists.
- *
- * @param item - The array of strings to format
- * @returns A formatted string representation of the list
- */
-export function formatList(item: string[]): string {
-  if (item.length === 0) return "";
-  if (item.length === 1) return item[0];
-  if (item.length === 2) {
-    return t("list.two", {
-      0: item[0],
-      1: item[1],
-      ns: "common",
-    });
-  }
-
-  const separatorWithSpace = t("list.separatorWithSpace", { ns: "common" });
-  const allButLast = item.slice(0, -1).join(separatorWithSpace);
-  return t("list.many", {
-    items: allButLast,
-    last: item[item.length - 1],
-  });
-}

web/src/views/classification/ModelTrainingView.tsx

@@ -118,11 +118,6 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
 
   const [trainFilter, setTrainFilter] = useApiFilter<TrainFilter>();
 
-  const refreshAll = useCallback(() => {
-    refreshTrain();
-    refreshDataset();
-  }, [refreshTrain, refreshDataset]);
-
   // image multiselect
 
   const [selectedImages, setSelectedImages] = useState<string[]>([]);
@@ -188,12 +183,11 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
   );
 
   const onDelete = useCallback(
-    (ids: string[], isName: boolean = false, category?: string) => {
+    (ids: string[], isName: boolean = false) => {
-      const targetCategory = category || pageToggle;
       const api =
-        targetCategory == "train"
+        pageToggle == "train"
           ? `/classification/${model.name}/train/delete`
-          : `/classification/${model.name}/dataset/${targetCategory}/delete`;
+          : `/classification/${model.name}/dataset/${pageToggle}/delete`;
 
       axios
         .post(api, { ids })
@@ -414,7 +408,7 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
           trainImages={trainImages || []}
           trainFilter={trainFilter}
           selectedImages={selectedImages}
-          onRefresh={refreshAll}
+          onRefresh={refreshTrain}
           onClickImages={onClickImages}
           onDelete={onDelete}
         />
@@ -438,7 +432,7 @@ type LibrarySelectorProps = {
   dataset: { [id: string]: string[] };
   trainImages: string[];
   setPageToggle: (toggle: string) => void;
-  onDelete: (ids: string[], isName: boolean, category?: string) => void;
+  onDelete: (ids: string[], isName: boolean) => void;
   onRename: (old_name: string, new_name: string) => void;
 };
 function LibrarySelector({
@@ -454,7 +448,7 @@ function LibrarySelector({
   // data
 
   const [confirmDelete, setConfirmDelete] = useState<string | null>(null);
-  const [renameClass, setRenameClass] = useState<string | null>(null);
+  const [renameClass, setRenameFace] = useState<string | null>(null);
   const pageTitle = useMemo(() => {
     if (pageToggle != "train") {
       return pageToggle;
@@ -469,12 +463,12 @@ function LibrarySelector({
 
   // interaction
 
-  const handleDeleteCategory = useCallback(
+  const handleDeleteFace = useCallback(
     (name: string) => {
-      // Get all image IDs for this category
+      // Get all image IDs for this face
       const imageIds = dataset?.[name] || [];
 
-      onDelete(imageIds, true, name);
+      onDelete(imageIds, true);
       setPageToggle("train");
     },
     [dataset, onDelete, setPageToggle],
@@ -482,7 +476,7 @@ function LibrarySelector({
 
   const handleSetOpen = useCallback(
     (open: boolean) => {
-      setRenameClass(open ? renameClass : null);
+      setRenameFace(open ? renameClass : null);
     },
     [renameClass],
   );
@@ -509,7 +503,7 @@ function LibrarySelector({
               className="text-white"
               onClick={() => {
                 if (confirmDelete) {
-                  handleDeleteCategory(confirmDelete);
+                  handleDeleteFace(confirmDelete);
                   setConfirmDelete(null);
                 }
               }}
@@ -527,7 +521,7 @@ function LibrarySelector({
         description={t("renameCategory.desc", { name: renameClass })}
         onSave={(newName) => {
           onRename(renameClass!, newName);
-          setRenameClass(null);
+          setRenameFace(null);
         }}
         defaultValue={renameClass || ""}
         regexPattern={/^[\p{L}\p{N}\s'_-]{1,50}$/u}
@@ -594,7 +588,7 @@ function LibrarySelector({
                       className="size-7 lg:opacity-0 lg:transition-opacity lg:group-hover:opacity-100"
                       onClick={(e) => {
                         e.stopPropagation();
-                        setRenameClass(id);
+                        setRenameFace(id);
                       }}
                     >
                       <LuPencil className="size-4 text-primary" />

web/src/views/explore/ExploreView.tsx

@@ -236,6 +236,10 @@ function ExploreThumbnailImage({
     onSelectSearch(event, false, "tracking_details");
   };
 
+  const handleShowSnapshot = () => {
+    onSelectSearch(event, false, "snapshot");
+  };
+
   const handleAddTrigger = () => {
     navigate(
       `/settings?page=triggers&camera=${event.camera}&event_id=${event.id}`,
@@ -248,6 +252,7 @@ function ExploreThumbnailImage({
       findSimilar={handleFindSimilar}
       refreshResults={mutate}
       showTrackingDetails={handleShowTrackingDetails}
+      showSnapshot={handleShowSnapshot}
       addTrigger={handleAddTrigger}
       isContextMenu={true}
     >

web/src/views/recording/RecordingView.tsx

@@ -63,7 +63,7 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import { useAllowedCameras } from "@/hooks/use-allowed-cameras";
 import { DetailStreamProvider } from "@/context/detail-stream-context";
 import { GenAISummaryDialog } from "@/components/overlay/chip/GenAISummaryChip";
@@ -985,7 +985,7 @@ function Timeline({
             ),
       )}
     >
-      {isMobile && timelineType == "timeline" && (
+      {isMobile && (
         <GenAISummaryDialog review={activeReviewItem} onOpen={onAnalysisOpen} />
       )}
 

web/src/views/search/SearchView.tsx

@@ -688,6 +688,9 @@ export default function SearchView({
                           showTrackingDetails={() =>
                             onSelectSearch(value, false, "tracking_details")
                           }
+                          showSnapshot={() =>
+                            onSelectSearch(value, false, "snapshot")
+                          }
                           addTrigger={() => {
                             if (
                               config?.semantic_search.enabled &&

web/src/views/settings/AuthenticationView.tsx

@@ -36,7 +36,7 @@ import EditRoleCamerasDialog from "@/components/overlay/EditRoleCamerasDialog";
 import { useTranslation } from "react-i18next";
 import DeleteRoleDialog from "@/components/overlay/DeleteRoleDialog";
 import { Separator } from "@/components/ui/separator";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 
 type AuthenticationViewProps = {
   section?: "users" | "roles";

web/src/views/settings/CameraManagementView.tsx

@@ -18,7 +18,7 @@ import {
 } from "@/components/ui/select";
 import { IoMdArrowRoundBack } from "react-icons/io";
 import { isDesktop } from "react-device-detect";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import { Switch } from "@/components/ui/switch";
 import { Trans } from "react-i18next";
 import { Separator } from "@/components/ui/separator";

web/src/views/settings/CameraSettingsView.tsx

@@ -23,6 +23,7 @@ import { StatusBarMessagesContext } from "@/context/statusbar-provider";
 import axios from "axios";
 import { Link } from "react-router-dom";
 import { LuExternalLink } from "react-icons/lu";
+import { capitalizeFirstLetter } from "@/utils/stringUtil";
 import { MdCircle } from "react-icons/md";
 import { cn } from "@/lib/utils";
 import { Trans, useTranslation } from "react-i18next";
@@ -41,8 +42,6 @@ import CameraWizardDialog from "@/components/settings/CameraWizardDialog";
 import { IoMdArrowRoundBack } from "react-icons/io";
 import { isDesktop } from "react-device-detect";
 import { useCameraFriendlyName } from "@/hooks/use-camera-friendly-name";
-import { resolveZoneName } from "@/hooks/use-zone-friendly-name";
-import { formatList } from "@/utils/stringUtil";
 
 type CameraSettingsViewProps = {
   selectedCamera: string;
@@ -87,47 +86,40 @@ export default function CameraSettingsView({
 
   // zones and labels
 
-  const getZoneName = useCallback(
-    (zoneId: string, cameraId?: string) =>
-      resolveZoneName(config, zoneId, cameraId),
-    [config],
-  );
-
   const zones = useMemo(() => {
     if (cameraConfig) {
       return Object.entries(cameraConfig.zones).map(([name, zoneData]) => ({
         camera: cameraConfig.name,
         name,
-        friendly_name: getZoneName(name, cameraConfig.name),
         objects: zoneData.objects,
         color: zoneData.color,
       }));
     }
-  }, [cameraConfig, getZoneName]);
+  }, [cameraConfig]);
 
   const alertsLabels = useMemo(() => {
     return cameraConfig?.review.alerts.labels
-      ? formatList(
+      ? cameraConfig.review.alerts.labels
-          cameraConfig.review.alerts.labels.map((label) =>
+          .map((label) =>
             getTranslatedLabel(
               label,
               cameraConfig?.audio?.listen?.includes(label) ? "audio" : "object",
             ),
-          ),
           )
+          .join(", ")
       : "";
   }, [cameraConfig]);
 
   const detectionsLabels = useMemo(() => {
     return cameraConfig?.review.detections.labels
-      ? formatList(
+      ? cameraConfig.review.detections.labels
-          cameraConfig.review.detections.labels.map((label) =>
+          .map((label) =>
             getTranslatedLabel(
               label,
               cameraConfig?.audio?.listen?.includes(label) ? "audio" : "object",
             ),
-          ),
           )
+          .join(", ")
       : "";
   }, [cameraConfig]);
 
@@ -534,7 +526,7 @@ export default function CameraSettingsView({
                                           />
                                         </FormControl>
                                         <FormLabel className="font-normal smart-capitalize">
-                                          {zone.friendly_name}
+                                          {zone.name.replaceAll("_", " ")}
                                         </FormLabel>
                                       </FormItem>
                                     )}
@@ -556,11 +548,14 @@ export default function CameraSettingsView({
                                   "cameraReview.reviewClassification.zoneObjectAlertsTips",
                                   {
                                     alertsLabels,
-                                    zone: formatList(
+                                    zone: watchedAlertsZones
-                                      watchedAlertsZones.map((zone) =>
+                                      .map((zone) =>
-                                        getZoneName(zone),
+                                        capitalizeFirstLetter(zone).replaceAll(
-                                      ),
+                                          "_",
+                                          " ",
                                         ),
+                                      )
+                                      .join(", "),
                                     cameraName: selectCameraName,
                                   },
                                 )
@@ -633,7 +628,7 @@ export default function CameraSettingsView({
                                             />
                                           </FormControl>
                                           <FormLabel className="font-normal smart-capitalize">
-                                            {zone.friendly_name}
+                                            {zone.name.replaceAll("_", " ")}
                                           </FormLabel>
                                         </FormItem>
                                       )}
@@ -672,11 +667,14 @@ export default function CameraSettingsView({
                                   i18nKey="cameraReview.reviewClassification.zoneObjectDetectionsTips.text"
                                   values={{
                                     detectionsLabels,
-                                    zone: formatList(
+                                    zone: watchedDetectionsZones
-                                      watchedDetectionsZones.map((zone) =>
+                                      .map((zone) =>
-                                        getZoneName(zone),
+                                        capitalizeFirstLetter(zone).replaceAll(
-                                      ),
+                                          "_",
+                                          " ",
                                         ),
+                                      )
+                                      .join(", "),
                                     cameraName: selectCameraName,
                                   }}
                                   ns="views/settings"
@@ -686,11 +684,14 @@ export default function CameraSettingsView({
                                   i18nKey="cameraReview.reviewClassification.zoneObjectDetectionsTips.notSelectDetections"
                                   values={{
                                     detectionsLabels,
-                                    zone: formatList(
+                                    zone: watchedDetectionsZones
-                                      watchedDetectionsZones.map((zone) =>
+                                      .map((zone) =>
-                                        getZoneName(zone),
+                                        capitalizeFirstLetter(zone).replaceAll(
-                                      ),
+                                          "_",
+                                          " ",
                                         ),
+                                      )
+                                      .join(", "),
                                     cameraName: selectCameraName,
                                   }}
                                   ns="views/settings"

web/src/views/settings/FrigatePlusSettingsView.tsx

@@ -23,7 +23,7 @@ import {
   SelectTrigger,
 } from "@/components/ui/select";
 import { useDocDomain } from "@/hooks/use-doc-domain";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 
 type FrigatePlusModel = {
   id: string;

web/src/views/settings/MasksAndZonesView.tsx

@@ -229,7 +229,6 @@ export default function MasksAndZonesView({
           typeIndex: index,
           camera: cameraConfig.name,
           name,
-          friendly_name: zoneData.friendly_name,
           objects: zoneData.objects,
           points: interpolatePoints(
             parseCoordinates(zoneData.coordinates),

web/src/views/settings/NotificationsSettingsView.tsx

@@ -45,7 +45,7 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Trans, useTranslation } from "react-i18next";
 import { useDateLocale } from "@/hooks/use-date-locale";
 import { useDocDomain } from "@/hooks/use-doc-domain";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import { useIsAdmin } from "@/hooks/use-is-admin";
 import { cn } from "@/lib/utils";
 
@@ -476,7 +476,7 @@ export default function NotificationView({
                                   <FilterSwitch
                                     key={camera.name}
                                     label={camera.name}
-                                    type={"camera"}
+                                    isCameraName={true}
                                     isChecked={field.value?.includes(
                                       camera.name,
                                     )}

web/src/views/settings/TriggerView.tsx

@@ -403,8 +403,7 @@ export default function TriggerView({
     setShowCreate(true);
     setSelectedTrigger({
       enabled: true,
-      name: eventId,
+      name: "",
-      friendly_name: "",
       type: "thumbnail",
       data: eventId,
       threshold: 0.5,

web/src/views/system/CameraMetrics.tsx

@@ -13,7 +13,7 @@ import {
 } from "@/components/ui/tooltip";
 import useSWR from "swr";
 import { useTranslation } from "react-i18next";
-import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
+import { CameraNameLabel } from "@/components/camera/CameraNameLabel";
 import { resolveCameraName } from "@/hooks/use-camera-friendly-name";
 
 type CameraMetricsProps = {