diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py
index bc0a0ff11..11f08a86c 100644
--- a/frigate/detectors/detector_config.py
+++ b/frigate/detectors/detector_config.py
@@ -157,8 +157,16 @@ class ModelConfig(BaseModel):
             self._model_hash = file_hash.hexdigest()
 
     def create_colormap(self, enabled_labels: set[str]) -> None:
-        """Get a list of colors for enabled labels."""
-        colors = generate_color_palette(len(enabled_labels))
+        """Get a list of colors for enabled labels that aren't attributes."""
+        colors = generate_color_palette(
+            len(
+                list(
+                    filter(
+                        lambda label: label not in self._all_attributes, enabled_labels
+                    )
+                )
+            )
+        )
 
         self._colormap = {label: color for label, color in zip(enabled_labels, colors)}
 
diff --git a/web/src/components/overlay/detail/SearchDetailDialog.tsx b/web/src/components/overlay/detail/SearchDetailDialog.tsx
index 45c0659d8..94d28c7c8 100644
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@@ -534,7 +534,7 @@ function ObjectSnapshotTab({
                 />
               )}
             </TransformComponent>
-            {search.plus_id !== "not_enabled" && (
+            {search.plus_id !== "not_enabled" && search.end_time && (
               <Card className="p-1 text-sm md:p-2">
                 <CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
                   <div className={cn("flex flex-col space-y-3")}>
@@ -553,7 +553,7 @@ function ObjectSnapshotTab({
                   </div>
 
                   <div className="flex flex-row justify-center gap-2 md:justify-end">
-                    {state == "reviewing" && search.end_time && (
+                    {state == "reviewing" && (
                       <>
                         <Button
                           className="bg-success"
diff --git a/web/src/views/settings/ObjectSettingsView.tsx b/web/src/views/settings/ObjectSettingsView.tsx
index 927d08ee0..66962cca7 100644
--- a/web/src/views/settings/ObjectSettingsView.tsx
+++ b/web/src/views/settings/ObjectSettingsView.tsx
@@ -307,7 +307,7 @@ function ObjectList(objects?: ObjectType[]) {
                     {getIconForLabel(obj.label, "size-5 text-white")}
                   </div>
                   <div className="ml-3 text-lg">
-                    {capitalizeFirstLetter(obj.label)}
+                    {capitalizeFirstLetter(obj.label.replaceAll("_", " "))}
                   </div>
                 </div>
                 <div className="flex w-8/12 flex-row items-end justify-end">