diff --git a/frigate/util/builtin.py b/frigate/util/builtin.py
index 7c2c5790e..6dab16206 100644
--- a/frigate/util/builtin.py
+++ b/frigate/util/builtin.py
@@ -183,16 +183,11 @@ def update_yaml_from_url(file_path, url):
             update_yaml_file(file_path, key_path, new_value_list)
         else:
             value = new_value_list[0]
-            if "," in value:
-                # Skip conversion if we're a mask or zone string
-                update_yaml_file(file_path, key_path, value)
-            else:
-                try:
-                    value = ast.literal_eval(value)
-                except (ValueError, SyntaxError):
-                    pass
-                update_yaml_file(file_path, key_path, value)
-
+            try:
+                # no need to convert if we have a mask/zone string
+                value = ast.literal_eval(value) if "," not in value else value
+            except (ValueError, SyntaxError):
+                pass
             update_yaml_file(file_path, key_path, value)
 
 
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 03a60a8d0..816618fe5 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -275,7 +275,7 @@ export default function Explore() {
               <TbExclamationCircle className="mb-3 size-10" />
               <div>Search Unavailable</div>
             </div>
-            {embeddingsReindexing && (
+            {embeddingsReindexing && allModelsLoaded && (
               <>
                 <div className="text-center text-primary-variant">
                   Search can be used after tracked object embeddings have