diff --git a/src/main/scala/fr/aphp/id/eds/requester/jobs/SparkJobParameter.scala b/src/main/scala/fr/aphp/id/eds/requester/jobs/SparkJobParameter.scala
index a50e463..6c32014 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/jobs/SparkJobParameter.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/jobs/SparkJobParameter.scala
@@ -35,7 +35,6 @@ object JobType extends Enumeration {
 
 object ResourceType extends Enumeration {
   type ResourceType = String
-  val claim = "Claim"
   val condition = "Condition"
   val documentReference = "DocumentReference"
   val encounter = "Encounter"
@@ -48,7 +47,6 @@ object ResourceType extends Enumeration {
   val questionnaireResponse = "QuestionnaireResponse"
 
   val all: Seq[ResourceType] = Seq(
-    claim,
     condition,
     documentReference,
     encounter,
diff --git a/src/main/scala/fr/aphp/id/eds/requester/query/engine/QueryBuilderUtils.scala b/src/main/scala/fr/aphp/id/eds/requester/query/engine/QueryBuilderUtils.scala
index 8ff525f..7ee8fa5 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/query/engine/QueryBuilderUtils.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/query/engine/QueryBuilderUtils.scala
@@ -48,9 +48,6 @@ object QueryBuilderUtils {
                                        QueryColumn.ENCOUNTER_START_DATE,
                                        QueryColumn.ENCOUNTER_END_DATE),
       FhirResource.GROUP -> List(),
-      FhirResource.CLAIM -> List(QueryColumn.ENCOUNTER_END_DATE,
-                                 QueryColumn.ENCOUNTER_START_DATE,
-                                 EVENT_DATE),
       FhirResource.PROCEDURE -> List(EVENT_DATE,
                                      QueryColumn.ENCOUNTER_END_DATE,
                                      QueryColumn.ENCOUNTER_START_DATE),
diff --git a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/rest/RestFhirQueryElementsConfig.scala b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/rest/RestFhirQueryElementsConfig.scala
index e8abe4c..ae7bba6 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/rest/RestFhirQueryElementsConfig.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/rest/RestFhirQueryElementsConfig.scala
@@ -49,8 +49,6 @@ class RestFhirQueryElementsConfig extends ResourceConfig {
       defaultResourceMapping(Some("subject"), Some("encounter"), Some("effectivePeriod.start"), codeColumn = Some("medicationCodeableConcept.coding.code"))),
     FhirResource.DOCUMENT_REFERENCE -> addJoinedResourceColumns(
       defaultResourceMapping(Some("subject"), Some("encounter"), Some("date"))),
-    FhirResource.CLAIM -> addJoinedResourceColumns(
-      defaultResourceMapping(Some("subject"), Some("encounter"), Some("created"), codeColumn = Some("diagnosis.diagnosisCodeableConcept.coding.code"))),
     FhirResource.PROCEDURE -> addJoinedResourceColumns(
       defaultResourceMapping(Some("subject"), Some("encounter"), Some("date"), codeColumn = Some("code.coding.code"))),
     FhirResource.IMAGING_STUDY -> addJoinedResourceColumns(
diff --git a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryElementsConfig.scala b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryElementsConfig.scala
index 31053ef..9dae752 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryElementsConfig.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryElementsConfig.scala
@@ -53,9 +53,6 @@ class SolrQueryElementsConfig extends ResourceConfig {
     FhirResource.COMPOSITION -> buildDefaultMap(List(SolrColumn.Document.DATE)),
     FhirResource.GROUP -> Map(QueryColumn.PATIENT -> List(SolrColumn.Group.RESOURCE_ID),
                               QueryColumn.ID -> List(SolrColumn.ID)),
-    FhirResource.CLAIM -> buildDefaultMap(List(SolrColumn.Claim.CREATED),
-      codeCol = Some(List(SolrColumn.Claim.CODE))
-    ),
     FhirResource.PROCEDURE -> buildDefaultMap(List(SolrColumn.Procedure.DATE),
       codeCol = Some(List(SolrColumn.Procedure.CODE))
     ),
diff --git a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryResolver.scala b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryResolver.scala
index 671b442..62b417e 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryResolver.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/SolrQueryResolver.scala
@@ -49,7 +49,7 @@ class SolrQueryResolver(solrSparkReader: SolrSparkReader,
       if (codeColumns.nonEmpty) {
         criterionDataFrame = criterionDataFrame.withColumn(
           QueryColumn.CODE,
-          array_join(array(codeColumns.map((c) => col(s"`${c}`")): _*), ",")
+          array_join(array(codeColumns.map(c => col(s"`$c`")): _*), ",")
         )
       }
     }
@@ -79,7 +79,7 @@ class SolrQueryResolver(solrSparkReader: SolrSparkReader,
       return ""
     }
     val list = sourcePopulation.cohortList.get.map(x => x.toString).mkString(" ")
-    s"_list:(${list}) OR ({!join from=resourceId to=_subject fromIndex=groupAphp v='groupId:(${list})' score=none method=crossCollection})"
+    s"_list:($list) OR ({!join from=resourceId to=_subject fromIndex=groupAphp v='groupId:($list)' score=none method=crossCollection})"
   }
 
   /**
@@ -136,7 +136,6 @@ object SolrCollections {
     FhirResource.CONDITION -> CONDITION_APHP,
     FhirResource.PROCEDURE -> PROCEDURE_APHP,
     FhirResource.DOCUMENT_REFERENCE -> DOCUMENTREFERENCE_APHP,
-    FhirResource.CLAIM -> CLAIM_APHP,
     FhirResource.COMPOSITION -> COMPOSITION_APHP,
     FhirResource.GROUP -> GROUP_APHP,
     FhirResource.MEDICATION_REQUEST -> MEDICATIONREQUEST_APHP,
diff --git a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/package.scala b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/package.scala
index 800011b..73dacc2 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/package.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/query/resolver/solr/package.scala
@@ -40,13 +40,8 @@ package object solr {
       final val CODE = "code.coding.display.anabio"
     }
 
-    object Claim {
-      final val CREATED = "created"
-      final val CODE = "diagnosis.diagnosisCodeableConcept.coding.display"
-    }
-
     object Condition {
-      final val RECORDED_DATE = "recordedDate"
+      final val RECORDED_DATE = "onsetDateTime"
       final val CODE = "code.coding.display"
     }
 
diff --git a/src/main/scala/fr/aphp/id/eds/requester/requester.scala b/src/main/scala/fr/aphp/id/eds/requester/requester.scala
index 9cf214b..c307747 100644
--- a/src/main/scala/fr/aphp/id/eds/requester/requester.scala
+++ b/src/main/scala/fr/aphp/id/eds/requester/requester.scala
@@ -9,7 +9,6 @@ package object requester {
     final val CONDITION = "Condition"
     final val PROCEDURE = "Procedure"
     final val DOCUMENT_REFERENCE = "DocumentReference"
-    final val CLAIM = "Claim"
     final val COMPOSITION = "Composition"
     final val GROUP = "Group"
     final val MEDICATION_REQUEST = "MedicationRequest"
@@ -25,7 +24,6 @@ package object requester {
     final val CONDITION_APHP = "conditionAphp"
     final val PROCEDURE_APHP = "procedureAphp"
     final val DOCUMENTREFERENCE_APHP = "documentReferenceAphp"
-    final val CLAIM_APHP = "claimAphp"
     final val COMPOSITION_APHP = "compositionAphp"
     final val GROUP_APHP = "groupAphp"
     final val MEDICATIONREQUEST_APHP = "medicationRequestAphp"