diff --git a/database.go b/database.go
index 508cce4c9758670012b2b70c696b4775e92ff2d2..6525cda87e4eae60549ed6b2259fa92c072bc058 100644
--- a/database.go
+++ b/database.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/blevesearch/bleve"
 	"github.com/blevesearch/bleve/analysis/analyzer/custom"
-	_ "github.com/blevesearch/bleve/analysis/analyzer/keyword"
-	_ "github.com/blevesearch/bleve/analysis/analyzer/simple"
-	_ "github.com/blevesearch/bleve/analysis/analyzer/standard"
+	"github.com/blevesearch/bleve/analysis/analyzer/keyword"
+	"github.com/blevesearch/bleve/analysis/analyzer/simple"
+	"github.com/blevesearch/bleve/analysis/analyzer/standard"
 	"github.com/blevesearch/bleve/analysis/lang/en"
 	"github.com/blevesearch/bleve/analysis/token/edgengram"
 	"github.com/blevesearch/bleve/analysis/token/lowercase"
@@ -123,7 +123,7 @@ func flatten(book *Book) *flatBook {
 	}
 }
 
-var defaultTextAnalyzer = "standard"
+var defaultTextAnalyzer = standard.Name
 
 func metadataDocumentMapping() *blevemapping.DocumentMapping {
 	md := bleve.NewDocumentStaticMapping()
@@ -134,11 +134,11 @@ func metadataDocumentMapping() *blevemapping.DocumentMapping {
 
 	authorFieldMapping := bleve.NewTextFieldMapping()
 	authorFieldMapping.Store = false
-	authorFieldMapping.Analyzer = "simple"
+	authorFieldMapping.Analyzer = simple.Name
 
 	keywordFieldMapping := bleve.NewTextFieldMapping()
 	keywordFieldMapping.Store = false
-	keywordFieldMapping.Analyzer = "keyword"
+	keywordFieldMapping.Analyzer = keyword.Name
 	keywordFieldMapping.IncludeInAll = false
 
 	suggestFieldMapping := bleve.NewTextFieldMapping()