diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/handler/DataHandler.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/handler/DataHandler.java
index 0c60b8996255..380b1e193c88 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/handler/DataHandler.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/handler/DataHandler.java
@@ -816,7 +816,7 @@ private void addCategoryOptionComboDimensionToDataQueryParamBuilder(
                                     .getCategoryOptionCombo()
                                     .getUid()
                                     .equals(coc.getUid())))
-            .toList();
+            .collect(toList());
 
     if (!dimensionCategoryOptionCombos.isEmpty()) {
       builder.addDimension(
@@ -848,7 +848,7 @@ private void addCategoryOptionComboFilterToDataQueryParamBuilder(
                                     .getCategoryOptionCombo()
                                     .getUid()
                                     .equals(coc.getUid())))
-            .toList();
+            .collect(toList());
 
     if (!filterCategoryOptionCombos.isEmpty()) {
       builder.addFilter(
@@ -880,7 +880,7 @@ private void addAttributeOptionComboDimensionToDataQueryParamBuilder(
                                     .getAttributeOptionCombo()
                                     .getUid()
                                     .equals(aoc.getUid())))
-            .toList();
+            .collect(toList());
 
     if (!dimensionAttributeOptionCombos.isEmpty()) {
       builder.addDimension(
@@ -912,7 +912,7 @@ private void addAttributeOptionComboFilterToDataQueryParamBuilder(
                                     .getAttributeOptionCombo()
                                     .getUid()
                                     .equals(aoc.getUid())))
-            .toList();
+            .collect(toList());
 
     if (!filterAttributeOptionCombos.isEmpty()) {
       builder.addFilter(
@@ -944,7 +944,7 @@ private void addDataElementDimensionToDataQueryParamBuilder(
                                     .getDataElement()
                                     .getUid()
                                     .equals(de.getUid())))
-            .toList();
+            .collect(toList());
     if (!dimensionDataElements.isEmpty()) {
       builder.addDimension(new BaseDimensionalObject(DATA_X_DIM_ID, DATA_X, dimensionDataElements));
     }
@@ -972,7 +972,7 @@ private void addDataElementFilterToDataQueryParamBuilder(
                                     .getDataElement()
                                     .getUid()
                                     .equals(de.getUid())))
-            .toList();
+            .collect(toList());
     if (!filterDataElements.isEmpty()) {
       builder.addFilter(new BaseDimensionalObject(DATA_X_DIM_ID, DATA_X, filterDataElements));
     }