diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql
index c179561c3d..279d39e4da 100644
--- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql
+++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_biomass_production_curve.gql
@@ -1,13 +1,16 @@
 - query =
     SUM_CURVES(
       V(
-        EXCLUDE(
-          Q(electricity_producing_wood_pellets_converters),
-          V(
-            Q(electricity_producing_torrefied_biomass_pellets_converters),
-            Q(electricity_producing_coal_incl_coal_gas_converters),
-            Q(electricity_producing_lignite_converters)
-          )
+        FILTER(
+          EXCLUDE(
+            Q(electricity_producing_wood_pellets_converters),
+            V(
+              Q(electricity_producing_torrefied_biomass_pellets_converters),
+              Q(electricity_producing_coal_incl_coal_gas_converters),
+              Q(electricity_producing_lignite_converters)
+            )
+          ),
+          "merit_order && (merit_order.subtype == :dispatchable)"
         ),
         electricity_output_curve
       )
diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql
index 47344d17be..394e316961 100644
--- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql
+++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_coal_production_curve.gql
@@ -1,10 +1,15 @@
 - query =
     SUM_CURVES(
       V(
-        Q(electricity_producing_coal_incl_coal_gas_converters),
-        Q(electricity_producing_torrefied_biomass_pellets_converters),
-        Q(electricity_producing_lignite_converters),
+        FILTER(
+          V(
+            Q(electricity_producing_coal_incl_coal_gas_converters),
+            Q(electricity_producing_torrefied_biomass_pellets_converters),
+            Q(electricity_producing_lignite_converters)
+          ),
+          "merit_order && (merit_order.subtype == :dispatchable)"
+        ),
         electricity_output_curve
       )
     )
-- unit = curve
\ No newline at end of file
+- unit = curve
diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql
index 8f14a5d8de..cd2afc34bf 100644
--- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql
+++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_hydrogen_production_curve.gql
@@ -1,7 +1,10 @@
 - query =
     SUM_CURVES(
       V(
-        Q(electricity_producing_hydrogen_converters),
+        FILTER(
+          Q(electricity_producing_hydrogen_converters),
+          "merit_order && (merit_order.subtype == :dispatchable)"
+        ),
         electricity_output_curve
       )
     )
diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql
index 4a7641bf74..176ed5d47f 100644
--- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql
+++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_oil_production_curve.gql
@@ -1,8 +1,11 @@
 - query =
     SUM_CURVES(
       V(
-        Q(electricity_producing_oil_converters),
+        FILTER(
+          Q(electricity_producing_oil_converters),
+          "merit_order && (merit_order.subtype == :dispatchable)"
+        ),
         electricity_output_curve
       )
     )
-- unit = curve
\ No newline at end of file
+- unit = curve
diff --git a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql
index 2e4a9420ba..f0d7260a48 100644
--- a/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql
+++ b/gqueries/output_elements/output_series/d3_hourly_flexibility_electricity/hourly_flexibility_electricity_waste_production_curve.gql
@@ -1,8 +1,11 @@
 - query =
     SUM_CURVES(
       V(
-        Q(electricity_producing_waste_converters),
+        FILTER(
+          Q(electricity_producing_waste_converters),
+          "merit_order && (merit_order.subtype == :dispatchable)"
+        ),
         electricity_output_curve
       )
     )
-- unit = curve
\ No newline at end of file
+- unit = curve