diff --git a/src/main/java/org/cbioportal/persistence/helper/StudyViewFilterHelper.java b/src/main/java/org/cbioportal/persistence/helper/StudyViewFilterHelper.java
index 14c77b47f04..a5d16a6de94 100644
--- a/src/main/java/org/cbioportal/persistence/helper/StudyViewFilterHelper.java
+++ b/src/main/java/org/cbioportal/persistence/helper/StudyViewFilterHelper.java
@@ -1,108 +1,48 @@
 package org.cbioportal.persistence.helper;
 
-import org.cbioportal.model.ClinicalAttribute;
-import org.cbioportal.persistence.enums.ClinicalAttributeDataSource;
-import org.cbioportal.web.parameter.CategorizedClinicalDataCountFilter;
+import org.cbioportal.web.parameter.ClinicalDataFilter;
 import org.cbioportal.web.parameter.CustomSampleIdentifier;
 import org.cbioportal.web.parameter.StudyViewFilter;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 public final class StudyViewFilterHelper {
     public static StudyViewFilterHelper build(@Nullable StudyViewFilter studyViewFilter,
-                                              @Nullable Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributesMap,
-                                              @Nullable List<CustomSampleIdentifier> customDataSamples) {
+            @Nullable List<CustomSampleIdentifier> customDataSamples) {
         if (Objects.isNull(studyViewFilter)) {
             studyViewFilter = new StudyViewFilter();
         }
-        if (Objects.isNull(clinicalAttributesMap)) {
-            clinicalAttributesMap = new EnumMap<>(ClinicalAttributeDataSource.class);
-        }
         if (Objects.isNull(customDataSamples)) {
             customDataSamples = new ArrayList<>();
         }
-        return new StudyViewFilterHelper(studyViewFilter, clinicalAttributesMap, customDataSamples);
+        return new StudyViewFilterHelper(studyViewFilter, customDataSamples);
     }
-    
+
     private final StudyViewFilter studyViewFilter;
-    private final CategorizedClinicalDataCountFilter categorizedClinicalDataCountFilter;
     private final List<CustomSampleIdentifier> customDataSamples;
-    private final boolean applyPatientIdFilters;
 
-   
-    private StudyViewFilterHelper(@NonNull StudyViewFilter studyViewFilter, @NonNull Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributesMap,
-                                  @NonNull List<CustomSampleIdentifier> customDataSamples) {
+    private StudyViewFilterHelper(@NonNull StudyViewFilter studyViewFilter,
+            @NonNull List<CustomSampleIdentifier> customDataSamples) {
         this.studyViewFilter = studyViewFilter;
-        this.categorizedClinicalDataCountFilter = extractClinicalDataCountFilters(studyViewFilter, clinicalAttributesMap);
+       
         this.customDataSamples = customDataSamples;
-        this.applyPatientIdFilters = shouldApplyPatientIdFilters();
     }
-    
+
     public StudyViewFilter studyViewFilter() {
         return studyViewFilter;
     }
-    
-    public CategorizedClinicalDataCountFilter categorizedClinicalDataCountFilter() {
-        return categorizedClinicalDataCountFilter;
-    }
-    
+
     public List<CustomSampleIdentifier> customDataSamples() {
         return this.customDataSamples;
     }
-    
-    private CategorizedClinicalDataCountFilter extractClinicalDataCountFilters(final StudyViewFilter studyViewFilter, Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributesMap) {
-
-        if (studyViewFilter.getClinicalDataFilters() == null || clinicalAttributesMap.isEmpty()) {
-            return CategorizedClinicalDataCountFilter.getBuilder().build();
-        }
-
-        List<String> patientCategoricalAttributes = clinicalAttributesMap.get(ClinicalAttributeDataSource.PATIENT)
-            .stream().filter(ca -> ca.getDatatype().equals("STRING"))
-            .map(ClinicalAttribute::getAttrId)
-            .toList();
-
-        List<String> patientNumericalAttributes = clinicalAttributesMap.get(ClinicalAttributeDataSource.PATIENT)
-            .stream().filter(ca -> ca.getDatatype().equals("NUMBER"))
-            .map(ClinicalAttribute::getAttrId)
-            .toList();
-
-        List<String> sampleCategoricalAttributes = clinicalAttributesMap.get(ClinicalAttributeDataSource.SAMPLE)
-            .stream().filter(ca -> ca.getDatatype().equals("STRING"))
-            .map(ClinicalAttribute::getAttrId)
-            .toList();
-
-        List<String> sampleNumericalAttributes = clinicalAttributesMap.get(ClinicalAttributeDataSource.SAMPLE)
-            .stream().filter(ca -> ca.getDatatype().equals("NUMBER"))
-            .map(ClinicalAttribute::getAttrId)
-            .toList();
-
-        return CategorizedClinicalDataCountFilter.getBuilder()
-            .setPatientCategoricalClinicalDataFilters(studyViewFilter.getClinicalDataFilters()
-                .stream().filter(clinicalDataFilter -> patientCategoricalAttributes.contains(clinicalDataFilter.getAttributeId()))
-                .toList())
-            .setPatientNumericalClinicalDataFilters(studyViewFilter.getClinicalDataFilters().stream()
-                .filter(clinicalDataFilter -> patientNumericalAttributes.contains(clinicalDataFilter.getAttributeId()))
-                .toList())
-            .setSampleCategoricalClinicalDataFilters(studyViewFilter.getClinicalDataFilters().stream()
-                .filter(clinicalDataFilter -> sampleCategoricalAttributes.contains(clinicalDataFilter.getAttributeId()))
-                .toList())
-            .setSampleNumericalClinicalDataFilters(studyViewFilter.getClinicalDataFilters().stream()
-                .filter(clinicalDataFilter -> sampleNumericalAttributes.contains(clinicalDataFilter.getAttributeId()))
-                .toList())
-            .build();
-    }
 
-    public boolean shouldApplyPatientIdFilters() {
-        return studyViewFilter.getClinicalEventFilters() != null && !studyViewFilter.getClinicalEventFilters().isEmpty()
-            || studyViewFilter.getPatientTreatmentFilters() != null && studyViewFilter.getPatientTreatmentFilters().getFilters()!= null && !studyViewFilter.getPatientTreatmentFilters().getFilters().isEmpty()
-            || categorizedClinicalDataCountFilter.getPatientCategoricalClinicalDataFilters() != null && !categorizedClinicalDataCountFilter.getPatientCategoricalClinicalDataFilters().isEmpty()
-            || categorizedClinicalDataCountFilter.getPatientNumericalClinicalDataFilters() != null && !categorizedClinicalDataCountFilter.getPatientNumericalClinicalDataFilters().isEmpty();
+    public boolean isCategoricalClinicalDataFilter(ClinicalDataFilter clinicalDataFilter) {
+        var filterValue = clinicalDataFilter.getValues().getFirst();
+        return filterValue.getValue() != null;
     }
 
 }
diff --git a/src/main/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMyBatisRepository.java b/src/main/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMyBatisRepository.java
index 5bf385f366e..d522b2f3b9b 100644
--- a/src/main/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMyBatisRepository.java
+++ b/src/main/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMyBatisRepository.java
@@ -101,7 +101,7 @@ public List<GenomicDataCount> getMolecularProfileSampleCounts(StudyViewFilterCon
     }
     
     public StudyViewFilterHelper createStudyViewFilterHelper(StudyViewFilterContext studyViewFilterContext) {
-        return StudyViewFilterHelper.build(studyViewFilterContext.studyViewFilter(), getClinicalAttributeNameMap(), studyViewFilterContext.customDataFilterSamples());    
+        return StudyViewFilterHelper.build(studyViewFilterContext.studyViewFilter(), studyViewFilterContext.customDataFilterSamples());    
     }
     
     @Override
diff --git a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
index f2ce040188e..ca289ebc4b5 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
@@ -5,7 +5,7 @@
     <sql id="sampleUniqueIdsFromStudyViewFilter">
         <trim prefixOverrides="INTERSECT">
             <if test="studyViewFilterHelper.studyViewFilter.studyIds != null and !studyViewFilterHelper.studyViewFilter.studyIds.isEmpty()">
-                INTERSECT 
+                INTERSECT
                 SELECT sample_unique_id
                 FROM sample_derived
                 WHERE cancer_study_identifier IN
@@ -32,7 +32,7 @@
                     </foreach>
                 )
             </if>
-                
+
             <if test="studyViewFilterHelper.studyViewFilter.genomicProfiles != null and !studyViewFilterHelper.studyViewFilter.genomicProfiles.isEmpty()">
                 INTERSECT
                 SELECT * FROM (
@@ -47,16 +47,16 @@
                         <foreach item="studyId" collection="studyViewFilterHelper.studyViewFilter.studyIds" open="(" separator="," close=")">
                             #{studyId}
                         </foreach>
-                        AND 
+                        AND
                         <foreach item="genomicProfileId" collection="ANDGroup" open="(" separator="OR" close=")">
                             gp.stable_id LIKE '%_${genomicProfileId}'
                         </foreach>
                     </where>
                 </foreach>
                 )
-                     
+
             </if>
-  
+
             <if test="studyViewFilterHelper.studyViewFilter.sampleIdentifiers != null and !studyViewFilterHelper.studyViewFilter.sampleIdentifiers.isEmpty()">
                 INTERSECT
                 SELECT sample_unique_id
@@ -115,39 +115,21 @@
                             <foreach item="molecularProfileId" collection="profileGroup.getMolecularProfileIds()" open="(" separator="," close=")">
                                 #{molecularProfileId}
                             </foreach>
-                        
+
                             <foreach item="geneFilterQuery" collection="geneFilterQueryList" open=" AND (" separator=") OR (" close=")">
                                 hugo_gene_symbol = #{geneFilterQuery.hugoGeneSymbol}
                                 <foreach item="alteration" collection="geneFilterQuery.getAlterations()" open="AND (" separator=") OR (" close=")">
-                                   cna_alteration = #{alteration.code} 
+                                   cna_alteration = #{alteration.code}
                                 </foreach>
                             </foreach>
                         </where>
                     </foreach>
                 </foreach>
             </if>
-            <if test="studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleNumericalClinicalDataFilters() != null and !studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleNumericalClinicalDataFilters().isEmpty()">
-                <foreach item="clinicalDataFilter" collection="studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleNumericalClinicalDataFilters()" open="INTERSECT" separator="INTERSECT">
-                    <include refid="numericalClinicalDataCountFilter">
-                        <property name="unique_id" value="sample_unique_id"/>
-                        <property name="table_name" value="clinical_data_derived"/>
-                        <property name="type" value="sample"/>
-                    </include>
-                </foreach>
-            </if>
-            <if test="studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleCategoricalClinicalDataFilters() != null and !studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleCategoricalClinicalDataFilters().isEmpty()">
-                <foreach item="clinicalDataFilter" collection="studyViewFilterHelper.categorizedClinicalDataCountFilter.getSampleCategoricalClinicalDataFilters()" open="INTERSECT" separator="INTERSECT">
-                    <include refid="categoricalClinicalDataCountFilter">
-                        <property name="unique_id" value="sample_unique_id"/>
-                        <property name="table_name" value="clinical_data_derived"/>
-                        <property name="type" value="sample"/>
-                    </include>
-                </foreach>
-            </if>
             <if test="studyViewFilterHelper.studyViewFilter.mutationDataFilters != null and !studyViewFilterHelper.studyViewFilter.mutationDataFilters.isEmpty()">
                 <foreach item="mutationDataFilter" collection="studyViewFilterHelper.studyViewFilter.mutationDataFilters" open="INTERSECT" separator="INTERSECT">
                     <include refid="applyMutationDataFilter"/>
-                </foreach>                        
+                </foreach>
             </if>
             <if test="studyViewFilterHelper.studyViewFilter.genomicDataFilters != null and !studyViewFilterHelper.studyViewFilter.genomicDataFilters.isEmpty()">
                 <foreach item="genomicDataFilter" collection="studyViewFilterHelper.studyViewFilter.genomicDataFilters" open="INTERSECT" separator="INTERSECT">
@@ -161,10 +143,24 @@
             <if test="studyViewFilterHelper.studyViewFilter.sampleTreatmentFilters != null and !studyViewFilterHelper.studyViewFilter.sampleTreatmentFilters.getFilters().isEmpty()">
                 <include refid="applySampleTreatmentFilter"/>
             </if>
+            
+            <!-- Apply Clinical Data Filter -->
+            <if test="studyViewFilterHelper.studyViewFilter.clinicalDataFilters != null and !studyViewFilterHelper.studyViewFilter.clinicalDataFilters.isEmpty()">
+                <include refid="applyClinicalDataCountFilter"/>
+            </if>
+
+            <!-- Apply Clinical Event Filter -->
+            <if test="studyViewFilterHelper.studyViewFilter.getClinicalEventFilters() != null and !studyViewFilterHelper.studyViewFilter.getClinicalEventFilters().isEmpty()">
+                <include refid="applyClinicalEventTypeFilter"/>
+            </if>
+            <!-- Apply Patient Treatment Filter -->
+            <if test="studyViewFilterHelper.studyViewFilter.getPatientTreatmentFilters() != null and !studyViewFilterHelper.studyViewFilter.getPatientTreatmentFilters().getFilters().isEmpty()">
+                <include refid="applyPatientTreatmentFilter"/>
+            </if>
             <!-- ... extend for other elements of the studyViewFilterHelper.studyViewFilter object -->
         </trim>
     </sql>
-    
+
     <sql id="applySampleTreatmentFilter">
         <foreach item="andedSampleTreatmentFilters" collection="studyViewFilterHelper.studyViewFilter.sampleTreatmentFilters.getFilters()" open="INTERSECT" separator="INTERSECT">
             SELECT  concat(ced.cancer_study_identifier, '_', ced.sample_id) AS sample_unique_id
@@ -180,7 +176,7 @@
                         key = 'SAMPLE_ID'
                         AND (event_type LIKE 'Sample Acquisition' OR event_type LIKE 'SPECIMEN')
                     </where>
-                    GROUP BY patient_unique_id, ced.value, cancer_study_identifier 
+                    GROUP BY patient_unique_id, ced.value, cancer_study_identifier
             ) ced
             INNER JOIN (
             <!-- Nested sub query to grab all treatments group by patients-->
@@ -198,10 +194,10 @@
                     ced_inner.treatment = '${sampleTreatmentFilter.treatment}'
                     <choose>
                         <when test="sampleTreatmentFilter.time.name() == 'Pre'">
-                            AND ced.time_taken &lt;=  ced_inner.treatment_time_taken 
+                            AND ced.time_taken &lt;=  ced_inner.treatment_time_taken
                         </when>
                         <otherwise>
-                            AND ced.time_taken &gt; ced_inner.treatment_time_taken 
+                            AND ced.time_taken &gt; ced_inner.treatment_time_taken
                         </otherwise>
                     </choose>
                 </foreach>
@@ -212,62 +208,87 @@
     <sql id="applyClinicalEventTypeFilter">
         <foreach item="clinicalEventFilter" collection="studyViewFilterHelper.studyViewFilter.getClinicalEventFilters()" open="INTERSECT"
                  separator="INTERSECT">
+            SELECT sample_unique_id
+            FROM sample_derived
+            WHERE patient_unique_id in (
             SELECT patient_unique_id
             FROM clinical_event_derived
-            <where>
-                <foreach item="dataFilterValue" collection="clinicalEventFilter.values" open="(" separator=") OR (" 
-                         close=")">
-                        event_type = '${dataFilterValue.value}'
-                </foreach>
-            </where>
+                <where>
+                    <foreach item="dataFilterValue" collection="clinicalEventFilter.values" open="(" separator=") OR ("
+                             close=")">    event_type = '${dataFilterValue.value}'
+                    </foreach>
+                </where>
+            )
         </foreach>
     </sql>
-    
+
     <sql id="applyPatientTreatmentFilter">
         <foreach item="andedPatientTreatmentFilters" collection="studyViewFilterHelper.studyViewFilter.getPatientTreatmentFilters().getFilters()" open="INTERSECT"
                  separator="INTERSECT">
+            SELECT sample_unique_id
+            FROM sample_derived
+            WHERE patient_unique_id in (
             SELECT patient_unique_id
             FROM clinical_event_derived
-            <where>
-                <foreach item="patientTreatmentFilter" collection="andedPatientTreatmentFilters.getFilters()" open="(" separator=") OR ("
-                         close=")">
-                    lower(event_type) = 'treatment'
-                    AND key = 'AGENT'
-                    AND value = '${patientTreatmentFilter.treatment}'
-                </foreach>
-            </where>
-        </foreach> 
+                <where>
+                    <foreach item="patientTreatmentFilter" collection="andedPatientTreatmentFilters.getFilters()" open="("
+                         separator=") OR ("
+                         close=")">    lower(event_type) = 'treatment'
+                        AND key = 'AGENT'
+                        AND value = '${patientTreatmentFilter.treatment}'
+                    </foreach>
+                </where>
+            )
+        </foreach>
     </sql>
 
-    <sql id="patientUniqueIdsFromStudyViewFilter">
-        <trim prefixOverrides="INTERSECT">
-            <if test="studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientNumericalClinicalDataFilters() != null and !studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientNumericalClinicalDataFilters().isEmpty()">
-                <foreach item="clinicalDataFilter" collection="studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientNumericalClinicalDataFilters()" open="INTERSECT" separator="INTERSECT">
-                    <include refid="numericalClinicalDataCountFilter">
-                        <property name="unique_id" value="patient_unique_id"/>
-                        <property name="table_name" value="clinical_data_derived"/>
-                        <property name="type" value="patient"/>
-                    </include>
-                </foreach>
-            </if>
-            <if test="studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientCategoricalClinicalDataFilters() != null and !studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientCategoricalClinicalDataFilters().isEmpty()">
-                <foreach item="clinicalDataFilter" collection="studyViewFilterHelper.categorizedClinicalDataCountFilter.getPatientCategoricalClinicalDataFilters()" open="INTERSECT" separator="INTERSECT">
-                    <include refid="categoricalClinicalDataCountFilter">
-                        <property name="unique_id" value="patient_unique_id"/>
-                        <property name="table_name" value="clinical_data_derived"/>
-                        <property name="type" value="patient"/>
-                    </include>
-                </foreach>
-            </if>
-            <!-- Clinical Event Filter -->
-            <if test="studyViewFilterHelper.studyViewFilter.getClinicalEventFilters() != null and !studyViewFilterHelper.studyViewFilter.getClinicalEventFilters().isEmpty()">
-                <include refid="applyClinicalEventTypeFilter"/>
-            </if>
-            <!-- Patient Treatment Filter -->
-            <if test="studyViewFilterHelper.studyViewFilter.getPatientTreatmentFilters() != null and !studyViewFilterHelper.studyViewFilter.getPatientTreatmentFilters().getFilters().isEmpty()">
-                <include refid="applyPatientTreatmentFilter"/>
-            </if>
-        </trim>
+    <sql id="applyClinicalDataCountFilter">
+        <foreach item="clinicalDataFilter"
+            collection="studyViewFilterHelper.studyViewFilter.clinicalDataFilters"
+            open="INTERSECT" separator="INTERSECT">
+            <bind name="isCategoricalFilter"
+                value="studyViewFilterHelper.isCategoricalClinicalDataFilter(clinicalDataFilter)" />
+            (
+                <choose>
+                    <when test="isCategoricalFilter">
+                        <include refid="categoricalClinicalDataCountFilter">
+                            <property name="unique_id" value="sample_unique_id"/>
+                            <property name="table_name" value="clinical_data_derived"/>
+                            <property name="type" value="sample"/>
+                        </include> 
+                    </when>
+                    <otherwise>
+                            <include refid="numericalClinicalDataCountFilter">
+                                <property name="unique_id" value="sample_unique_id"/>
+                                <property name="table_name" value="clinical_data_derived"/>
+                                <property name="type" value="sample"/>
+                            </include>
+                    </otherwise>
+                </choose>
+
+            UNION DISTINCT
+                SELECT sample_unique_id
+                FROM sample_derived
+                WHERE patient_unique_id in (
+                    <choose>
+                        <when test="isCategoricalFilter">
+                            <include refid="categoricalClinicalDataCountFilter">
+                                <property name="unique_id" value="patient_unique_id" />
+                                <property name="table_name" value="clinical_data_derived" />
+                                <property name="type" value="patient" />
+                            </include>
+                        </when>
+                        <otherwise>
+                            <include refid="numericalClinicalDataCountFilter">
+                                <property name="unique_id" value="patient_unique_id" />
+                                <property name="table_name" value="clinical_data_derived" />
+                                <property name="type" value="patient" />
+                            </include>
+                        </otherwise>
+                    </choose>
+                )
+            )
+        </foreach>
     </sql>
 
     <sql id="numericalClinicalDataCountFilter">
@@ -292,7 +313,7 @@
                 <if test="dataFilterValue.start != null and dataFilterValue.end != null">
                     AND match(attribute_value, '^[-+]?[0-9]*[.,]?[0-9]+$')
                 </if>
-                <if test="dataFilterValue.start != null or dataFilterValue.end != null">   
+                <if test="dataFilterValue.start != null or dataFilterValue.end != null">
                     <choose>
                         <when test="dataFilterValue.start == dataFilterValue.end">
                             AND abs(
@@ -323,7 +344,7 @@
             </trim>
         </foreach>
     </sql>
-    
+
     <sql id="categoricalClinicalDataCountFilter">
         SELECT ${unique_id}
         FROM ${table_name}
@@ -339,7 +360,7 @@
             </trim>
         </foreach>
     </sql>
-    
+
     <sql id="applyMutationDataFilter">
         <!-- if the categorization is 'MUTATED' (pie chart) -->
         <if test="mutationDataFilter.categorization == @org.cbioportal.web.parameter.MutationOption@MUTATED">
@@ -403,7 +424,7 @@
             </foreach>
         </if>
     </sql>
-    
+
     <sql id="applyGenomicDataFilterForCNA">
         <!-- 1. check if 'NA' is selected -->
         <bind name="containsNA" value="false" />
@@ -432,18 +453,18 @@
                 #{studyId}
             </foreach>
             <choose>
-                <!-- 2. if no 'NA' is selected -->
+            <!-- 2. if no 'NA' is selected -->
                 <when test="!containsNA">
                     AND alteration_value IN
                     <foreach item="dataFilterValue" collection="genomicDataFilter.values" open="(" separator="," close=")">
                         #{dataFilterValue.value}
                     </foreach>
                 </when>
-                <!-- 3. else if only 'NA' is selected -->
+            <!-- 3. else if only 'NA' is selected -->
                 <when test="genomicDataFilter.values.size() == 1 and genomicDataFilter.values[0].value == 'NA'">
                     AND alteration_value IS NULL
                 </when>
-                <!-- 4. else both 'NA' and other values are selected -->
+            <!-- 4. else both 'NA' and other values are selected -->
                 <otherwise>
                     AND alteration_value IS NULL
                     OR alteration_value IN
diff --git a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
index 5af781dfeb0..2da2eff0f0b 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapper.xml
@@ -14,7 +14,7 @@
         FROM sample_derived
         <where>
             <include refid="applyStudyViewFilter">
-                <property name="filter_type" value="'SAMPLE_AND_PATIENT_ID'"/>
+                <property name="filter_type" value="'SAMPLE_ID_ONLY'"/>
             </include>
         </where>
         ORDER BY sample_stable_id ASC;
@@ -31,7 +31,7 @@
         <where>
             variant_type = 'mutation' AND
             <include refid="applyStudyViewFilter">
-                <property name="filter_type" value="'SAMPLE_AND_PATIENT_ID'"/>
+                <property name="filter_type" value="'SAMPLE_ID_ONLY'"/>
             </include>
             <if test="alterationFilterHelper.shouldApplyMutationAlterationFilter()">
                 <include refid="mutationAlterationFilter"/>
@@ -53,7 +53,7 @@
         <where>
             variant_type = 'cna' AND
             <include refid="applyStudyViewFilter">
-                <property name="filter_type" value="'SAMPLE_AND_PATIENT_ID'"/>
+                <property name="filter_type" value="'SAMPLE_ID_ONLY'"/>
             </include>
             <if test="alterationFilterHelper.shouldApplyCnaAlterationFilter()">
                 <include refid="cnaAlterationFilter"/>
@@ -72,7 +72,7 @@
         <where>
             variant_type = 'structural_variant' AND
             <include refid="applyStudyViewFilter">
-                <property name="filter_type" value="'SAMPLE_AND_PATIENT_ID'"/>
+                <property name="filter_type" value="'SAMPLE_ID_ONLY'"/>
             </include>
         </where>
         GROUP BY entrez_gene_id, hugo_gene_symbol;
@@ -120,7 +120,7 @@
         </if>
         AND type = 'patient'
     </select>
-    
+
     <!-- for /clinical-data-counts/fetch (returns ClinicalData) which will then be converted to clinicalDataCountItems -->
     <select id="getClinicalDataCounts" resultType="org.cbioportal.model.ClinicalDataCount">
         <include refid="getClinicalDataCountsQuerySample" />
@@ -146,7 +146,7 @@
         </where>
         GROUP BY genetic_profile.stable_id, genetic_profile.name, sample_derived.cancer_study_identifier
     </select>
-    
+
     <!-- for /sample-lists-counts/fetch (returns CaseListDataCount) -->
     <select id="getCaseListDataCountsPerStudy" resultType="org.cbioportal.model.CaseListDataCount">
         SELECT
@@ -163,7 +163,7 @@
         </where>
         GROUP BY s.cancer_study_identifier, sl.stable_id, sl.name;
     </select>
-    
+
 
     <sql id="getClinicalDataCountsQuerySample">
         SELECT
@@ -182,7 +182,7 @@
                 AND UPPER(value) NOT IN
                 <foreach item="filteredAttributeValue" collection="filteredAttributeValues" open="(" separator="," close=")">
                     #{filteredAttributeValue}
-                </foreach> 
+                </foreach>
             </if>
             AND attribute_name IN
             <foreach item="attributeId" collection="attributeIds" open="(" separator="," close=")">
@@ -220,13 +220,13 @@
         GROUP BY attribute_name,
         value
     </sql>
-    
+
     <sql id="getTotalSampleCount">
         SELECT count(distinct sample_unique_id) as count
         FROM sample_derived
-        WHERE sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)        
+        WHERE sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)
     </sql>
-    
+
     <!-- for /genomic-data-counts/fetch - (returns GenomicDataCountItem objects) -->
     <select id="getCNACounts" resultMap="GenomicDataCountItemResultMap">
         <bind name="profileType" value="genomicDataFilters[0].profileType" />
@@ -322,7 +322,7 @@
             <result property="uniqueCount" column="uniqueCount"/>
         </collection>
     </resultMap>
-    
+
     <sql id="getPatientIdsFromSampleIdFilters">
         SELECT patient_unique_id
         FROM sample_derived
@@ -330,7 +330,7 @@
             sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)
         </where>
     </sql>
-    
+
     <select id="getClinicalAttributes" resultType="org.cbioportal.model.ClinicalAttribute">
         SELECT
             attr_id as attrId,
@@ -344,16 +344,16 @@
     <!-- Grab Total Profiled Counts. Currently, this query filters out all samples associated with a Gene Panel WES before
     doing a join on gene_panel_to_gene_derived table. This is to prevent unnecessary stress on the db. For every sample
     associated with a gene panel WES we multiply that row by the number of genes in the gene table. This could be greater
-    than 20K genes. This can create a huge join table that can slow down CH tremendously. 
-    We compute the WES counts by using the query getSampleProfileCountWithoutPanelData and adding this value to the 
+    than 20K genes. This can create a huge join table that can slow down CH tremendously.
+    We compute the WES counts by using the query getSampleProfileCountWithoutPanelData and adding this value to the
     totalProfiled Count per gene in java.
      -->
     <select id="getTotalProfiledCounts" resultType="org.cbioportal.model.AlterationCountByGene">
-        SELECT 
+        SELECT
         gene as hugoGeneSymbol,
         COUNT(*) as numberOfProfiledCases
         FROM sample_to_gene_panel_derived stgp
-            INNER JOIN gene_panel_to_gene_derived gptg on stgp.gene_panel_id = gptg.gene_panel_id 
+            INNER JOIN gene_panel_to_gene_derived gptg on stgp.gene_panel_id = gptg.gene_panel_id
         <where>
             stgp.alteration_type = '${alterationType}'
             AND stgp.gene_panel_id != 'WES'
@@ -364,7 +364,7 @@
         </where>
         GROUP BY gptg.gene;
     </select>
-    
+
     <select id="getSampleProfileCountWithoutPanelData" resultType="int">
        SELECT COUNT(*)
         FROM sample_to_gene_panel_derived
@@ -376,8 +376,8 @@
             </include>
         </where>
     </select>
-    <!-- Helper query to get counts for totalProfiledCount when no genePanel data is available. 
-    When no genePanel data is available we assume the whole genome was sequenced AKA WES (Whole Exome Sequencing). If this 
+    <!-- Helper query to get counts for totalProfiledCount when no genePanel data is available.
+    When no genePanel data is available we assume the whole genome was sequenced AKA WES (Whole Exome Sequencing). If this
     is the case we use the current sample count from the cohort as the totalProfiledCount -->
     <select id="getTotalProfiledCountByAlterationType" resultType="int">
         SELECT
@@ -391,12 +391,12 @@
             </include>
         </where>
     </select>
-    
+
     <!-- Helper query to get counts for FilteredSamples. -->
     <select id="getFilteredSamplesCount" resultType="int">
         <include refid="getTotalSampleCount"/>
     </select>
-    
+
     <!-- Get Matching Gene Panel Ids for all Samples after study view filter -->
     <select id="getMatchingGenePanelIds" resultType="org.cbioportal.model.GenePanelToGene">
         SELECT
@@ -418,9 +418,9 @@
         </where>
         GROUP BY gene, gene_panel_id;
     </select>
-    
+
     <select id="getClinicalEventTypeCounts" resultType="org.cbioportal.model.ClinicalEventTypeCount">
-        SELECT 
+        SELECT
             event_type as eventType,
             count(DISTINCT patient_unique_id) as count
         FROM clinical_event_derived
@@ -452,13 +452,13 @@
             )
         </where>
     </select>
-    
+
    <resultMap id="PatientTreatment" type="org.cbioportal.model.PatientTreatment">
       <constructor>
           <arg column="treatment" javaType="String"/>
           <arg column="count" javaType="_int"/>
-      </constructor> 
-   </resultMap> 
+      </constructor>
+   </resultMap>
     <select id="getPatientTreatments" resultMap="PatientTreatment">
         SELECT
         value AS treatment,
@@ -474,8 +474,8 @@
         </where>
         GROUP BY value;
     </select>
-    
-    <select id="getTotalSampleTreatmentCounts" resultType="int"> 
+
+    <select id="getTotalSampleTreatmentCounts" resultType="int">
         SELECT
             count(distinct ced.value) AS totalSamples
         FROM clinical_event_derived ced
@@ -484,9 +484,6 @@
             AND (event_type LIKE 'Sample Acquisition' OR event_type LIKE 'SPECIMEN')
             AND
             concat(ced.cancer_study_identifier, '_', ced.value) IN ( <include refid="sampleUniqueIdsFromStudyViewFilter"/>)
-            <if test="studyViewFilterHelper.applyPatientIdFilters == true">
-                AND patient_unique_id IN (<include refid="patientUniqueIdsFromStudyViewFilter"/>)
-            </if>
             AND
             patient_unique_id IN (
             SELECT
@@ -503,7 +500,7 @@
             )
         </where>
     </select>
-    
+
     <resultMap id="SampleTreatmentCount" type="org.cbioportal.model.SampleTreatment">
         <constructor>
             <arg column="treatment" javaType="String"/>
@@ -528,10 +525,10 @@
             GROUP BY patient_unique_id, ced.value, cancer_study_identifier
         ),
         <!-- Nested sub query to grab minimum treatment event. When there are multiple treatments that are of the same
-        type we only care about the first treatment. 
+        type we only care about the first treatment.
          -->
         treatments AS (
-            SELECT 
+            SELECT
                 patient_unique_id,
                 value AS treatment,
                 argMin(start_date, start_date) AS treatment_time_taken
@@ -550,43 +547,34 @@
             INNER JOIN treatments ON treatments.patient_unique_id = ced.patient_unique_id
         <where>
             concat(ced.cancer_study_identifier, '_', ced.sample_id) IN ( <include refid="sampleUniqueIdsFromStudyViewFilter"/>)
-            <if test="studyViewFilterHelper.applyPatientIdFilters == true">
-                AND patient_unique_id IN (<include refid="patientUniqueIdsFromStudyViewFilter"/>)
-            </if>
         </where>
         GROUP BY treatments.treatment;
     </select>
-    
-    <!-- 
+
+    <!--
         Abstraction for StudyViewFilter. Currently, we have many ch tables that have both
         sample_unique_id and patient_unique_id. Also, we have some edges cases were tables only have patient_unique_id
-        or sample_unique_id (i.e. clinical_event_derived). This forces the filtering (where clause) to convert the 
+        or sample_unique_id (i.e. clinical_event_derived). This forces the filtering (where clause) to convert the
         patient_unique_id(s) to a list of sample_unique_id(s). So we have three separate modes:
-     
-        SAMPLE_ID_ONLY - Forces all filters that use patient_unique_ids to be converted to list of sample_unique_id(s) and 
+
+        SAMPLE_ID_ONLY - Forces all filters that use patient_unique_ids to be converted to list of sample_unique_id(s) and
                       is applied to the where clause.
-     
+
         PATIENT_ID_ONLY - Forces all sample_unique_id(s) to be converted to list of Patients before applying where clause.
-     
+
         Otherwise - The table can be filtered on both patient id(s) and sample id(s)
      -->
     <sql id="applyStudyViewFilter">
         <choose>
-            <when test="${filter_type} == 'SAMPLE_ID_ONLY' ">
-               <include refid="applyStudyViewFilterUsingSampleId"/> 
-            </when>
             <when test="${filter_type} == 'PATIENT_ID_ONLY'">
                 <include refid="applyStudyViewFilterUsingPatientId"/>
             </when>
             <otherwise>
                 sample_unique_id IN ( <include refid="sampleUniqueIdsFromStudyViewFilter"/>)
-                <if test="studyViewFilterHelper.applyPatientIdFilters == true">
-                    AND patient_unique_id IN (<include refid="patientUniqueIdsFromStudyViewFilter"/>)
-                </if>            
             </otherwise>
         </choose>
     </sql>
-    
+
     <sql id="applyStudyViewFilterUsingPatientId">
         patient_unique_id in (
         SELECT patient_unique_id
@@ -594,34 +582,18 @@
         <where>
             sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)
         </where>
-
-        <if test="studyViewFilterHelper.applyPatientIdFilters == true">
-            INTERSECT
-            <include refid="patientUniqueIdsFromStudyViewFilter"/>
-        </if>
         )
     </sql>
-     
+
     <sql id="applyStudyViewFilterUsingSampleId">
-        sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>
-            <if test="studyViewFilterHelper.applyPatientIdFilters == true">
-                INTERSECT <include refid="getSampleIdsFromPatientIds"/>
-            </if>
-        )
+        sample_unique_id IN (<include refid="sampleUniqueIdsFromStudyViewFilter"/>)
     </sql>
 
-    <sql id="getSampleIdsFromPatientIds">
-        SELECT sample_unique_id
-        FROM sample_derived
-        <where>
-            patient_unique_id IN (<include refid="patientUniqueIdsFromStudyViewFilter"/>)
-        </where>
-    </sql>
-    
+
     <!--
         Convert string values to a single numerical value for filtering purposes only.
         Not designed as a general purpose decimal number parser.
-        
+
         Examples conversions:
         '6' to 6
         '>=6' to 6
@@ -640,7 +612,7 @@
             cast(${attribute_value} as float)
         )
     </sql>
-    
+
     <!-- This is to match actual NA values ('NA', 'NAN', and 'N/A') in addition to the empty string -->
     <sql id="isAttributeValueNA">
         ${attribute_value}=''
@@ -656,7 +628,7 @@
     <sql id="isAttributeValueFalse">
         upperUTF8(${attribute_value})='FALSE'
     </sql>
-    
+
     <sql id="normalizeAttributeValue">
         multiIf(
             <include refid="isAttributeValueNA">
diff --git a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/MolecularProfileCountTest.java b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/MolecularProfileCountTest.java
index b7a25d3ec0e..34cce3f47a4 100644
--- a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/MolecularProfileCountTest.java
+++ b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/MolecularProfileCountTest.java
@@ -2,7 +2,6 @@
 
 import org.cbioportal.persistence.helper.StudyViewFilterHelper;
 import org.cbioportal.persistence.mybatisclickhouse.config.MyBatisConfig;
-import org.cbioportal.web.parameter.CategorizedClinicalDataCountFilter;
 
 import org.cbioportal.web.parameter.StudyViewFilter;
 import org.junit.Test;
@@ -45,7 +44,7 @@ public void getMolecularProfileCounts() {
         
         studyViewFilter.setGenomicProfiles(profileGroups);
         
-        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         var size = molecularProfileCounts.stream().filter(gc->gc.getValue().equals("mutations"))
             .findFirst().get().getCount().intValue();
@@ -63,7 +62,7 @@ public void getMolecularProfileCountsMultipleStudies() {
 
         studyViewFilter.setGenomicProfiles(profileGroups);
 
-        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         var size = molecularProfileCounts.stream().filter(gc->gc.getValue().equals("mutations"))
             .findFirst().get().getCount().intValue();
@@ -81,7 +80,7 @@ public void getMolecularProfileCountsMultipleProfilesUnion() {
 
         studyViewFilter.setGenomicProfiles(profileGroups);
 
-        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         var sizeMutations = molecularProfileCounts.stream().filter(gc->gc.getValue().equals("mutations"))
             .findFirst().get().getCount().intValue();
@@ -104,7 +103,7 @@ public void getMolecularProfileCountsMultipleProfilesIntersect() {
 
         studyViewFilter.setGenomicProfiles(profileGroups);
 
-        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var molecularProfileCounts = studyViewMapper.getMolecularProfileSampleCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         var sizeMutations = molecularProfileCounts.stream().filter(gc->gc.getValue().equals("mutations"))
             .findFirst().get().getCount().intValue();
diff --git a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewCaseListSamplesCountsTest.java b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewCaseListSamplesCountsTest.java
index 929650750bb..f62d95ab686 100644
--- a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewCaseListSamplesCountsTest.java
+++ b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewCaseListSamplesCountsTest.java
@@ -4,7 +4,6 @@
 import org.cbioportal.persistence.mybatisclickhouse.config.MyBatisConfig;
 
 import org.cbioportal.service.impl.StudyViewColumnarServiceImpl;
-import org.cbioportal.web.parameter.CategorizedClinicalDataCountFilter;
 import org.cbioportal.web.parameter.StudyViewFilter;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,7 +45,7 @@ public void getMolecularProfileCounts() {
 
         studyViewFilter.setCaseLists(caseListGroups);
        
-        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null, null) );
+        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null) );
 
         var size = sampleListCounts.stream().filter(gc->gc.getValue().equals("mrna"))
             .findFirst().get().getCount().intValue();
@@ -64,7 +63,7 @@ public void getMolecularProfileCountsMultipleListsOr() {
 
         studyViewFilter.setCaseLists(caseListGroups);
 
-        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null, null) );
+        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null) );
 
         var size = sampleListCounts.stream().filter(gc->gc.getValue().equals("mrna"))
             .findFirst().get().getCount().intValue();
@@ -83,7 +82,7 @@ public void getMolecularProfileCountsMultipleListsAnd() {
 
         studyViewFilter.setCaseLists(caseListGroups);
 
-        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null, null) );
+        var sampleListCounts = studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null) );
 
         var size = sampleListCounts.stream().filter(gc->gc.getValue().equals("mrna"))
             .findFirst().get().getCount().intValue();
@@ -101,7 +100,7 @@ public void getMolecularProfileCountsAcrossStudies() {
 
         studyViewFilter.setCaseLists(caseListGroups);
 
-        var unMergedCounts =  studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null, null) );
+        var unMergedCounts =  studyViewMapper.getCaseListDataCountsPerStudy(StudyViewFilterHelper.build(studyViewFilter, null) );
         
         var caseListCountsMerged = StudyViewColumnarServiceImpl.mergeCaseListCounts(
             unMergedCounts
diff --git a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperClinicalDataCountTest.java b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperClinicalDataCountTest.java
index 90bc9b864d8..d8ff81d2004 100644
--- a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperClinicalDataCountTest.java
+++ b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperClinicalDataCountTest.java
@@ -1,11 +1,8 @@
 package org.cbioportal.persistence.mybatisclickhouse;
 
-import org.cbioportal.model.ClinicalAttribute;
 import org.cbioportal.model.ClinicalDataCount;
-import org.cbioportal.persistence.enums.ClinicalAttributeDataSource;
 import org.cbioportal.persistence.helper.StudyViewFilterHelper;
 import org.cbioportal.persistence.mybatisclickhouse.config.MyBatisConfig;
-import org.cbioportal.web.parameter.CategorizedClinicalDataCountFilter;
 import org.cbioportal.web.parameter.ClinicalDataFilter;
 import org.cbioportal.web.parameter.DataFilterValue;
 import org.cbioportal.web.parameter.StudyViewFilter;
@@ -21,9 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -46,7 +41,7 @@ public void getMutationCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB));
 
         var mutationsCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("mutation_count"),
             Collections.emptyList()
         );
@@ -67,7 +62,7 @@ public void getCenterCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB));
 
         var categoricalClinicalDataCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("center"),
             Collections.emptyList()
         );
@@ -89,7 +84,7 @@ public void getDeadCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB));
 
         var categoricalClinicalDataCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("dead"),
             Collections.emptyList()
         );
@@ -110,7 +105,7 @@ public void getMutationAndCenterCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB));
 
         var combinedClinicalDataCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("mutation_count", "center"),
             Collections.emptyList()
         );
@@ -124,7 +119,7 @@ public void getAgeCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB));
 
         var ageCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("age"),
             Collections.emptyList()
         );
@@ -141,7 +136,7 @@ public void getAgeCountsForMultipleStudies() {
         studyViewFilter.setStudyIds(List.of(STUDY_GENIE_PUB, STUDY_ACC_TCGA));
 
         var ageCounts = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, null, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("age"),
             Collections.emptyList()
         );
@@ -185,15 +180,8 @@ public void getMutationCountsFilteredByAge() {
         ClinicalDataFilter filter = buildClinicalDataFilter("age", 20, 70);
         studyViewFilter.setClinicalDataFilters(List.of(filter));
         
-        Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributeDataSourceListMap = new HashMap<>();
-        var clinicalAttr = new ClinicalAttribute();
-        clinicalAttr.setAttrId("age");
-        clinicalAttr.setPatientAttribute(true);
-        clinicalAttr.setDatatype("NUMBER");
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.PATIENT, List.of(clinicalAttr));
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.SAMPLE, List.of());
         var mutationCountsFiltered = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, clinicalAttributeDataSourceListMap, null),
+            StudyViewFilterHelper.build(studyViewFilter,  null),
             List.of("mutation_count"),
             Collections.emptyList()
         );
@@ -214,15 +202,8 @@ public void getMutationCountsFilteredByAgeWithOpenStartValues() {
         ClinicalDataFilter filter = buildClinicalDataFilter("age", null, 20);
         studyViewFilter.setClinicalDataFilters(List.of(filter));
 
-        Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributeDataSourceListMap = new HashMap<>();
-        var clinicalAttr = new ClinicalAttribute();
-        clinicalAttr.setAttrId("age");
-        clinicalAttr.setPatientAttribute(true);
-        clinicalAttr.setDatatype("NUMBER");
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.PATIENT, List.of(clinicalAttr));
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.SAMPLE, List.of());
         var mutationCountsFiltered = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, clinicalAttributeDataSourceListMap, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("mutation_count"),
             Collections.emptyList()
         );
@@ -247,15 +228,8 @@ public void getMutationCountsFilteredByAgeWithOpenEndValues() {
         ClinicalDataFilter filter = buildClinicalDataFilter("age", 80, null);
         studyViewFilter.setClinicalDataFilters(List.of(filter));
 
-        Map<ClinicalAttributeDataSource, List<ClinicalAttribute>> clinicalAttributeDataSourceListMap = new HashMap<>();
-        var clinicalAttr = new ClinicalAttribute();
-        clinicalAttr.setAttrId("age");
-        clinicalAttr.setPatientAttribute(true);
-        clinicalAttr.setDatatype("NUMBER");
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.PATIENT, List.of(clinicalAttr));
-        clinicalAttributeDataSourceListMap.put(ClinicalAttributeDataSource.SAMPLE, List.of());
         var mutationCountsFiltered = studyViewMapper.getClinicalDataCounts(
-            StudyViewFilterHelper.build(studyViewFilter, clinicalAttributeDataSourceListMap, null),
+            StudyViewFilterHelper.build(studyViewFilter, null),
             List.of("mutation_count"),
             Collections.emptyList()
         );
diff --git a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperTest.java b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperTest.java
index b0c54597f3f..5e99f865a0d 100644
--- a/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperTest.java
+++ b/src/test/java/org/cbioportal/persistence/mybatisclickhouse/StudyViewMapperTest.java
@@ -53,7 +53,7 @@ public class StudyViewMapperTest extends AbstractTestcontainers {
     public void getFilteredSamples() {
         StudyViewFilter studyViewFilter = new StudyViewFilter();
         studyViewFilter.setStudyIds(Arrays.asList(STUDY_TCGA_PUB, STUDY_ACC_TCGA));
-        var filteredSamples = studyViewMapper.getFilteredSamples(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var filteredSamples = studyViewMapper.getFilteredSamples(StudyViewFilterHelper.build(studyViewFilter, null));
         assertEquals(19, filteredSamples.size());
     }
 
@@ -61,7 +61,7 @@ public void getFilteredSamples() {
     public void getMutatedGenes() {
         StudyViewFilter studyViewFilter = new StudyViewFilter();
         studyViewFilter.setStudyIds(List.of(STUDY_TCGA_PUB));
-        var alterationCountByGenes = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null, null),
+        var alterationCountByGenes = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null),
             AlterationFilterHelper.build(studyViewFilter.getAlterationFilter()));
         assertEquals(3, alterationCountByGenes.size());
 
@@ -82,7 +82,7 @@ public void getMutatedGenesWithAlterationFilter() {
         mutationEventTypeFilterMap.put(MutationEventType.other, Boolean.FALSE);
         alterationFilter.setMutationEventTypes(mutationEventTypeFilterMap);
 
-        var alterationCountByGenes = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null, null),
+        var alterationCountByGenes = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null),
             AlterationFilterHelper.build(alterationFilter));
         assertEquals(2, alterationCountByGenes.size());
 
@@ -92,7 +92,7 @@ public void getMutatedGenesWithAlterationFilter() {
         onlyMutationStatusFilter.setIncludeSomatic(false);
         onlyMutationStatusFilter.setIncludeUnknownStatus(true);
 
-        var alterationCountByGenes1 = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null, null),
+        var alterationCountByGenes1 = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null),
             AlterationFilterHelper.build(onlyMutationStatusFilter));
         assertEquals(1, alterationCountByGenes1.size());
 
@@ -103,7 +103,7 @@ public void getMutatedGenesWithAlterationFilter() {
         mutationTypeAndStatusFilter.setIncludeSomatic(false);
         mutationTypeAndStatusFilter.setIncludeUnknownStatus(true);
 
-        var alterationCountByGenes2 = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null, null),
+        var alterationCountByGenes2 = studyViewMapper.getMutatedGenes(StudyViewFilterHelper.build(studyViewFilter, null),
             AlterationFilterHelper.build(onlyMutationStatusFilter));
         assertEquals(1, alterationCountByGenes2.size());
     }
@@ -113,7 +113,7 @@ public void getTotalProfiledCountsByGene() {
         StudyViewFilter studyViewFilter = new StudyViewFilter();
         studyViewFilter.setStudyIds(List.of(STUDY_TCGA_PUB));
 
-        var totalProfiledCountsMap = studyViewMapper.getTotalProfiledCounts(StudyViewFilterHelper.build(studyViewFilter, null, null),
+        var totalProfiledCountsMap = studyViewMapper.getTotalProfiledCounts(StudyViewFilterHelper.build(studyViewFilter, null),
             "MUTATION_EXTENDED");
 
         assertEquals(3, totalProfiledCountsMap.size());
@@ -128,7 +128,7 @@ public void getClinicalEventTypeCounts() {
         StudyViewFilter studyViewFilter = new StudyViewFilter();
         studyViewFilter.setStudyIds(List.of(STUDY_TCGA_PUB));
 
-        var clinicalEventTypeCounts = studyViewMapper.getClinicalEventTypeCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var clinicalEventTypeCounts = studyViewMapper.getClinicalEventTypeCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(4, clinicalEventTypeCounts.size());
 
@@ -144,7 +144,7 @@ public void getClinicalEventTypeCounts() {
         dataFilter.setValues(List.of(dataFilterValue));
         studyViewFilter.setClinicalEventFilters(List.of(dataFilter));
 
-        clinicalEventTypeCounts = studyViewMapper.getClinicalEventTypeCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        clinicalEventTypeCounts = studyViewMapper.getClinicalEventTypeCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(3, clinicalEventTypeCounts.size());
 
@@ -160,9 +160,9 @@ public void getPatientTreatmentReportCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_TCGA_PUB));
 
 
-        var patientTreatmentCounts = studyViewMapper.getPatientTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var patientTreatmentCounts = studyViewMapper.getPatientTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
-        var patientTreatments = studyViewMapper.getPatientTreatments(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var patientTreatments = studyViewMapper.getPatientTreatments(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(1, patientTreatmentCounts);
         assertEquals("madeupanib", patientTreatments.getFirst().treatment());
@@ -177,9 +177,9 @@ public void getPatientTreatmentReportCounts() {
         andedPatientTreatmentFilters.setFilters(List.of(oredPatientTreatmentFilters));
         studyViewFilter.setPatientTreatmentFilters(andedPatientTreatmentFilters);
 
-        patientTreatmentCounts = studyViewMapper.getPatientTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        patientTreatmentCounts = studyViewMapper.getPatientTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
-        patientTreatments = studyViewMapper.getPatientTreatments(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        patientTreatments = studyViewMapper.getPatientTreatments(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(1, patientTreatmentCounts);
         assertEquals("madeupanib", patientTreatments.getFirst().treatment());
@@ -192,9 +192,9 @@ public void getSampleTreatmentCounts() {
         studyViewFilter.setStudyIds(List.of(STUDY_TCGA_PUB));
 
 
-        var totalSampleTreatmentCount = studyViewMapper.getTotalSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var totalSampleTreatmentCount = studyViewMapper.getTotalSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
-        var sampleTreatmentCounts = studyViewMapper.getSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        var sampleTreatmentCounts = studyViewMapper.getSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(1, totalSampleTreatmentCount);
         assertEquals("madeupanib", sampleTreatmentCounts.getFirst().treatment());
@@ -212,9 +212,9 @@ public void getSampleTreatmentCounts() {
         andedSampleTreatmentFilters.setFilters(List.of(oredSampleTreatmentFilters));
         studyViewFilter.setSampleTreatmentFilters(andedSampleTreatmentFilters);
 
-        totalSampleTreatmentCount = studyViewMapper.getTotalSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        totalSampleTreatmentCount = studyViewMapper.getTotalSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
-        sampleTreatmentCounts = studyViewMapper.getSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null, null));
+        sampleTreatmentCounts = studyViewMapper.getSampleTreatmentCounts(StudyViewFilterHelper.build(studyViewFilter, null));
 
         assertEquals(0, totalSampleTreatmentCount);
         assertEquals(0, sampleTreatmentCounts.size());