diff --git a/fhir-examples/src/main/resources/spec-json.txt b/fhir-examples/src/main/resources/spec-json.txt
index 8c4a7c0970f..6f6de76bc42 100644
--- a/fhir-examples/src/main/resources/spec-json.txt
+++ b/fhir-examples/src/main/resources/spec-json.txt
@@ -1428,11 +1428,11 @@ OK         json/spec/linkage.profile.json
 PARSE      json/spec/lipidprofile-questionnaire.json
 OK         json/spec/lipidprofile.profile.json
 OK         json/spec/list-example-allergies.json
-OK         json/spec/list-example-double-cousin-relationship-pedigree.json
+VALIDATION json/spec/list-example-double-cousin-relationship-pedigree.json
 OK         json/spec/list-example-empty.json
 OK         json/spec/list-example-familyhistory-f201-roel.json
-OK         json/spec/list-example-familyhistory-genetics-profile-annie.json
-OK         json/spec/list-example-familyhistory-genetics-profile.json
+VALIDATION json/spec/list-example-familyhistory-genetics-profile-annie.json
+VALIDATION json/spec/list-example-familyhistory-genetics-profile.json
 OK         json/spec/list-example-long.json
 OK         json/spec/list-example-medlist.json
 OK         json/spec/list-example-simple-empty.json
diff --git a/fhir-examples/src/main/resources/spec-xml.txt b/fhir-examples/src/main/resources/spec-xml.txt
index 324e1d23b20..d8abc76885a 100644
--- a/fhir-examples/src/main/resources/spec-xml.txt
+++ b/fhir-examples/src/main/resources/spec-xml.txt
@@ -421,11 +421,11 @@ OK         xml/spec/linkage-example.xml
 OK         xml/spec/linkage.profile.xml
 OK         xml/spec/lipidprofile.profile.xml
 OK         xml/spec/list-example-allergies.xml
-OK         xml/spec/list-example-double-cousin-relationship-pedigree.xml
+VALIDATION xml/spec/list-example-double-cousin-relationship-pedigree.xml
 OK         xml/spec/list-example-empty.xml
 OK         xml/spec/list-example-familyhistory-f201-roel.xml
-OK         xml/spec/list-example-familyhistory-genetics-profile-annie.xml
-OK         xml/spec/list-example-familyhistory-genetics-profile.xml
+VALIDATION xml/spec/list-example-familyhistory-genetics-profile-annie.xml
+VALIDATION xml/spec/list-example-familyhistory-genetics-profile.xml
 OK         xml/spec/list-example-long.xml
 OK         xml/spec/list-example-medlist.xml
 OK         xml/spec/list-example-simple-empty.xml
diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml
index 86e0f05558c..b70cfef4e1a 100644
--- a/fhir-parent/pom.xml
+++ b/fhir-parent/pom.xml
@@ -45,7 +45,7 @@
         <fhir-model.index>MINIMAL_JSON</fhir-model.index>
         <fhir-validation.index>MINIMAL_JSON</fhir-validation.index>
         <fhir-search.index>MINIMAL_JSON</fhir-search.index>
-        <fhir-persistence-jdbc.index>ALL</fhir-persistence-jdbc.index>
+        <fhir-persistence-jdbc.index>MINIMAL_JSON</fhir-persistence-jdbc.index>
         <fhir-server-test.index>MINIMAL_JSON</fhir-server-test.index>
         <java.version>11</java.version>
         <fhir-examples.version>5.0.0-SNAPSHOT</fhir-examples.version>
diff --git a/fhir-search/pom.xml b/fhir-search/pom.xml
index 2af375c50e3..1d54de9d4e1 100644
--- a/fhir-search/pom.xml
+++ b/fhir-search/pom.xml
@@ -27,6 +27,12 @@
             <artifactId>fhir-path</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- Not strictly required but, without it, you won't have any search parameters or compartment definitions -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fhir-core-r4b</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>