diff --git a/modules/router/router.go b/modules/router/router.go
index 91f643a..bbb5610 100644
--- a/modules/router/router.go
+++ b/modules/router/router.go
@@ -653,7 +653,7 @@ func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) {
 			for _, f := range request.Search.Filters {
 
 				if f.Operation == "is" {
-					filters += `{ "wildcard": {"` + f.Field + `": {"value": "` + f.Value + `" } } },`
+					filters += `{ "wildcard": {"` + f.Field + `.keyword": {"value": "` + f.Value + `" } } },`
 				} else if f.Operation == "exists" {
 					filters += `{ "exists": {"field":"` + f.Field + `" } },`
 				} else if f.Operation == "is_not" {
@@ -747,7 +747,7 @@ func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) {
 			for _, f := range request.Search.Filters {
 
 				if f.Operation == "is" {
-					filters += `{ "wildcard": {"` + f.Field + `": {"value": "` + f.Value + `" } } },`
+					filters += `{ "wildcard": {"` + f.Field + `.keyword": {"value": "` + f.Value + `" } } },`
 				} else if f.Operation == "exists" {
 					filters += `{ "exists": {"field":"` + f.Field + `" } },`
 				} else if f.Operation == "is_not" {
diff --git a/modules/version/version.go b/modules/version/version.go
index ad72379..a3f675d 100644
--- a/modules/version/version.go
+++ b/modules/version/version.go
@@ -13,4 +13,4 @@
 
 package version
 
-var Version = "extractor/v0.2.14"
+var Version = "extractor/v0.2.15"