diff --git a/quesma/quesma/search_test.go b/quesma/quesma/search_test.go
index 1add4a450..52d22f8f0 100644
--- a/quesma/quesma/search_test.go
+++ b/quesma/quesma/search_test.go
@@ -168,10 +168,11 @@ func TestAsyncSearchHandlerSpecialCharacters(t *testing.T) {
 					"name":              {PropertyName: "name", InternalPropertyName: "name", Type: schema.TypeText},
 					"content":           {PropertyName: "content", InternalPropertyName: "content", Type: schema.TypeText},
 					"message":           {PropertyName: "message", InternalPropertyName: "message", Type: schema.TypeText},
-					"host.name.keyword": {PropertyName: "host.name.keyword", InternalPropertyName: "host.name.keyword", Type: schema.TypeKeyword},
+					"host_name.keyword": {PropertyName: "host_name.keyword", InternalPropertyName: "host_name.keyword", Type: schema.TypeKeyword},
 					"FlightDelay":       {PropertyName: "FlightDelay", InternalPropertyName: "FlightDelay", Type: schema.TypeText},
 					"Cancelled":         {PropertyName: "Cancelled", InternalPropertyName: "Cancelled", Type: schema.TypeText},
 					"FlightDelayMin":    {PropertyName: "FlightDelayMin", InternalPropertyName: "FlightDelayMin", Type: schema.TypeText},
+					"_id":               {PropertyName: "_id", InternalPropertyName: "_id", Type: schema.TypeText},
 				},
 			},
 		},
@@ -224,10 +225,11 @@ func TestSearchHandler(t *testing.T) {
 					"name":              {PropertyName: "name", InternalPropertyName: "name", Type: schema.TypeText},
 					"content":           {PropertyName: "content", InternalPropertyName: "content", Type: schema.TypeText},
 					"message":           {PropertyName: "message", InternalPropertyName: "message", Type: schema.TypeText},
-					"host.name.keyword": {PropertyName: "host.name.keyword", InternalPropertyName: "host.name.keyword", Type: schema.TypeKeyword},
+					"host_name.keyword": {PropertyName: "host_name.keyword", InternalPropertyName: "host_name.keyword", Type: schema.TypeKeyword},
 					"FlightDelay":       {PropertyName: "FlightDelay", InternalPropertyName: "FlightDelay", Type: schema.TypeText},
 					"Cancelled":         {PropertyName: "Cancelled", InternalPropertyName: "Cancelled", Type: schema.TypeText},
 					"FlightDelayMin":    {PropertyName: "FlightDelayMin", InternalPropertyName: "FlightDelayMin", Type: schema.TypeText},
+					"_id":               {PropertyName: "_id", InternalPropertyName: "_id", Type: schema.TypeText},
 				},
 			},
 		},
@@ -265,10 +267,11 @@ func TestSearchHandlerNoAttrsConfig(t *testing.T) {
 					"name":              {PropertyName: "name", InternalPropertyName: "name", Type: schema.TypeText},
 					"content":           {PropertyName: "content", InternalPropertyName: "content", Type: schema.TypeText},
 					"message":           {PropertyName: "message", InternalPropertyName: "message", Type: schema.TypeText},
-					"host.name.keyword": {PropertyName: "host.name.keyword", InternalPropertyName: "host.name.keyword", Type: schema.TypeKeyword},
+					"host_name.keyword": {PropertyName: "host_name.keyword", InternalPropertyName: "host_name.keyword", Type: schema.TypeKeyword},
 					"FlightDelay":       {PropertyName: "FlightDelay", InternalPropertyName: "FlightDelay", Type: schema.TypeText},
 					"Cancelled":         {PropertyName: "Cancelled", InternalPropertyName: "Cancelled", Type: schema.TypeText},
 					"FlightDelayMin":    {PropertyName: "FlightDelayMin", InternalPropertyName: "FlightDelayMin", Type: schema.TypeText},
+					"_id":               {PropertyName: "_id", InternalPropertyName: "_id", Type: schema.TypeText},
 				},
 			},
 		},
@@ -304,10 +307,11 @@ func TestAsyncSearchFilter(t *testing.T) {
 					"name":              {PropertyName: "name", InternalPropertyName: "name", Type: schema.TypeText},
 					"content":           {PropertyName: "content", InternalPropertyName: "content", Type: schema.TypeText},
 					"message":           {PropertyName: "message", InternalPropertyName: "message", Type: schema.TypeText},
-					"host.name.keyword": {PropertyName: "host.name.keyword", InternalPropertyName: "host.name.keyword", Type: schema.TypeKeyword},
+					"host_name.keyword": {PropertyName: "host_name.keyword", InternalPropertyName: "host_name.keyword", Type: schema.TypeKeyword},
 					"FlightDelay":       {PropertyName: "FlightDelay", InternalPropertyName: "FlightDelay", Type: schema.TypeText},
 					"Cancelled":         {PropertyName: "Cancelled", InternalPropertyName: "Cancelled", Type: schema.TypeText},
 					"FlightDelayMin":    {PropertyName: "FlightDelayMin", InternalPropertyName: "FlightDelayMin", Type: schema.TypeText},
+					"_id":               {PropertyName: "_id", InternalPropertyName: "_id", Type: schema.TypeText},
 				},
 			},
 		},
@@ -346,10 +350,11 @@ func TestHandlingDateTimeFields(t *testing.T) {
 					"name":              {PropertyName: "name", InternalPropertyName: "name", Type: schema.TypeText},
 					"content":           {PropertyName: "content", InternalPropertyName: "content", Type: schema.TypeText},
 					"message":           {PropertyName: "message", InternalPropertyName: "message", Type: schema.TypeText},
-					"host.name.keyword": {PropertyName: "host.name.keyword", InternalPropertyName: "host.name.keyword", Type: schema.TypeKeyword},
+					"host_name.keyword": {PropertyName: "host_name.keyword", InternalPropertyName: "host_name.keyword", Type: schema.TypeKeyword},
 					"FlightDelay":       {PropertyName: "FlightDelay", InternalPropertyName: "FlightDelay", Type: schema.TypeText},
 					"Cancelled":         {PropertyName: "Cancelled", InternalPropertyName: "Cancelled", Type: schema.TypeText},
 					"FlightDelayMin":    {PropertyName: "FlightDelayMin", InternalPropertyName: "FlightDelayMin", Type: schema.TypeText},
+					"_id":               {PropertyName: "_id", InternalPropertyName: "_id", Type: schema.TypeText},
 				},
 			},
 		},