diff --git a/yaml/office-storey.yaml b/yaml/office-storey.yaml
index 0198264..45cbba3 100644
--- a/yaml/office-storey.yaml
+++ b/yaml/office-storey.yaml
@@ -1,11 +1,10 @@
 src: ifc/office.ifc
 
 operations:
-  - name: Extract storey EG
+  - name: Extract storey UG and EG
     command: extract
     input: ifc/office.ifc
-    output: ifc/office_storey_EG.ifc
-    type: IfcBuildingStorey
-    id: EG
+    output: ifc/office_storey_UG.ifc
+    query: "IfcElement, location = UG + IfcElement, location = EG + IfcSite + IfcGeographicElement"
 
-dest: ifc/office_storey_EG.ifc
+dest: ifc/office_storey_UG.ifc