diff --git a/app/Services/ImportProcessor.php b/app/Services/ImportProcessor.php
index f7a7b24..68dd5b8 100644
--- a/app/Services/ImportProcessor.php
+++ b/app/Services/ImportProcessor.php
@@ -3194,7 +3194,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
             ->first();*/
 
         // Build search query combining address, post_code and city
-        $searchParts = [$addrData['post_code']];
+        $searchParts = [$addrData['address']];
         if (!empty($addrData['post_code'])) {
             $searchParts[] = $addrData['post_code'];
         }
@@ -3204,7 +3204,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
 
         $searchQuery = implode(' ', $searchParts);
         // Use fulltext search (GIN index optimized)
-        $existing = PersonAddress::where('person_id', $personId)
+        $existing = PersonAddress::query()->where('person_id', $personId)
             ->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery])
             ->first();