diff --git a/services/search/pkg/bleve/testdata/mapping.golden.json b/services/search/pkg/bleve/testdata/mapping.golden.json
index 61a74b8518..61ea6474f1 100644
--- a/services/search/pkg/bleve/testdata/mapping.golden.json
+++ b/services/search/pkg/bleve/testdata/mapping.golden.json
@@ -734,30 +734,6 @@
               }
             ]
           },
-          "contentId_lowercase": {
-            "enabled": true,
-            "dynamic": true,
-            "fields": [
-              {
-                "type": "text",
-                "analyzer": "keyword",
-                "index": true,
-                "include_term_vectors": true
-              }
-            ]
-          },
-          "contentId_words": {
-            "enabled": true,
-            "dynamic": true,
-            "fields": [
-              {
-                "type": "text",
-                "analyzer": "words",
-                "index": true,
-                "include_term_vectors": true
-              }
-            ]
-          },
           "stillImageTimeUs": {
             "enabled": true,
             "dynamic": true,
diff --git a/services/search/pkg/opensearch/testdata/resource.golden.json b/services/search/pkg/opensearch/testdata/resource.golden.json
index 0f081173ab..ab343eef11 100644
--- a/services/search/pkg/opensearch/testdata/resource.golden.json
+++ b/services/search/pkg/opensearch/testdata/resource.golden.json
@@ -196,14 +196,6 @@
           "contentId": {
             "type": "keyword"
           },
-          "contentId_lowercase": {
-            "doc_values": false,
-            "type": "keyword"
-          },
-          "contentId_words": {
-            "analyzer": "words",
-            "type": "text"
-          },
           "stillImageTimeUs": {
             "type": "long"
           },
diff --git a/services/search/pkg/search/search.go b/services/search/pkg/search/search.go
index 7ab61ea88d..009c8afa87 100644
--- a/services/search/pkg/search/search.go
+++ b/services/search/pkg/search/search.go
@@ -79,15 +79,16 @@ var resourceFieldOverrides = sync.OnceValue(func() map[string]mapping.FieldOpts
 		// every keyword field searches case-insensitively and by word (name,
 		// title, the facets) unless opted out: ids are opaque, paths are POSIX,
 		// the mime type is normalized already, a tag is one label
-		"ID":        {CaseInsensitive: &False, NoWordBreaker: &True},
-		"RootID":    {CaseInsensitive: &False, NoWordBreaker: &True},
-		"ParentID":  {CaseInsensitive: &False, NoWordBreaker: &True},
-		"Path":      {Type: mapping.TypePath, CaseInsensitive: &False},
-		"MimeType":  {CaseInsensitive: &False, NoWordBreaker: &True},
-		"Content":   {Type: mapping.TypeFulltext},
-		"Tags":      {NoWordBreaker: &True, IncludeInAll: &False},
-		"Favorites": {NoWordBreaker: &True, IncludeInAll: &False, CaseInsensitive: &False}, // opaque user ids
-		"location":  {Type: mapping.TypeGeopoint},
+		"ID":                  {CaseInsensitive: &False, NoWordBreaker: &True},
+		"RootID":              {CaseInsensitive: &False, NoWordBreaker: &True},
+		"ParentID":            {CaseInsensitive: &False, NoWordBreaker: &True},
+		"Path":                {Type: mapping.TypePath, CaseInsensitive: &False},
+		"MimeType":            {CaseInsensitive: &False, NoWordBreaker: &True},
+		"Content":             {Type: mapping.TypeFulltext},
+		"Tags":                {NoWordBreaker: &True, IncludeInAll: &False},
+		"Favorites":           {NoWordBreaker: &True, IncludeInAll: &False, CaseInsensitive: &False}, // opaque user ids
+		"livePhoto.contentId": {NoWordBreaker: &True, CaseInsensitive: &False},                       // opaque pairing uuid
+		"location":            {Type: mapping.TypeGeopoint},
 	}
 })