diff --git a/es-models/gene_expression/gene_expression.mapping.yaml b/es-models/gene_expression/gene_expression.mapping.yaml
index c0674b2..9a6e276 100644
--- a/es-models/gene_expression/gene_expression.mapping.yaml
+++ b/es-models/gene_expression/gene_expression.mapping.yaml
@@ -1,31 +1,15 @@
-_source:
-  excludes:
-  - genes.*
 properties:
-  age_at_diagnosis:
-    type: long
   case_id:
     type: keyword
-  days_to_death:
-    type: long
-  ethnicity:
+  gene_expression_id:
     type: keyword
-  gender:
-    type: keyword
-  genes:
-    properties:
-      expression_value:
-        type: float
-      gene_id:
-        type: keyword
-      symbol:
-        type: keyword
-    type: nested
-  project_id:
-    type: keyword
-  race:
+  gene_id:
     type: keyword
+  log2_uqfpkm:
+    type: double
   submitter_id:
     type: keyword
-  vital_status:
+  symbol:
     type: keyword
+  uqfpkm:
+    type: double
diff --git a/es-models/gene_expression/settings.yaml b/es-models/gene_expression/settings.yaml
index c8df452..5a902e2 100644
--- a/es-models/gene_expression/settings.yaml
+++ b/es-models/gene_expression/settings.yaml
@@ -20,8 +20,7 @@ analysis:
       min_gram: '1'
       side: front
       type: edge_ngram
-index.mapping.nested_fields.limit: 100
-index.mapping.nested_objects.limit: 100000000
-index.max_inner_result_window: 20000
-index.max_result_window: 100000000
-index.max_terms_count: 100000
+index:
+  max_inner_result_window: 20000
+  max_result_window: 100000000
+  max_terms_count: 100000