diff --git a/platform/csv/pool.go b/platform/csv/pool.go
index 4976aa75..607922f2 100644
--- a/platform/csv/pool.go
+++ b/platform/csv/pool.go
@@ -113,10 +113,14 @@ func bulkGeocode(ctx context.Context, txn bob.Tx, file *models.FileuploadFile, c
 		SET is_in_district = (
     			EXISTS (
         			SELECT 1
-        			FROM import.district d
-				JOIN organization o ON d.gid = o.import_district_gid
-				WHERE o.id = p.organization_id
-					AND ST_Contains(d.geom_4326, p.geom)
+        			FROM organization o, fileupload.file f
+				WHERE
+					p.csv_file = f.id AND
+					f.organization_id = o.id AND (
+						ST_Contains(o.service_area_geometry, p.geom) OR
+						o.is_catchall
+					)
+						
 			)
 		)
 	WHERE p.geom IS NOT NULL;`