diff --git a/sql/addresses.sql b/sql/addresses.sql
index 3a819af..654adf0 100644
--- a/sql/addresses.sql
+++ b/sql/addresses.sql
@@ -5,7 +5,9 @@ COPY (
     WHERE (kind = 'node' OR kind = 'area')
       AND (
         tags['addr:housenumber'] IS NOT NULL OR
-        tags['addr:housename']   IS NOT NULL
+        tags['addr:housename'] IS NOT NULL OR
+        tags['addr:city'] IS NOT NULL OR
+        tags['addr:state'] IS NOT NULL
       )
   )
   SELECT