@@ -172,10 +172,14 @@ Image upload does not automatically dispatch vehicle commands. The reviewed send
 
 ## Cache, geocoding, and route state
 
-Geocoding preserves the full reviewed address, including apartment/unit
-information, but resolves its primary street address. Broad city/road matches,
-partial matches, and mismatched house numbers remain unresolved. The separate
-`street-address-v1` geocoding policy version participates in image-cache keys.
+Geocoding first looks up the full reviewed address, including apartment/unit
+information. If it returns no acceptable destination, one fallback lookup omits
+the recognized unit suffix. Both attempts reject broad city/road matches,
+partial matches, mismatched house numbers, and invalid coordinates or place IDs.
+Stops remain unresolved if neither attempt succeeds; their original text is
+preserved. Provider/service errors propagate without address retries. Fallback
+calls use the existing pacing and count against owner/global quotas only when
+needed. The `street-address-v2` policy version participates in image-cache keys.
 Reviewed addresses are resolved again before dispatch so older drafts and
 browser-supplied place IDs cannot bypass current validation.
 
 
@@ -20,8 +20,9 @@ the selected result's ID, sends it as `placeId`, and TAP prefixes it with
 
 ## Remediation
 
-- Preserve apartment/unit information in the reviewed stop, but omit secondary
-  unit identifiers from the street-address geocoding query.
+- Look up the full apartment/unit address first. If no acceptable destination is
+  returned, retry once without the secondary unit identifier. Preserve the full
+  address in the reviewed stop regardless of which lookup succeeds.
 - Accept only a complete numbered address result; leave broad, partial, or
   mismatched results unresolved for review instead of using a city center.
 - Include a separate geocoding policy version in image-cache keys. Existing
@@ -37,6 +38,27 @@ No vehicle command was issued during diagnosis or verification.
 
 ## Verification
 
+### Apartment-first update (2026-09-30)
+
+The initial fix always removed the unit before lookup. At the user's request,
+the current policy tries the full address first and uses unit omission only as
+a fallback. It reuses the existing destination validation for both requests.
+Successful full-address matches consume no fallback quota. Conditional retries
+reserve an additional owner/global call, preserve the admitted batch slot, and
+use the existing 60 ms pacing. HTTP, malformed-response, and Google service or
+quota errors propagate directly. The cache policy is now `street-address-v2`.
+
+All 133 Java tests passed. Regression coverage verifies full-unit success with
+one-call limits, fallback order and pacing, missing/rejected matches, one-retry
+limits, unchanged queries without units, provider failures, owner/global quota
+enforcement, and duplicate-stop preservation. The revised Java client also
+resolved the supplied Canfield address against Google through the fallback;
+no route was sent or vehicle command issued. Release evidence is retained in
+`output/private/canfield-release-verification.json`, with the initial release
+preserved in `output/private/canfield-city-fix-release-verification.json`.
+
+### Initial city-match fix
+
 All 128 Java tests passed, including unit-suffix handling, city/partial/wrong
 house-number rejection, stale reviewed-route revalidation, and cache-key
 versioning. A live run of the updated Java geocoder against Google resolved
 
@@ -33,7 +33,7 @@
 
 @Service
 public class GeocodingClient {
-    public static final String GEOCODING_VERSION = "street-address-v1";
+    public static final String GEOCODING_VERSION = "street-address-v2";
 
     private static final int DEFAULT_OWNER_CALLS_PER_HOUR = 1_000;
     private static final int DEFAULT_GLOBAL_CALLS_PER_HOUR = 2_000;
@@ -107,11 +107,11 @@ public List<PlaceCandidate> batchGeocode(String owner, List<PlaceCandidate> inpu
             uniqueQueries.putIfAbsent(candidate.text(), candidate);
         }
 
-        reserve(owner, uniqueQueries.size());
+        reserve(owner, uniqueQueries.size(), true);
         try {
             Map<String, PlaceCandidate> resultsByQuery = new HashMap<>();
             for (Map.Entry<String, PlaceCandidate> query : uniqueQueries.entrySet()) {
-                resultsByQuery.put(query.getKey(), geocodeOne(query.getValue()));
+                resultsByQuery.put(query.getKey(), geocodeOne(owner, query.getValue()));
             }
             return inputs.stream().map(candidate -> {
                 PlaceCandidate result = resultsByQuery.get(candidate.text());
@@ -122,7 +122,7 @@ public List<PlaceCandidate> batchGeocode(String owner, List<PlaceCandidate> inpu
         }
     }
 
-    private void reserve(String owner, int calls) {
+    private void reserve(String owner, int calls, boolean newBatch) {
         long now = System.nanoTime();
         synchronized (budgetLock) {
             globalUsage.prune(now);
@@ -135,14 +135,16 @@ private void reserve(String owner, int calls) {
             int activeForOwner = activeOwnerBatches.getOrDefault(owner, 0);
             if (calls > ownerCallsPerHour || calls > globalCallsPerHour
                     || account.calls + calls > ownerCallsPerHour || globalUsage.calls + calls > globalCallsPerHour
-                    || activeForOwner >= ownerConcurrentBatches || activeGlobalBatches >= globalConcurrentBatches) {
+                    || (newBatch && (activeForOwner >= ownerConcurrentBatches || activeGlobalBatches >= globalConcurrentBatches))) {
                 throw new ResponseStatusException(HttpStatus.TOO_MANY_REQUESTS,
                         "Geocoding rate or concurrency limit exceeded; retry later");
             }
             account.reserve(now, calls);
             globalUsage.reserve(now, calls);
-            activeOwnerBatches.put(owner, activeForOwner + 1);
-            activeGlobalBatches++;
+            if (newBatch) {
+                activeOwnerBatches.put(owner, activeForOwner + 1);
+                activeGlobalBatches++;
+            }
         }
     }
 
@@ -182,8 +184,16 @@ private HttpResponse<String> sendWithGlobalPacing(HttpRequest request) {
         }
     }
 
-    private PlaceCandidate geocodeOne(PlaceCandidate candidate) {
-        URI uri = URI.create(geocodeUrl + "?address=" + encode(withoutSecondaryUnit(candidate.text()))
+    private PlaceCandidate geocodeOne(String owner, PlaceCandidate candidate) {
+        PlaceCandidate resolved = lookup(candidate, candidate.text());
+        String primaryAddress = withoutSecondaryUnit(candidate.text());
+        if (resolved.pid() != null || primaryAddress.equals(candidate.text())) return resolved;
+        reserve(owner, 1, false);
+        return lookup(candidate, primaryAddress);
+    }
+
+    private PlaceCandidate lookup(PlaceCandidate candidate, String address) {
+        URI uri = URI.create(geocodeUrl + "?address=" + encode(address)
                 + "&region=" + encode(regionBias) + "&key=" + encode(apiKey));
         HttpRequest request = HttpRequest.newBuilder(uri).timeout(Duration.ofSeconds(15)).GET().build();
         HttpResponse<String> response = sendWithGlobalPacing(request);
@@ -196,7 +206,7 @@ private PlaceCandidate geocodeOne(PlaceCandidate candidate) {
         }
         if (body == null) throw new IllegalStateException("Geocoding returned an empty response");
         String status = body.path("status").asString();
-        if ("OK".equals(status) && body.path("results").isArray() && !body.path("results").isEmpty()) {
+        if ("OK".equals(status) && body.path("results").isArray()) {
             String requestedHouseNumber = houseNumber(candidate.text());
             for (JsonNode match : body.path("results")) {
                 boolean addressType = hasType(match, "street_address") || hasType(match, "premise")
@@ -228,7 +238,9 @@ private PlaceCandidate geocodeOne(PlaceCandidate candidate) {
     }
 
     private static String withoutSecondaryUnit(String address) {
-        return SECONDARY_UNIT.matcher(address).replaceFirst("")
+        Matcher unit = SECONDARY_UNIT.matcher(address);
+        if (!unit.find()) return address;
+        return unit.replaceFirst("")
                 .replaceAll("\\s+", " ")
                 .replaceAll("\\s*,\\s*", ", ")
                 .replaceAll("(?:,\\s*){2,}", ", ")