diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
index 3bef749e9c7..ba78078310a 100644
--- a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
+++ b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
@@ -319,10 +319,9 @@ void RiaSumoConnector::requestVectorNamesForEnsemble( const SumoCaseId& caseId,
                 {"term": {"class": "table"}},
                 {"term": {"_sumo.parent_object.keyword": "%1"}},
                 {"term": {"fmu.iteration.name.keyword": "%2"}},
-                {"term": {"fmu.context.stage.keyword": "iteration"}},
-                {"term": {"fmu.aggregation.operation.keyword": "collection"}},
+                {"terms": {"fmu.context.stage.keyword": ["iteration", "realization"]}},
                 {"term": {"data.tagname.keyword": "summary"}},
-                {"term": {"data.content.keyword": "timeseries"}}
+                {"terms": {"data.content.keyword": ["timeseries", "simulationtimeseries"]}}
             ]}
         },
     "aggs": {
@@ -387,21 +386,21 @@ void RiaSumoConnector::requestRealizationIdsForEnsemble( const SumoCaseId& caseI
                 {"term": {"class": "table"}},
                 {"term": {"_sumo.parent_object.keyword": "%1"}},
                 {"term": {"fmu.iteration.name.keyword": "%2"}},
-                {"term": {"fmu.context.stage.keyword": "iteration"}},
-                {"term": {"fmu.aggregation.operation.keyword": "collection"}},
+                {"terms": {"fmu.context.stage.keyword": ["iteration", "realization"]}},
                 {"term": {"data.tagname.keyword": "summary"}},
-                {"term": {"data.content.keyword": "timeseries"}}
+                {"terms": {"data.content.keyword": ["timeseries", "simulationtimeseries"]}}
             ]}
     },
     "aggs": {
         "realization-ids": {
             "terms": {
-            "field": "fmu.aggregation.realization_ids",
-            "size":1000
+                "script": {
+                    "source": "doc.containsKey('fmu.realization.id') ? doc['fmu.realization.id'].value : doc['mu.aggregation.realization_ids'].value"
+                },
+                "size": 1000
             }
         }
-    },
-    "_source": false,
+    },    "_source": false,
     "size":0
 }
 )";