diff --git a/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql
new file mode 100644
index 0000000000..f6ec0972b4
--- /dev/null
+++ b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql
@@ -0,0 +1,9 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        Q(useful_demand_buildings_future),
+        Q(number_of_buildings_future)
+      ),
+      MILLIONS
+    )
+- unit = GJ/WEQ
diff --git a/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql
new file mode 100644
index 0000000000..ae36ce7946
--- /dev/null
+++ b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql
@@ -0,0 +1,9 @@
+- query =
+    PRODUCT(
+      DIVIDE(
+        Q(useful_demand_buildings_present),
+        Q(number_of_buildings_present)
+      ),
+      MILLIONS
+    )
+- unit = GJ/WEQ
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1945_1964_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1945_1964_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1945_1964_bar.gql
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1965_1984_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1965_1984_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1965_1984_bar.gql
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1985_2004_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1985_2004_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1985_2004_bar.gql
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_2005_present_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_2005_present_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_2005_present_bar.gql
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_before_1945_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_before_1945_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_before_1945_bar.gql
diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_future_bar.gql
similarity index 100%
rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_future_bar.gql
rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_future_bar.gql