diff --git a/lib/arclight/traject/ead2_component_config.rb b/lib/arclight/traject/ead2_component_config.rb
index 7c7d069ec..7ce452727 100644
--- a/lib/arclight/traject/ead2_component_config.rb
+++ b/lib/arclight/traject/ead2_component_config.rb
@@ -304,6 +304,7 @@
 end
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("./did/#{selector}", to_text: false)
+  to_field "#{selector}_tesim", extract_xpath("./did/#{selector}")
 end
 
 # =============================
diff --git a/lib/arclight/traject/ead2_config.rb b/lib/arclight/traject/ead2_config.rb
index 5a6958881..da0c37b8b 100644
--- a/lib/arclight/traject/ead2_config.rb
+++ b/lib/arclight/traject/ead2_config.rb
@@ -240,6 +240,7 @@
 
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("/ead/archdesc/did/#{selector}", to_text: false)
+  to_field "#{selector}_tesim", extract_xpath("/ead/archdesc/did/#{selector}")
 end
 
 NAME_ELEMENTS.map do |selector|
diff --git a/lib/generators/arclight/templates/config/locales/arclight.en.yml b/lib/generators/arclight/templates/config/locales/arclight.en.yml
index 99da7c50d..b04c0b2cc 100644
--- a/lib/generators/arclight/templates/config/locales/arclight.en.yml
+++ b/lib/generators/arclight/templates/config/locales/arclight.en.yml
@@ -33,7 +33,6 @@ en:
         fileplan: File plan
         odd: Other descriptive data
         note: Note
-        did_note: Note
 
         access_subjects: Subjects
         names_coll: Names
diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml
index 2f114cd09..a02bdcf8b 100644
--- a/solr/conf/schema.xml
+++ b/solr/conf/schema.xml
@@ -348,8 +348,7 @@
    <copyField source="access_subjects_ssim" dest="text" />
    <copyField source="containers_ssim" dest="text" />
 
-   <!-- grab the searchable notes -->
-   <copyField source="abstract_tesim" dest="text" />
+   <!-- grab the searchable notes (SEARCHABLE_NOTES_FIELDS) -->
    <copyField source="accessrestrict_tesim" dest="text" />
    <copyField source="accruals_tesim" dest="text" />
    <copyField source="acqinfo_tesim" dest="text" />
@@ -359,23 +358,24 @@
    <copyField source="bibliography_tesim" dest="text" />
    <copyField source="bioghist_tesim" dest="text" />
    <copyField source="custodhist_tesim" dest="text" />
-   <copyField source="did_note_tesim" dest="text" />
    <copyField source="fileplan_tesim" dest="text" />
    <copyField source="indexes_tesim" dest="text" />
    <copyField source="language_ssim" dest="text" />
-   <copyField source="materialspec_tesim" dest="text" />
-   <copyField source="note_tesim" dest="text" />
    <copyField source="odd_tesim" dest="text" />
    <copyField source="originalsloc_tesim" dest="text" />
    <copyField source="parent_unittitles_tesim" dest="text" />
    <copyField source="physdesc_tesim" dest="text" />
-   <copyField source="physloc_tesim" dest="text" />
    <copyField source="phystech_tesim" dest="text" />
    <copyField source="processinfo_tesim" dest="text" />
    <copyField source="relatedmaterial_tesim" dest="text" />
    <copyField source="scopecontent_tesim" dest="text" />
    <copyField source="separatedmaterial_tesim" dest="text" />
    <copyField source="userestrict_tesim" dest="text" />
+   <!-- did searchable notes (DID_SEARCHABLE_NOTES_FIELDS) -->
+   <copyField source="abstract_tesim" dest="text" />
+   <copyField source="materialspec_tesim" dest="text" />
+   <copyField source="physloc_tesim" dest="text" />
+   <copyField source="note_tesim" dest="text" />
    <!-- grab structured data that's important -->
    <copyField source="unitid_ssm" dest="text" />
    <copyField source="unitid_ssm" dest="unitid_identifier_match" />