diff --git a/src/hub/dataload/sources/entrez/go_upload.py b/src/hub/dataload/sources/entrez/go_upload.py
index 8bb4992..06aad83 100644
--- a/src/hub/dataload/sources/entrez/go_upload.py
+++ b/src/hub/dataload/sources/entrez/go_upload.py
@@ -1,6 +1,8 @@
-from .parser import Gene2GOParser
 import biothings.hub.dataload.uploader as uploader
 
+from .parser import Gene2GOParser
+
+
 class EntrezGOUploader(uploader.MergerSourceUploader):
 
     name = "entrez_go"
@@ -26,22 +28,19 @@ def get_mapping(klass):
                             },
                             "id": {
                                 "type": "keyword",
-                                "normalizer" : "keyword_lowercase_normalizer",
-                                'copy_to': ['all'],
+                                "normalizer": "keyword_lowercase_normalizer",
+                                "copy_to": ["all"],
                             },
                             "evidence": {
-                                "type": "text",
-                                "index": False
-                            },
-                            "pubmed": {
-                                "type": "long",
-                                "index": False
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
                             },
+                            "pubmed": {"type": "long", "index": False},
                             "category": {
-                                "type": "text",
-                                "index": False
-                            }
-                        }
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
+                            },
+                        },
                     },
                     "CC": {
                         "dynamic": False,
@@ -51,22 +50,19 @@ def get_mapping(klass):
                             },
                             "id": {
                                 "type": "keyword",
-                                "normalizer" : "keyword_lowercase_normalizer",
-                                'copy_to': ['all'],
+                                "normalizer": "keyword_lowercase_normalizer",
+                                "copy_to": ["all"],
                             },
                             "evidence": {
-                                "type": "text",
-                                "index": False
-                            },
-                            "pubmed": {
-                                "type": "long",
-                                "index": False
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
                             },
+                            "pubmed": {"type": "long", "index": False},
                             "category": {
-                                "type": "text",
-                                "index": False
-                            }
-                        }
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
+                            },
+                        },
                     },
                     "BP": {
                         "dynamic": False,
@@ -76,24 +72,21 @@ def get_mapping(klass):
                             },
                             "id": {
                                 "type": "keyword",
-                                "normalizer" : "keyword_lowercase_normalizer",
-                                'copy_to': ['all'],
+                                "normalizer": "keyword_lowercase_normalizer",
+                                "copy_to": ["all"],
                             },
                             "evidence": {
-                                "type": "text",
-                                "index": False
-                            },
-                            "pubmed": {
-                                "type": "long",
-                                "index": False
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
                             },
+                            "pubmed": {"type": "long", "index": False},
                             "category": {
-                                "type": "text",
-                                "index": False
-                            }
-                        }
-                    }
-                }
+                                "type": "keyword",
+                                "normalizer": "keyword_lowercase_normalizer",
+                            },
+                        },
+                    },
+                },
             }
         }