diff --git a/exposureinitializer/exposureinitializer.py b/exposureinitializer/exposureinitializer.py
index af4778e0c1399b41b9ba8fd9d5646ea8f61d21a7..ddd727248b1f41b8d27348374567f692ebaa8ff1 100644
--- a/exposureinitializer/exposureinitializer.py
+++ b/exposureinitializer/exposureinitializer.py
@@ -405,8 +405,8 @@ class ExposureInitializer:
                     SELECT quadkey, built_area_size, country_iso_code,
                         {self.exposure_db.geometry_field}
                     FROM {self.exposure_db.tile_view}
-                    WHERE (built_area_size IS NOT NULL)
-                        AND (country_iso_code = '{country_iso_code}')
+                    WHERE (country_iso_code = '{country_iso_code}')
+                        AND (built_area_size IS NOT NULL)
                 ) AS A
                 LEFT JOIN EntityReference AS E
                 ON E.quadkey = A.quadkey
@@ -606,8 +606,8 @@ def command_line_interface():
             initializer.retrieve_tile_set_and_boundaries(country_iso_code)
             initializer.create_view(country_iso_code)
         else:
-            initializer.exposure_db.clean_up_reference_exposure(country_iso_code)
-            initializer.exposure_db.clean_up_asset_country(country_iso_code)
+            initializer.exposure_db.remove_exposure(country_iso_code, reference=True)
+            initializer.exposure_db.remove_asset_country(country_iso_code)
         initializer.import_exposure(exposure_model, country_iso_code)
         initializer.process_gaps_in_exposure(country_iso_code)