diff --git a/_elasticsearch/index_definitions/media_files_v1.json b/_elasticsearch/index_definitions/media_files_v1.json
index c456ec56b3..883c1d6ab3 100644
--- a/_elasticsearch/index_definitions/media_files_v1.json
+++ b/_elasticsearch/index_definitions/media_files_v1.json
@@ -10,6 +10,8 @@
       "media_class" : { "type" : "keyword" },
       "media_type" : { "type" : "keyword" },
       "maybe_media_subtype" : { "type" : "keyword" },
+      "maybe_engine_category" : { "type" : "keyword" },
+      "maybe_animation_type" : { "type" : "keyword" },
 
       "maybe_mime_type" : { "type" : "keyword" },
 
@@ -17,8 +19,6 @@
       "public_bucket_prefix" : { "type" : "keyword" },
       "public_bucket_extension" : { "type" : "keyword" },
 
-      "maybe_animation_type" : { "type" : "keyword" },
-
       "creator_set_visibility" : { "type" : "keyword" },
 
       "maybe_title" : { "type" : "search_as_you_type" },
diff --git a/_elasticsearch/searches/media_files/search.json b/_elasticsearch/searches/media_files/search.json
index e0419f181c..2e1c8aaf7c 100644
--- a/_elasticsearch/searches/media_files/search.json
+++ b/_elasticsearch/searches/media_files/search.json
@@ -5,6 +5,11 @@
         {
           "bool": {
             "must" : [
+              {
+                "term": {
+                  "is_deleted": false
+                }
+              },
               {
                 "term": {
                   "media_class": "dimensional"
@@ -14,6 +19,14 @@
                 "term": {
                   "media_type": "glb"
                 }
+              },
+              {
+                "bool": {
+                  "should": [
+                    { "term": { "maybe_engine_category": "object"} },
+                    { "term": { "maybe_engine_category": "image_plane"} }
+                  ]
+                }
               }
             ],
             "should": [
diff --git a/crates/cli/production/elasticsearch-cli/src/plans/create_dimensional_media_file_documents.rs b/crates/cli/production/elasticsearch-cli/src/plans/create_dimensional_media_file_documents.rs
index d4ef0c4924..3163b21cb0 100644
--- a/crates/cli/production/elasticsearch-cli/src/plans/create_dimensional_media_file_documents.rs
+++ b/crates/cli/production/elasticsearch-cli/src/plans/create_dimensional_media_file_documents.rs
@@ -101,14 +101,17 @@ async fn create_document_from_record(elasticsearch: &Elasticsearch, record: Medi
     media_class: record.media_class,
     media_type: record.media_type,
     maybe_media_subtype: record.maybe_media_subtype,
+    maybe_engine_category: record.maybe_engine_category,
+    maybe_animation_type: record.maybe_animation_type,
+
     maybe_mime_type: record.maybe_mime_type,
     public_bucket_directory_hash: record.public_bucket_directory_hash,
     maybe_public_bucket_prefix: record.maybe_public_bucket_prefix,
     maybe_public_bucket_extension: record.maybe_public_bucket_extension,
-    maybe_animation_type: record.maybe_animation_type,
     creator_set_visibility: record.creator_set_visibility,
 
-    maybe_title: record.maybe_title,
+    maybe_title: record.maybe_title.clone(),
+    maybe_title_as_keyword: record.maybe_title,
 
     maybe_cover_image_media_file_token: record.maybe_cover_image_media_file_token,
     maybe_cover_image_public_bucket_hash: record.maybe_cover_image_public_bucket_hash,
@@ -126,7 +129,6 @@ async fn create_document_from_record(elasticsearch: &Elasticsearch, record: Medi
     mod_deleted_at: record.mod_deleted_at,
 
     is_deleted,
-    maybe_title_as_keyword: None,
   };
 
   let op : BulkOperation<_> = BulkOperation::index(&document)
diff --git a/crates/lib/elasticsearch_schema/src/documents/media_file_document.rs b/crates/lib/elasticsearch_schema/src/documents/media_file_document.rs
index c48acc4ac8..2f43adf49b 100644
--- a/crates/lib/elasticsearch_schema/src/documents/media_file_document.rs
+++ b/crates/lib/elasticsearch_schema/src/documents/media_file_document.rs
@@ -2,16 +2,14 @@ use std::path::PathBuf;
 
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+
 use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
 use enums::by_table::media_files::media_file_class::MediaFileClass;
+use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
 use enums::by_table::media_files::media_file_subtype::MediaFileSubtype;
 use enums::by_table::media_files::media_file_type::MediaFileType;
-
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::by_table::model_weights::weights_types::WeightsType;
 use enums::common::visibility::Visibility;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::users::UserToken;
 
 use crate::traits::document::Document;
@@ -28,6 +26,7 @@ pub struct MediaFileDocument {
   pub media_class: MediaFileClass,
   pub media_type: MediaFileType,
   pub maybe_media_subtype: Option<MediaFileSubtype>,
+  pub maybe_engine_category: Option<MediaFileEngineCategory>,
 
   pub maybe_mime_type: Option<String>,