diff --git a/app/services/concerns/elasticsearch_able.rb b/app/services/concerns/elasticsearch_able.rb
index c08aab029..c1640470c 100644
--- a/app/services/concerns/elasticsearch_able.rb
+++ b/app/services/concerns/elasticsearch_able.rb
@@ -20,7 +20,15 @@ module ElasticsearchAble
   def highlight_options
     {
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
-      tag: '<span class="highlight">'
+      tag: '<span class="highlight">',
+      fields: {
+        challenge_names: { type: 'plain' },
+        challenge_tag_names: { type: 'plain' },
+        description: { type: 'plain' },
+        subject_stages: { type: 'plain' },
+        content: { type: 'plain' },
+        descendants_contents: { type: 'plain' },
+      }
     }
   end