correctly extract existing Text field data.

backend/pkg/models/database/fhir_account.go

@@ -48,8 +48,8 @@ type FhirAccount struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// E.g. patient, expense, depreciation
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -74,7 +74,7 @@ func (s *FhirAccount) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -188,9 +188,9 @@ func (s *FhirAccount) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Account.type')")

backend/pkg/models/database/fhir_adverse_event.go

@@ -66,8 +66,8 @@ type FhirAdverseEvent struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Substance datatypes.JSON `gorm:"column:substance;type:text;serializer:json" json:"substance,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirAdverseEvent) GetSearchParameters() map[string]string {
@@ -95,7 +95,7 @@ func (s *FhirAdverseEvent) GetSearchParameters() map[string]string {
 		"study":                "reference",
 		"subject":              "reference",
 		"substance":            "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -238,9 +238,9 @@ func (s *FhirAdverseEvent) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Substance = []byte(substanceResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_allergy_intolerance.go

@@ -139,8 +139,8 @@ type FhirAllergyIntolerance struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Severity datatypes.JSON `gorm:"column:severity;type:text;serializer:json" json:"severity,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	/*
 	   Multiple Resources:
 
@@ -184,7 +184,7 @@ func (s *FhirAllergyIntolerance) GetSearchParameters() map[string]string {
 		"source_resource_id":   "keyword",
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 		"verificationStatus":   "token",
 	}
@@ -350,9 +350,9 @@ func (s *FhirAllergyIntolerance) PopulateAndExtractSearchParameters(resourceRaw
 		s.Severity = []byte(severityResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'AllergyIntolerance.type | Composition.type | DocumentManifest.type | DocumentReference.type | Encounter.type | EpisodeOfCare.type')")

backend/pkg/models/database/fhir_appointment.go

@@ -78,8 +78,8 @@ type FhirAppointment struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	SupportingInfo datatypes.JSON `gorm:"column:supportingInfo;type:text;serializer:json" json:"supportingInfo,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirAppointment) GetSearchParameters() map[string]string {
@@ -111,7 +111,7 @@ func (s *FhirAppointment) GetSearchParameters() map[string]string {
 		"specialty":            "token",
 		"status":               "token",
 		"supportingInfo":       "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -274,9 +274,9 @@ func (s *FhirAppointment) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 		s.SupportingInfo = []byte(supportingInfoResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_binary.go

@@ -30,8 +30,8 @@ type FhirBinary struct {
 	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
 	MetaVersionId string `gorm:"column:metaVersionId;type:text" json:"metaVersionId,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirBinary) GetSearchParameters() map[string]string {
@@ -47,7 +47,7 @@ func (s *FhirBinary) GetSearchParameters() map[string]string {
 		"source_resource_id":   "keyword",
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -122,9 +122,9 @@ func (s *FhirBinary) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 		s.MetaVersionId = metaVersionIdResult.String()
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_care_plan.go

@@ -140,8 +140,8 @@ type FhirCarePlan struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirCarePlan) GetSearchParameters() map[string]string {
@@ -176,7 +176,7 @@ func (s *FhirCarePlan) GetSearchParameters() map[string]string {
 		"source_uri":            "keyword",
 		"status":                "token",
 		"subject":               "reference",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -362,9 +362,9 @@ func (s *FhirCarePlan) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_care_team.go

@@ -104,8 +104,8 @@ type FhirCareTeam struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirCareTeam) GetSearchParameters() map[string]string {
@@ -128,7 +128,7 @@ func (s *FhirCareTeam) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -246,9 +246,9 @@ func (s *FhirCareTeam) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_claim.go

@@ -75,8 +75,8 @@ type FhirClaim struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	SubdetailUdi datatypes.JSON `gorm:"column:subdetailUdi;type:text;serializer:json" json:"subdetailUdi,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The kind of financial resource
 	// https://hl7.org/fhir/r4/search.html#token
 	Use datatypes.JSON `gorm:"column:use;type:text;serializer:json" json:"use,omitempty"`
@@ -110,7 +110,7 @@ func (s *FhirClaim) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subdetailUdi":         "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"use":                  "token",
 	}
 	return searchParameters
@@ -269,9 +269,9 @@ func (s *FhirClaim) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 		s.SubdetailUdi = []byte(subdetailUdiResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Use
 	useResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Claim.use')")

backend/pkg/models/database/fhir_claim_response.go

@@ -57,8 +57,8 @@ type FhirClaimResponse struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The type of claim
 	// https://hl7.org/fhir/r4/search.html#token
 	Use datatypes.JSON `gorm:"column:use;type:text;serializer:json" json:"use,omitempty"`
@@ -86,7 +86,7 @@ func (s *FhirClaimResponse) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"use":                  "token",
 	}
 	return searchParameters
@@ -223,9 +223,9 @@ func (s *FhirClaimResponse) PopulateAndExtractSearchParameters(resourceRaw json.
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Use
 	useResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'ClaimResponse.use')")

backend/pkg/models/database/fhir_composition.go

@@ -143,8 +143,8 @@ type FhirComposition struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// Human Readable name/title
 	// https://hl7.org/fhir/r4/search.html#string
 	Title datatypes.JSON `gorm:"column:title;type:text;serializer:json" json:"title,omitempty"`
@@ -190,7 +190,7 @@ func (s *FhirComposition) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"title":                "string",
 		"type":                 "token",
 	}
@@ -358,9 +358,9 @@ func (s *FhirComposition) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Title
 	titleResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'Composition.title')")

backend/pkg/models/database/fhir_condition.go

@@ -137,8 +137,8 @@ type FhirCondition struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// unconfirmed | provisional | differential | confirmed | refuted | entered-in-error
 	// https://hl7.org/fhir/r4/search.html#token
 	VerificationStatus datatypes.JSON `gorm:"column:verificationStatus;type:text;serializer:json" json:"verificationStatus,omitempty"`
@@ -176,7 +176,7 @@ func (s *FhirCondition) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"stage":                "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"verificationStatus":   "token",
 	}
 	return searchParameters
@@ -371,9 +371,9 @@ func (s *FhirCondition) PopulateAndExtractSearchParameters(resourceRaw json.RawM
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting VerificationStatus
 	verificationStatusResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Condition.verificationStatus')")

backend/pkg/models/database/fhir_consent.go

@@ -125,8 +125,8 @@ type FhirConsent struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirConsent) GetSearchParameters() map[string]string {
@@ -156,7 +156,7 @@ func (s *FhirConsent) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -317,9 +317,9 @@ func (s *FhirConsent) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_coverage.go

@@ -57,8 +57,8 @@ type FhirCoverage struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subscriber datatypes.JSON `gorm:"column:subscriber;type:text;serializer:json" json:"subscriber,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The kind of coverage (health plan, auto, Workers Compensation)
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -86,7 +86,7 @@ func (s *FhirCoverage) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subscriber":           "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -207,9 +207,9 @@ func (s *FhirCoverage) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Subscriber = []byte(subscriberResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Coverage.type')")

backend/pkg/models/database/fhir_coverage_eligibility_request.go

@@ -48,8 +48,8 @@ type FhirCoverageEligibilityRequest struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirCoverageEligibilityRequest) GetSearchParameters() map[string]string {
@@ -71,7 +71,7 @@ func (s *FhirCoverageEligibilityRequest) GetSearchParameters() map[string]string
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -184,9 +184,9 @@ func (s *FhirCoverageEligibilityRequest) PopulateAndExtractSearchParameters(reso
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_coverage_eligibility_response.go

@@ -54,8 +54,8 @@ type FhirCoverageEligibilityResponse struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirCoverageEligibilityResponse) GetSearchParameters() map[string]string {
@@ -79,7 +79,7 @@ func (s *FhirCoverageEligibilityResponse) GetSearchParameters() map[string]strin
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -202,9 +202,9 @@ func (s *FhirCoverageEligibilityResponse) PopulateAndExtractSearchParameters(res
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_device.go

@@ -51,8 +51,8 @@ type FhirDevice struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The type of the device
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -87,7 +87,7 @@ func (s *FhirDevice) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 		"udiCarrier":           "string",
 		"udiDi":                "string",
@@ -201,9 +201,9 @@ func (s *FhirDevice) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Device.type')")

backend/pkg/models/database/fhir_device_request.go

@@ -146,8 +146,8 @@ type FhirDeviceRequest struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirDeviceRequest) GetSearchParameters() map[string]string {
@@ -180,7 +180,7 @@ func (s *FhirDeviceRequest) GetSearchParameters() map[string]string {
 		"source_uri":            "keyword",
 		"status":                "token",
 		"subject":               "reference",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -356,9 +356,9 @@ func (s *FhirDeviceRequest) PopulateAndExtractSearchParameters(resourceRaw json.
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_diagnostic_report.go

@@ -160,8 +160,8 @@ type FhirDiagnosticReport struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirDiagnosticReport) GetSearchParameters() map[string]string {
@@ -192,7 +192,7 @@ func (s *FhirDiagnosticReport) GetSearchParameters() map[string]string {
 		"specimen":             "reference",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -358,9 +358,9 @@ func (s *FhirDiagnosticReport) PopulateAndExtractSearchParameters(resourceRaw js
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_document_manifest.go

@@ -96,8 +96,8 @@ type FhirDocumentManifest struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	/*
 	   Multiple Resources:
 
@@ -136,7 +136,7 @@ func (s *FhirDocumentManifest) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -275,9 +275,9 @@ func (s *FhirDocumentManifest) PopulateAndExtractSearchParameters(resourceRaw js
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'AllergyIntolerance.type | Composition.type | DocumentManifest.type | DocumentReference.type | Encounter.type | EpisodeOfCare.type')")

backend/pkg/models/database/fhir_document_reference.go

@@ -141,8 +141,8 @@ type FhirDocumentReference struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	/*
 	   Multiple Resources:
 
@@ -191,7 +191,7 @@ func (s *FhirDocumentReference) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -388,9 +388,9 @@ func (s *FhirDocumentReference) PopulateAndExtractSearchParameters(resourceRaw j
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'AllergyIntolerance.type | Composition.type | DocumentManifest.type | DocumentReference.type | Encounter.type | EpisodeOfCare.type')")

backend/pkg/models/database/fhir_encounter.go

@@ -146,8 +146,8 @@ type FhirEncounter struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	/*
 	   Multiple Resources:
 
@@ -196,7 +196,7 @@ func (s *FhirEncounter) GetSearchParameters() map[string]string {
 		"specialArrangement":   "token",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -393,9 +393,9 @@ func (s *FhirEncounter) PopulateAndExtractSearchParameters(resourceRaw json.RawM
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'AllergyIntolerance.type | Composition.type | DocumentManifest.type | DocumentReference.type | Encounter.type | EpisodeOfCare.type')")

backend/pkg/models/database/fhir_endpoint.go

@@ -48,8 +48,8 @@ type FhirEndpoint struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirEndpoint) GetSearchParameters() map[string]string {
@@ -71,7 +71,7 @@ func (s *FhirEndpoint) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -176,9 +176,9 @@ func (s *FhirEndpoint) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_enrollment_request.go

@@ -39,8 +39,8 @@ type FhirEnrollmentRequest struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirEnrollmentRequest) GetSearchParameters() map[string]string {
@@ -59,7 +59,7 @@ func (s *FhirEnrollmentRequest) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -149,9 +149,9 @@ func (s *FhirEnrollmentRequest) PopulateAndExtractSearchParameters(resourceRaw j
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_enrollment_response.go

@@ -39,8 +39,8 @@ type FhirEnrollmentResponse struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirEnrollmentResponse) GetSearchParameters() map[string]string {
@@ -59,7 +59,7 @@ func (s *FhirEnrollmentResponse) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -149,9 +149,9 @@ func (s *FhirEnrollmentResponse) PopulateAndExtractSearchParameters(resourceRaw
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_explanation_of_benefit.go

@@ -78,8 +78,8 @@ type FhirExplanationOfBenefit struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	SubdetailUdi datatypes.JSON `gorm:"column:subdetailUdi;type:text;serializer:json" json:"subdetailUdi,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirExplanationOfBenefit) GetSearchParameters() map[string]string {
@@ -111,7 +111,7 @@ func (s *FhirExplanationOfBenefit) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subdetailUdi":         "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -274,9 +274,9 @@ func (s *FhirExplanationOfBenefit) PopulateAndExtractSearchParameters(resourceRa
 		s.SubdetailUdi = []byte(subdetailUdiResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_family_member_history.go

@@ -124,8 +124,8 @@ type FhirFamilyMemberHistory struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirFamilyMemberHistory) GetSearchParameters() map[string]string {
@@ -149,7 +149,7 @@ func (s *FhirFamilyMemberHistory) GetSearchParameters() map[string]string {
 		"source_resource_type":  "keyword",
 		"source_uri":            "keyword",
 		"status":                "token",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -272,9 +272,9 @@ func (s *FhirFamilyMemberHistory) PopulateAndExtractSearchParameters(resourceRaw
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_goal.go

@@ -84,8 +84,8 @@ type FhirGoal struct {
 	// https://hl7.org/fhir/r4/search.html#date
 	TargetDate *time.Time `gorm:"column:targetDate;type:datetime" json:"targetDate,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirGoal) GetSearchParameters() map[string]string {
@@ -108,7 +108,7 @@ func (s *FhirGoal) GetSearchParameters() map[string]string {
 		"startDate":            "date",
 		"subject":              "reference",
 		"targetDate":           "date",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -234,9 +234,9 @@ func (s *FhirGoal) PopulateAndExtractSearchParameters(resourceRaw json.RawMessag
 		}
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_imaging_study.go

@@ -111,8 +111,8 @@ type FhirImagingStudy struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirImagingStudy) GetSearchParameters() map[string]string {
@@ -144,7 +144,7 @@ func (s *FhirImagingStudy) GetSearchParameters() map[string]string {
 		"started":              "date",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -307,9 +307,9 @@ func (s *FhirImagingStudy) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_immunization.go

@@ -125,8 +125,8 @@ type FhirImmunization struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	TargetDisease datatypes.JSON `gorm:"column:targetDisease;type:text;serializer:json" json:"targetDisease,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// Vaccine Product Administered
 	// https://hl7.org/fhir/r4/search.html#token
 	VaccineCode datatypes.JSON `gorm:"column:vaccineCode;type:text;serializer:json" json:"vaccineCode,omitempty"`
@@ -159,7 +159,7 @@ func (s *FhirImmunization) GetSearchParameters() map[string]string {
 		"status":               "token",
 		"statusReason":         "token",
 		"targetDisease":        "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"vaccineCode":          "token",
 	}
 	return searchParameters
@@ -321,9 +321,9 @@ func (s *FhirImmunization) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.TargetDisease = []byte(targetDiseaseResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting VaccineCode
 	vaccineCodeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Immunization.vaccineCode')")

backend/pkg/models/database/fhir_insurance_plan.go

@@ -69,8 +69,8 @@ type FhirInsurancePlan struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// A code for the type of organization
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -102,7 +102,7 @@ func (s *FhirInsurancePlan) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -243,9 +243,9 @@ func (s *FhirInsurancePlan) PopulateAndExtractSearchParameters(resourceRaw json.
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'InsurancePlan.type')")

backend/pkg/models/database/fhir_location.go

@@ -69,8 +69,8 @@ type FhirLocation struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// A code for the type of location
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -102,7 +102,7 @@ func (s *FhirLocation) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -243,9 +243,9 @@ func (s *FhirLocation) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Location.type')")

backend/pkg/models/database/fhir_media.go

@@ -60,8 +60,8 @@ type FhirMedia struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// Classification of media as image, video, or audio
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -93,7 +93,7 @@ func (s *FhirMedia) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 		"view":                 "token",
 	}
@@ -228,9 +228,9 @@ func (s *FhirMedia) PopulateAndExtractSearchParameters(resourceRaw json.RawMessa
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Media.type')")

backend/pkg/models/database/fhir_medication.go

@@ -74,8 +74,8 @@ type FhirMedication struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirMedication) GetSearchParameters() map[string]string {
@@ -100,7 +100,7 @@ func (s *FhirMedication) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -228,9 +228,9 @@ func (s *FhirMedication) PopulateAndExtractSearchParameters(resourceRaw json.Raw
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_medication_administration.go

@@ -130,8 +130,8 @@ type FhirMedicationAdministration struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirMedicationAdministration) GetSearchParameters() map[string]string {
@@ -159,7 +159,7 @@ func (s *FhirMedicationAdministration) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -302,9 +302,9 @@ func (s *FhirMedicationAdministration) PopulateAndExtractSearchParameters(resour
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_medication_dispense.go

@@ -131,8 +131,8 @@ type FhirMedicationDispense struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// Returns dispenses of a specific type
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -168,7 +168,7 @@ func (s *FhirMedicationDispense) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 		"whenhandedover":       "date",
 		"whenprepared":         "date",
@@ -301,9 +301,9 @@ func (s *FhirMedicationDispense) PopulateAndExtractSearchParameters(resourceRaw
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'MedicationDispense.type')")

backend/pkg/models/database/fhir_medication_request.go

@@ -147,8 +147,8 @@ type FhirMedicationRequest struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirMedicationRequest) GetSearchParameters() map[string]string {
@@ -179,7 +179,7 @@ func (s *FhirMedicationRequest) GetSearchParameters() map[string]string {
 		"source_uri":            "keyword",
 		"status":                "token",
 		"subject":               "reference",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -345,9 +345,9 @@ func (s *FhirMedicationRequest) PopulateAndExtractSearchParameters(resourceRaw j
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_medication_statement.go

@@ -124,8 +124,8 @@ type FhirMedicationStatement struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirMedicationStatement) GetSearchParameters() map[string]string {
@@ -151,7 +151,7 @@ func (s *FhirMedicationStatement) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -284,9 +284,9 @@ func (s *FhirMedicationStatement) PopulateAndExtractSearchParameters(resourceRaw
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_nutrition_order.go

@@ -111,8 +111,8 @@ type FhirNutritionOrder struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Supplement datatypes.JSON `gorm:"column:supplement;type:text;serializer:json" json:"supplement,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirNutritionOrder) GetSearchParameters() map[string]string {
@@ -139,7 +139,7 @@ func (s *FhirNutritionOrder) GetSearchParameters() map[string]string {
 		"source_uri":            "keyword",
 		"status":                "token",
 		"supplement":            "token",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -277,9 +277,9 @@ func (s *FhirNutritionOrder) PopulateAndExtractSearchParameters(resourceRaw json
 		s.Supplement = []byte(supplementResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_observation.go

@@ -190,8 +190,8 @@ type FhirObservation struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The value of the observation, if the value is a CodeableConcept
 	// https://hl7.org/fhir/r4/search.html#token
 	ValueConcept datatypes.JSON `gorm:"column:valueConcept;type:text;serializer:json" json:"valueConcept,omitempty"`
@@ -244,7 +244,7 @@ func (s *FhirObservation) GetSearchParameters() map[string]string {
 		"specimen":                  "reference",
 		"status":                    "token",
 		"subject":                   "reference",
-		"text":                      "keyword",
+		"text":                      "string",
 		"valueConcept":              "token",
 		"valueDate":                 "date",
 		"valueQuantity":             "quantity",
@@ -456,9 +456,9 @@ func (s *FhirObservation) PopulateAndExtractSearchParameters(resourceRaw json.Ra
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting ValueConcept
 	valueConceptResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, '(Observation.valueCodeableConcept)')")

backend/pkg/models/database/fhir_organization.go

@@ -66,8 +66,8 @@ type FhirOrganization struct {
 	// https://hl7.org/fhir/r4/search.html#string
 	Phonetic datatypes.JSON `gorm:"column:phonetic;type:text;serializer:json" json:"phonetic,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// A code for the type of organization
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -98,7 +98,7 @@ func (s *FhirOrganization) GetSearchParameters() map[string]string {
 		"source_resource_id":   "keyword",
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -234,9 +234,9 @@ func (s *FhirOrganization) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Phonetic = []byte(phoneticResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Organization.type')")

backend/pkg/models/database/fhir_organization_affiliation.go

@@ -72,8 +72,8 @@ type FhirOrganizationAffiliation struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirOrganizationAffiliation) GetSearchParameters() map[string]string {
@@ -103,7 +103,7 @@ func (s *FhirOrganizationAffiliation) GetSearchParameters() map[string]string {
 		"source_uri":                "keyword",
 		"specialty":                 "token",
 		"telecom":                   "token",
-		"text":                      "keyword",
+		"text":                      "string",
 	}
 	return searchParameters
 }
@@ -256,9 +256,9 @@ func (s *FhirOrganizationAffiliation) PopulateAndExtractSearchParameters(resourc
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_patient.go

@@ -192,8 +192,8 @@ type FhirPatient struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirPatient) GetSearchParameters() map[string]string {
@@ -231,7 +231,7 @@ func (s *FhirPatient) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"telecom":              "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -432,9 +432,9 @@ func (s *FhirPatient) PopulateAndExtractSearchParameters(resourceRaw json.RawMes
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_person.go

@@ -170,8 +170,8 @@ type FhirPerson struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirPerson) GetSearchParameters() map[string]string {
@@ -205,7 +205,7 @@ func (s *FhirPerson) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"telecom":              "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -378,9 +378,9 @@ func (s *FhirPerson) PopulateAndExtractSearchParameters(resourceRaw json.RawMess
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_practitioner.go

@@ -171,8 +171,8 @@ type FhirPractitioner struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirPractitioner) GetSearchParameters() map[string]string {
@@ -205,7 +205,7 @@ func (s *FhirPractitioner) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"telecom":              "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -365,9 +365,9 @@ func (s *FhirPractitioner) PopulateAndExtractSearchParameters(resourceRaw json.R
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_practitioner_role.go

@@ -93,8 +93,8 @@ type FhirPractitionerRole struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirPractitionerRole) GetSearchParameters() map[string]string {
@@ -123,7 +123,7 @@ func (s *FhirPractitionerRole) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"specialty":            "token",
 		"telecom":              "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -271,9 +271,9 @@ func (s *FhirPractitionerRole) PopulateAndExtractSearchParameters(resourceRaw js
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_procedure.go

@@ -160,8 +160,8 @@ type FhirProcedure struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirProcedure) GetSearchParameters() map[string]string {
@@ -192,7 +192,7 @@ func (s *FhirProcedure) GetSearchParameters() map[string]string {
 		"source_uri":            "keyword",
 		"status":                "token",
 		"subject":               "reference",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -350,9 +350,9 @@ func (s *FhirProcedure) PopulateAndExtractSearchParameters(resourceRaw json.RawM
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_provenance.go

@@ -54,8 +54,8 @@ type FhirProvenance struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Target datatypes.JSON `gorm:"column:target;type:text;serializer:json" json:"target,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// When the activity occurred
 	// https://hl7.org/fhir/r4/search.html#date
 	When *time.Time `gorm:"column:when;type:datetime" json:"when,omitempty"`
@@ -82,7 +82,7 @@ func (s *FhirProvenance) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"target":               "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"when":                 "date",
 	}
 	return searchParameters
@@ -206,9 +206,9 @@ func (s *FhirProvenance) PopulateAndExtractSearchParameters(resourceRaw json.Raw
 		s.Target = []byte(targetResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting When
 	whenResult, err := vm.RunString("extractDateSearchParameters(fhirResource, '(Provenance.occurredDateTime)')")

backend/pkg/models/database/fhir_questionnaire.go

@@ -72,8 +72,8 @@ type FhirQuestionnaire struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	SubjectType datatypes.JSON `gorm:"column:subjectType;type:text;serializer:json" json:"subjectType,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The human-friendly name of the questionnaire
 	// https://hl7.org/fhir/r4/search.html#string
 	Title datatypes.JSON `gorm:"column:title;type:text;serializer:json" json:"title,omitempty"`
@@ -112,7 +112,7 @@ func (s *FhirQuestionnaire) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subjectType":          "token",
-		"text":                 "keyword",
+		"text":                 "string",
 		"title":                "string",
 		"url":                  "uri",
 		"version":              "token",
@@ -276,9 +276,9 @@ func (s *FhirQuestionnaire) PopulateAndExtractSearchParameters(resourceRaw json.
 		s.SubjectType = []byte(subjectTypeResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Title
 	titleResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'Questionnaire.title')")

backend/pkg/models/database/fhir_questionnaire_response.go

@@ -60,8 +60,8 @@ type FhirQuestionnaireResponse struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirQuestionnaireResponse) GetSearchParameters() map[string]string {
@@ -87,7 +87,7 @@ func (s *FhirQuestionnaireResponse) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -220,9 +220,9 @@ func (s *FhirQuestionnaireResponse) PopulateAndExtractSearchParameters(resourceR
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_related_person.go

@@ -164,8 +164,8 @@ type FhirRelatedPerson struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Telecom datatypes.JSON `gorm:"column:telecom;type:text;serializer:json" json:"telecom,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirRelatedPerson) GetSearchParameters() map[string]string {
@@ -197,7 +197,7 @@ func (s *FhirRelatedPerson) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"telecom":              "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -360,9 +360,9 @@ func (s *FhirRelatedPerson) PopulateAndExtractSearchParameters(resourceRaw json.
 		s.Telecom = []byte(telecomResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_schedule.go

@@ -51,8 +51,8 @@ type FhirSchedule struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Specialty datatypes.JSON `gorm:"column:specialty;type:text;serializer:json" json:"specialty,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirSchedule) GetSearchParameters() map[string]string {
@@ -75,7 +75,7 @@ func (s *FhirSchedule) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"specialty":            "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -193,9 +193,9 @@ func (s *FhirSchedule) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Specialty = []byte(specialtyResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_service_request.go

@@ -155,8 +155,8 @@ type FhirServiceRequest struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirServiceRequest) GetSearchParameters() map[string]string {
@@ -192,7 +192,7 @@ func (s *FhirServiceRequest) GetSearchParameters() map[string]string {
 		"specimen":              "reference",
 		"status":                "token",
 		"subject":               "reference",
-		"text":                  "keyword",
+		"text":                  "string",
 	}
 	return searchParameters
 }
@@ -383,9 +383,9 @@ func (s *FhirServiceRequest) PopulateAndExtractSearchParameters(resourceRaw json
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_slot.go

@@ -54,8 +54,8 @@ type FhirSlot struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirSlot) GetSearchParameters() map[string]string {
@@ -79,7 +79,7 @@ func (s *FhirSlot) GetSearchParameters() map[string]string {
 		"specialty":            "token",
 		"start":                "date",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -202,9 +202,9 @@ func (s *FhirSlot) PopulateAndExtractSearchParameters(resourceRaw json.RawMessag
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/fhir_specimen.go

@@ -60,8 +60,8 @@ type FhirSpecimen struct {
 	// https://hl7.org/fhir/r4/search.html#reference
 	Subject datatypes.JSON `gorm:"column:subject;type:text;serializer:json" json:"subject,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 	// The specimen type
 	// https://hl7.org/fhir/r4/search.html#token
 	Type datatypes.JSON `gorm:"column:type;type:text;serializer:json" json:"type,omitempty"`
@@ -90,7 +90,7 @@ func (s *FhirSpecimen) GetSearchParameters() map[string]string {
 		"source_uri":           "keyword",
 		"status":               "token",
 		"subject":              "reference",
-		"text":                 "keyword",
+		"text":                 "string",
 		"type":                 "token",
 	}
 	return searchParameters
@@ -224,9 +224,9 @@ func (s *FhirSpecimen) PopulateAndExtractSearchParameters(resourceRaw json.RawMe
 		s.Subject = []byte(subjectResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	// extracting Type
 	typeResult, err := vm.RunString("extractTokenSearchParameters(fhirResource, 'Specimen.type')")

backend/pkg/models/database/fhir_vision_prescription.go

@@ -93,8 +93,8 @@ type FhirVisionPrescription struct {
 	// https://hl7.org/fhir/r4/search.html#token
 	Status datatypes.JSON `gorm:"column:status;type:text;serializer:json" json:"status,omitempty"`
 	// Text search against the narrative
-	// This is a primitive string literal (`keyword` type). It is not a recognized SearchParameter type from https://hl7.org/fhir/r4/search.html, it's Fasten Health-specific
-	Text string `gorm:"column:text;type:text" json:"text,omitempty"`
+	// https://hl7.org/fhir/r4/search.html#string
+	Text datatypes.JSON `gorm:"column:text;type:text;serializer:json" json:"text,omitempty"`
 }
 
 func (s *FhirVisionPrescription) GetSearchParameters() map[string]string {
@@ -115,7 +115,7 @@ func (s *FhirVisionPrescription) GetSearchParameters() map[string]string {
 		"source_resource_type": "keyword",
 		"source_uri":           "keyword",
 		"status":               "token",
-		"text":                 "keyword",
+		"text":                 "string",
 	}
 	return searchParameters
 }
@@ -223,9 +223,9 @@ func (s *FhirVisionPrescription) PopulateAndExtractSearchParameters(resourceRaw
 		s.Status = []byte(statusResult.String())
 	}
 	// extracting Text
-	textResult, err := vm.RunString("extractSimpleSearchParameters(fhirResource, 'text')")
+	textResult, err := vm.RunString("extractStringSearchParameters(fhirResource, 'text')")
 	if err == nil && textResult.String() != "undefined" {
-		s.Text = textResult.String()
+		s.Text = []byte(textResult.String())
 	}
 	return nil
 }

backend/pkg/models/database/generate.go

@@ -166,7 +166,7 @@ func main() {
 			FHIRPathExpression: "Resource.meta.tag",
 		}
 		fieldMap["Text"] = DBField{
-			FieldType:          "keyword",
+			FieldType:          "string",
 			Description:        "Text search against the narrative",
 			FHIRPathExpression: "text",
 		}

backend/pkg/models/database/searchParameterExtractor.js

@@ -49,6 +49,9 @@ function extractStringSearchParameters(fhirResource, expression){
                 addressParts.push(currentValue.country)
             }
             accumulator.push(addressParts.join(" "))
+        } else if (currentValue.status && currentValue.div) {
+            // Text (Narrative - http://hl7.org/fhir/R4/narrative.html#Narrative)
+            accumulator.push(currentValue.div)
         } else {
             //string, boolean
             accumulator.push(currentValue)