From 983d4cfaaa3c6e11d1414befc2ed224f837bda70 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Tue, 3 Feb 2026 15:16:53 -0800
Subject: [PATCH 1/2] allow users to search for road names using the geocoder.

---
 .../Parameters/AddressesParameters.cs         |   7 +-
 .../common/mapFSM/MapStateMachineContext.tsx  |   7 +
 .../propertySelector/search/LayerFilter.scss  |   4 +-
 .../search/LayerFilter.test.tsx               |   2 +-
 .../propertySelector/search/LayerFilter.tsx   |   2 +-
 .../PropertySelectorSearchContainer.test.tsx  |   2 +-
 .../__snapshots__/LayerFilter.test.tsx.snap   |   2 +-
 .../components/GeocoderAutoComplete.scss      |  48 ++++++-
 .../components/GeocoderAutoComplete.tsx       | 133 ++++++++++++------
 .../properties/filter/GeographicNameInput.tsx | 129 +++++++++++------
 .../properties/filter/PropertyFilter.tsx      |  42 +++---
 11 files changed, 260 insertions(+), 118 deletions(-)

diff --git a/source/backend/geocoder/Parameters/AddressesParameters.cs b/source/backend/geocoder/Parameters/AddressesParameters.cs
index 2592cfa92c..9dda537464 100644
--- a/source/backend/geocoder/Parameters/AddressesParameters.cs
+++ b/source/backend/geocoder/Parameters/AddressesParameters.cs
@@ -10,7 +10,8 @@ public class AddressesParameters : BaseParameters
     {
         #region Properties
 
-        /// <summary>
+        /// <summary
+        ///  >
         /// <para>
         /// get/set - Civic address or intersection address as a single string in Single-line Address Format. If not present in an address request, individual address elements, such as streetName, localityName, and provinceCode must be provided.
         /// In an occupant/addresses resource, addressString represents an Occupant name followed by a frontGate delimiter('--') followed by an optional address.
@@ -28,7 +29,7 @@ public class AddressesParameters : BaseParameters
         /// get/set - The maximum number of search results to return.
         /// </summary>
         /// <value>Default value: <c>5</c>.</value>
-        public int MaxResults { get; set; } = 5;
+        public int MaxResults { get; set; } = 25;
 
         /// <summary>
         /// get/set - In the case of a block level match, the method of interpolation to determine how far down the block the accessPoint should be. The geocoder supports none, linear and adaptive interpolation.
@@ -52,7 +53,7 @@ public class AddressesParameters : BaseParameters
         /// get/set - If <c>true</c>, autoComplete suggestions are limited to addresses beginning with the provided partial address.
         /// </summary>
         /// <value>Default value: <c>true</c>.</value>
-        public bool ExactSpelling { get; set; } = true;
+        public bool ExactSpelling { get; set; } = false;
 
         /// <summary>
         /// get/set - If <c>true</c>, autoComplete suggestions are sorted using a fuzzy match comparison to the addressString.
diff --git a/source/frontend/src/components/common/mapFSM/MapStateMachineContext.tsx b/source/frontend/src/components/common/mapFSM/MapStateMachineContext.tsx
index fbdc6eff79..d8de4162ed 100644
--- a/source/frontend/src/components/common/mapFSM/MapStateMachineContext.tsx
+++ b/source/frontend/src/components/common/mapFSM/MapStateMachineContext.tsx
@@ -185,6 +185,13 @@ export const MapStateMachineProvider: React.FC<React.PropsWithChildren<unknown>>
     actions: {
       navigateToProperty: context => {
         const selectedFeatureData = context.mapLocationFeatureDataset;
+        const hasPimsFeatures = (selectedFeatureData?.pimsFeatures?.length ?? 0) > 0;
+        const hasParcelFeatures = (selectedFeatureData?.parcelFeatures?.length ?? 0) > 0;
+        const hasResults = hasPimsFeatures || hasParcelFeatures;
+
+        if (!context.mapFeatureSelected && !hasResults) {
+          return;
+        }
 
         // if there is more that one property on the location, further action is needed.
         if (selectedFeatureData.parcelFeatures?.length > 1) {
diff --git a/source/frontend/src/components/propertySelector/search/LayerFilter.scss b/source/frontend/src/components/propertySelector/search/LayerFilter.scss
index 38183061ba..54e7dac38e 100644
--- a/source/frontend/src/components/propertySelector/search/LayerFilter.scss
+++ b/source/frontend/src/components/propertySelector/search/LayerFilter.scss
@@ -1,6 +1,6 @@
 @import '@/assets/scss/styles.scss';
 
-.suggestionList {
+.addressSuggestionList {
   background-color: white;
   border-style: solid;
   border-color: lightslategray;
@@ -18,7 +18,7 @@
   left: 0rem;
 }
 
-.suggestionList li {
+.addressSuggestionList li {
   padding: 1rem 0.5rem;
   word-wrap: break-word;
   width: 25rem;
diff --git a/source/frontend/src/components/propertySelector/search/LayerFilter.test.tsx b/source/frontend/src/components/propertySelector/search/LayerFilter.test.tsx
index 9d8c56282f..aa86c181e9 100644
--- a/source/frontend/src/components/propertySelector/search/LayerFilter.test.tsx
+++ b/source/frontend/src/components/propertySelector/search/LayerFilter.test.tsx
@@ -80,7 +80,7 @@ describe('LayerFilter component', () => {
       await fillInput(container, 'address', '1234 Fake');
     });
 
-    const addressInput = container.querySelector('.suggestionList');
+    const addressInput = container.querySelector('.addressSuggestionList');
     expect(addressInput).toBeInTheDocument();
   });
 
diff --git a/source/frontend/src/components/propertySelector/search/LayerFilter.tsx b/source/frontend/src/components/propertySelector/search/LayerFilter.tsx
index 936a16982f..9caefd5d71 100644
--- a/source/frontend/src/components/propertySelector/search/LayerFilter.tsx
+++ b/source/frontend/src/components/propertySelector/search/LayerFilter.tsx
@@ -62,7 +62,7 @@ export const LayerFilter: React.FunctionComponent<React.PropsWithChildren<ILayer
       return null;
     }
     return (
-      <div className="suggestionList">
+      <div className="addressSuggestionList">
         {addressResults?.map((geoResponse: IGeocoderResponse, index: number) => (
           <option
             key={index}
diff --git a/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.test.tsx b/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.test.tsx
index ba905f4a0a..f47e538f09 100644
--- a/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.test.tsx
+++ b/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.test.tsx
@@ -223,7 +223,7 @@ describe('PropertySelectorSearchContainer component', () => {
     // typing on address search field should bring up address suggestions
     let addressSuggestions: HTMLElement;
     await waitFor(async () => {
-      addressSuggestions = container.querySelector('.suggestionList') as HTMLElement;
+      addressSuggestions = container.querySelector('.addressSuggestionList') as HTMLElement;
       expect(addressSuggestions).toBeInTheDocument();
       // clicking on a suggestion should initiate a search by address
       const firstAddress = addressSuggestions?.firstElementChild as HTMLElement;
diff --git a/source/frontend/src/components/propertySelector/search/__snapshots__/LayerFilter.test.tsx.snap b/source/frontend/src/components/propertySelector/search/__snapshots__/LayerFilter.test.tsx.snap
index e3fb126044..5cec43cf70 100644
--- a/source/frontend/src/components/propertySelector/search/__snapshots__/LayerFilter.test.tsx.snap
+++ b/source/frontend/src/components/propertySelector/search/__snapshots__/LayerFilter.test.tsx.snap
@@ -329,7 +329,7 @@ exports[`LayerFilter component > renders as expected 1`] = `
           </div>
         </div>
         <div
-          class="suggestionList"
+          class="addressSuggestionList"
         >
           <option>
             1234 Fake St
diff --git a/source/frontend/src/features/properties/components/GeocoderAutoComplete.scss b/source/frontend/src/features/properties/components/GeocoderAutoComplete.scss
index ddd27fba32..69f1b66bef 100644
--- a/source/frontend/src/features/properties/components/GeocoderAutoComplete.scss
+++ b/source/frontend/src/features/properties/components/GeocoderAutoComplete.scss
@@ -2,6 +2,22 @@
 .GeocoderAutoComplete {
   font-size: 1.6rem;
   position: relative;
+  overflow: visible;
+}
+
+.GeographicNameInput {
+  position: relative;
+  overflow: visible;
+}
+
+// Allow suggestion list to escape Bootstrap input group clipping
+.idir-input-group,
+.idir-input-group .input-group,
+.idir-input-group .form-group,
+.GeocoderAutoComplete .form-group,
+.GeographicNameInput .form-group {
+  position: relative;
+  overflow: visible;
 }
 
 .GeocoderAutoComplete form.Control,
@@ -14,10 +30,13 @@
   flex: 1 1;
   min-width: 0;
   margin-bottom: 0;
+  
 }
 
 .suggestionList {
+  z-index: 999;
   background-color: white;
+  opacity: 1;
   border-style: solid;
   border-color: lightslategray;
   border-width: thin;
@@ -26,11 +45,32 @@
   max-height: 60rem;
   margin: 0;
   padding: 0;
-  position: absolute;
+  max-height: 40rem;
   overflow-y: auto;
-  z-index: 999;
-  top: 0rem;
-  left: -5rem;
+  box-shadow: 0 0.6rem 1.6rem rgba(0, 0, 0, 0.2);
+}
+
+.suggestionList li {
+  padding: 1rem 0.5rem;
+  word-wrap: break-word;
+  width: 25rem;
+  overflow: hidden;
+  cursor: pointer;
+  color: var(--typography-color-secondary);
+
+  &:hover {
+    background-color: var(--surface-color-primary-button-hover);
+    color: #fff;
+  }
+}
+
+.suggestionList--floating {
+  position: fixed;
+  z-index: 4000;
+}
+
+.suggestionOverlay {
+  z-index: 5000;
 }
 
 .GeocoderAutoComplete option,
diff --git a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
index 5058500395..0f88e8e97f 100644
--- a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
+++ b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
@@ -3,9 +3,10 @@ import './GeocoderAutoComplete.scss';
 import classNames from 'classnames';
 import { useFormikContext } from 'formik';
 import debounce from 'lodash/debounce';
-import { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Form from 'react-bootstrap/Form';
 import { FormControlProps } from 'react-bootstrap/FormControl';
+import Overlay from 'react-bootstrap/Overlay';
 import ClickAwayListener from 'react-click-away-listener';
 
 import { DisplayError } from '@/components/common/form';
@@ -32,6 +33,32 @@ interface IGeocoderAutoCompleteProps {
   outerClassName?: string;
 }
 
+interface ISuggestionListProps {
+  options: IGeocoderResponse[];
+  onSelect: (value: IGeocoderResponse) => void;
+}
+
+const SuggestionList: React.FC<React.PropsWithChildren<ISuggestionListProps>> = ({
+  options,
+  onSelect,
+}) => {
+  return (
+    <ul className="suggestionList">
+      {options.map((option, index: number) => (
+        <li
+          key={index}
+          onClick={e => {
+            onSelect(option);
+            e.stopPropagation();
+          }}
+        >
+          {option.fullAddress}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
 export const GeocoderAutoComplete: React.FC<
   React.PropsWithChildren<IGeocoderAutoCompleteProps>
 > = ({
@@ -56,6 +83,8 @@ export const GeocoderAutoComplete: React.FC<
   const errorTooltip = error && touch && displayErrorTooltips ? error : undefined;
   const { searchAddress } = useGeocoderRepository();
   const [textValue, setTextValue] = useState<string | undefined>(value);
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const inputRef = useRef<HTMLInputElement | null>(null);
   const debouncedSearch = useRef(
     debounce(
       async (val: string, abort: boolean) => {
@@ -78,6 +107,7 @@ export const GeocoderAutoComplete: React.FC<
       setOptions([]);
     }
   };
+
   useEffect(() => {
     return () => {
       debouncedSearch('', true);
@@ -94,31 +124,43 @@ export const GeocoderAutoComplete: React.FC<
   };
 
   const renderSuggestions = () => {
-    if (options !== undefined && options.length === 0) {
+    if (options.length === 0) {
       return null;
     }
-    if (options !== undefined) {
-      return (
-        <ul className="suggestionList">
-          {options.map((x: IGeocoderResponse, index: number) => (
-            <li
-              key={index}
-              onClick={e => {
-                suggestionSelected(x);
-                e.stopPropagation();
-              }}
-            >
-              {x.fullAddress}
-            </li>
-          ))}
-        </ul>
-      );
-    }
-    return null;
+
+    return (
+      <Overlay
+        target={inputRef.current}
+        show
+        placement="bottom-start"
+        popperConfig={{
+          modifiers: [
+            {
+              name: 'offset',
+              options: {
+                offset: [0, 0],
+              },
+            },
+          ],
+        }}
+      >
+        {({
+          placement,
+          show: _show,
+          arrowProps: _arrowProps,
+          popper: _popper,
+          ...overlayProps
+        }) => (
+          <div {...overlayProps} data-placement={placement} className="suggestionOverlay">
+            <SuggestionList options={options} onSelect={suggestionSelected} />
+          </div>
+        )}
+      </Overlay>
+    );
   };
 
   return (
-    <div className="GeocoderAutoComplete">
+    <div className="GeocoderAutoComplete" ref={containerRef}>
       <ClickAwayListener
         onClickAway={e => {
           if (e.type === 'click') {
@@ -142,6 +184,7 @@ export const GeocoderAutoComplete: React.FC<
               disabled={disabled}
               required={required}
               onBlur={handleBlur}
+              ref={inputRef}
               {...rest}
             />
           </TooltipWrapper>
@@ -167,27 +210,29 @@ interface IDebounceInputProps extends FormControlProps {
   };
 }
 
-const InputControl: React.FC<React.PropsWithChildren<IDebounceInputProps>> = ({
-  onTextChange,
-  ...props
-}) => {
-  const onChange = (value: string) => {
-    onTextChange(value);
-  };
+const InputControl = React.forwardRef<HTMLInputElement, IDebounceInputProps>(
+  ({ onTextChange, ...props }, ref) => {
+    const onChange = (value: string) => {
+      onTextChange(value);
+    };
 
-  return (
-    <Form.Control
-      autoComplete={props.autoComplete}
-      name={props.field}
-      value={props.value}
-      isInvalid={props.isInvalid}
-      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-        onChange(e.target.value);
-      }}
-      placeholder={props.placeholder}
-      disabled={props.disabled}
-      required={props.required}
-      {...props}
-    />
-  );
-};
+    return (
+      <Form.Control
+        ref={ref}
+        autoComplete={props.autoComplete}
+        name={props.field}
+        value={props.value}
+        isInvalid={props.isInvalid}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+          onChange(e.target.value);
+        }}
+        placeholder={props.placeholder}
+        disabled={props.disabled}
+        required={props.required}
+        {...props}
+      />
+    );
+  },
+);
+
+InputControl.displayName = 'InputControl';
diff --git a/source/frontend/src/features/properties/filter/GeographicNameInput.tsx b/source/frontend/src/features/properties/filter/GeographicNameInput.tsx
index bbc211ad89..f3bb077aa5 100644
--- a/source/frontend/src/features/properties/filter/GeographicNameInput.tsx
+++ b/source/frontend/src/features/properties/filter/GeographicNameInput.tsx
@@ -4,9 +4,10 @@ import { useFormikContext } from 'formik';
 import { Feature, Geometry } from 'geojson';
 import { sortBy } from 'lodash';
 import debounce from 'lodash/debounce';
-import { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import Form from 'react-bootstrap/Form';
 import { FormControlProps } from 'react-bootstrap/FormControl';
+import Overlay from 'react-bootstrap/Overlay';
 import ClickAwayListener from 'react-click-away-listener';
 
 import TooltipWrapper from '@/components/common/TooltipWrapper';
@@ -23,6 +24,11 @@ interface IGeographicNameInputProps {
   onSelectionChanged?: (data: Feature<Geometry, IGeographicNamesProperties>) => void;
 }
 
+interface ISuggestionListProps {
+  options: Feature<Geometry, IGeographicNamesProperties>[];
+  onSelect: (value: Feature<Geometry, IGeographicNamesProperties>) => void;
+}
+
 const MIN_SEARCH_LENGTH = 3;
 
 export const GeographicNameInput: React.FC<React.PropsWithChildren<IGeographicNameInputProps>> = ({
@@ -37,6 +43,8 @@ export const GeographicNameInput: React.FC<React.PropsWithChildren<IGeographicNa
   const { handleBlur, setFieldValue, values } = useFormikContext<any>();
   const textValue = values[field];
   const { searchName } = useGeographicNamesRepository();
+  const containerRef = useRef<HTMLDivElement | null>(null);
+  const inputRef = useRef<HTMLInputElement | null>(null);
   const debouncedSearch = useRef(
     debounce(
       async (val: string, abort: boolean) => {
@@ -82,31 +90,40 @@ export const GeographicNameInput: React.FC<React.PropsWithChildren<IGeographicNa
     if (options !== undefined && options.length === 0) {
       return null;
     }
+
     return (
-      <ul className="suggestionList">
-        {options.map((x: Feature<Geometry, IGeographicNamesProperties>, index: number) => (
-          <li
-            key={x.id ?? index}
-            onClick={e => {
-              suggestionSelected(x);
-              e.stopPropagation();
-            }}
-          >
-            {[
-              x?.properties?.name,
-              x?.properties?.featureType,
-              x?.properties?.featureCategoryDescription,
-            ]
-              .filter(exists)
-              .join(' - ')}
-          </li>
-        ))}
-      </ul>
+      <Overlay
+        target={inputRef.current}
+        show
+        placement="bottom-start"
+        popperConfig={{
+          modifiers: [
+            {
+              name: 'offset',
+              options: {
+                offset: [0, 0],
+              },
+            },
+          ],
+        }}
+      >
+        {({
+          placement,
+          show: _show,
+          arrowProps: _arrowProps,
+          popper: _popper,
+          ...overlayProps
+        }) => (
+          <div {...overlayProps} data-placement={placement} className="suggestionOverlay">
+            <SuggestionList options={options} onSelect={suggestionSelected} />
+          </div>
+        )}
+      </Overlay>
     );
   };
 
   return (
-    <div className="GeographicNameInput">
+    <div className="GeographicNameInput" ref={containerRef}>
       <ClickAwayListener
         onClickAway={e => {
           if (e.type === 'click') {
@@ -132,6 +149,7 @@ export const GeographicNameInput: React.FC<React.PropsWithChildren<IGeographicNa
               placeholder={placeholder}
               disabled={disabled}
               onBlur={handleBlur}
+              ref={inputRef}
               {...rest}
             />
           </TooltipWrapper>
@@ -155,27 +173,56 @@ interface IDebounceInputProps extends FormControlProps {
   };
 }
 
-const InputControl: React.FC<React.PropsWithChildren<IDebounceInputProps>> = ({
-  onTextChange,
-  ...props
-}) => {
-  const onChange = (value: string) => {
-    onTextChange(value);
-  };
+const InputControl = React.forwardRef<HTMLInputElement, IDebounceInputProps>(
+  ({ onTextChange, ...props }, ref) => {
+    const onChange = (value: string) => {
+      onTextChange(value);
+    };
 
+    return (
+      <Form.Control
+        ref={ref}
+        {...props}
+        autoComplete={props.autoComplete}
+        name={props.field}
+        value={props.value ?? ''}
+        isInvalid={props.isInvalid}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+          onChange(e.target.value);
+        }}
+        placeholder={props.placeholder}
+        disabled={props.disabled}
+        required={props.required}
+      />
+    );
+  },
+);
+
+InputControl.displayName = 'InputControl';
+
+const SuggestionList: React.FC<React.PropsWithChildren<ISuggestionListProps>> = ({
+  options,
+  onSelect,
+}) => {
   return (
-    <Form.Control
-      {...props}
-      autoComplete={props.autoComplete}
-      name={props.field}
-      value={props.value ?? ''}
-      isInvalid={props.isInvalid}
-      onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-        onChange(e.target.value);
-      }}
-      placeholder={props.placeholder}
-      disabled={props.disabled}
-      required={props.required}
-    />
+    <ul className="suggestionList">
+      {options.map((option, index: number) => (
+        <li
+          key={option.id ?? index}
+          onClick={e => {
+            onSelect(option);
+            e.stopPropagation();
+          }}
+        >
+          {[
+            option?.properties?.name,
+            option?.properties?.featureType,
+            option?.properties?.featureCategoryDescription,
+          ]
+            .filter(exists)
+            .join(' - ')}
+        </li>
+      ))}
+    </ul>
   );
 };
diff --git a/source/frontend/src/features/properties/filter/PropertyFilter.tsx b/source/frontend/src/features/properties/filter/PropertyFilter.tsx
index ff780af8bc..b196fb8f4a 100644
--- a/source/frontend/src/features/properties/filter/PropertyFilter.tsx
+++ b/source/frontend/src/features/properties/filter/PropertyFilter.tsx
@@ -89,26 +89,28 @@ export const PropertyFilter: React.FC<React.PropsWithChildren<IPropertyFilterPro
   ];
 
   if (toggle === SearchToggleOption.Map) {
-    searchOptions.push({
-      label: 'POI Name',
-      value: 'name',
-    });
-    searchOptions.push({
-      label: 'Lat/Long',
-      value: 'coordinates',
-    });
-    searchOptions.push({
-      label: 'Survey Parcel',
-      value: 'surveyParcel',
-    });
-    searchOptions.push({
-      label: 'Project',
-      value: 'project',
-    });
-    searchOptions.push({
-      label: 'Legal Description',
-      value: 'legalDescription',
-    });
+    searchOptions.push(
+      {
+        label: 'POI Name',
+        value: 'name',
+      },
+      {
+        label: 'Lat/Long',
+        value: 'coordinates',
+      },
+      {
+        label: 'Survey Parcel',
+        value: 'surveyParcel',
+      },
+      {
+        label: 'Project',
+        value: 'project',
+      },
+      {
+        label: 'Legal Description',
+        value: 'legalDescription',
+      },
+    );
   }
 
   return (

From 49686abae64bfd0b386b10c224ff597367335e03 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Wed, 4 Feb 2026 16:51:05 -0800
Subject: [PATCH 2/2] test corrections.

---
 .../api/Helpers/Healthchecks/PimsCdogsHealthCheck.cs   |  6 ++++++
 .../dal/Libraries/Geocoder/GeocoderServiceTest.cs      | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/backend/api/Helpers/Healthchecks/PimsCdogsHealthCheck.cs b/source/backend/api/Helpers/Healthchecks/PimsCdogsHealthCheck.cs
index d88a58f669..83e7e1de8a 100644
--- a/source/backend/api/Helpers/Healthchecks/PimsCdogsHealthCheck.cs
+++ b/source/backend/api/Helpers/Healthchecks/PimsCdogsHealthCheck.cs
@@ -19,6 +19,12 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
         {
             try
             {
+                const int maxJitterMilliseconds = 10000;
+                var jitter = Random.Shared.Next(0, maxJitterMilliseconds + 1);
+                if (jitter > 0)
+                {
+                    await Task.Delay(TimeSpan.FromMilliseconds(jitter), cancellationToken);
+                }
 
                 var health = await _generationRepository.TryGetHealthAsync();
                 if (health.StatusCode != System.Net.HttpStatusCode.OK)
diff --git a/source/backend/tests/dal/Libraries/Geocoder/GeocoderServiceTest.cs b/source/backend/tests/dal/Libraries/Geocoder/GeocoderServiceTest.cs
index 786aad0a6f..787345daa4 100644
--- a/source/backend/tests/dal/Libraries/Geocoder/GeocoderServiceTest.cs
+++ b/source/backend/tests/dal/Libraries/Geocoder/GeocoderServiceTest.cs
@@ -89,7 +89,7 @@ public async Task GetSiteAddressesAsync_StringAddress_Success()
             var result = await service.GetSiteAddressesAsync("address");
 
             // Assert
-            var url = "https://geocoder.api.gov.bc.ca/addresses?addressString=address&maxResults=5&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=true&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
+            var url = "https://geocoder.api.gov.bc.ca/addresses?addressString=address&maxResults=25&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=false&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
             result.Should().NotBeNull();
             mockRequestClient.Verify(m => m.GetAsync<FeatureCollectionModel>(url), Times.Once());
             result.Should().Be(features);
@@ -119,7 +119,7 @@ public async Task GetSiteAddressesAsync_StringAddress_Encoding_Success()
             var result = await service.GetSiteAddressesAsync("address with encoding");
 
             // Assert
-            var url = "https://geocoder.api.gov.bc.ca/addresses.json?addressString=address%2Bwith%2Bencoding&maxResults=5&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=true&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
+            var url = "https://geocoder.api.gov.bc.ca/addresses.json?addressString=address%2Bwith%2Bencoding&maxResults=25&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=false&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
             result.Should().NotBeNull();
             mockRequestClient.Verify(m => m.GetAsync<FeatureCollectionModel>(url), Times.Once());
             result.Should().Be(features);
@@ -149,7 +149,7 @@ public async Task GetSiteAddressesAsync_StringAddress_Format_Encoding_Success()
             var result = await service.GetSiteAddressesAsync("address with encoding", "xml");
 
             // Assert
-            var url = "https://geocoder.api.gov.bc.ca/addresses.xml?addressString=address%2Bwith%2Bencoding&maxResults=5&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=true&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
+            var url = "https://geocoder.api.gov.bc.ca/addresses.xml?addressString=address%2Bwith%2Bencoding&maxResults=25&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=false&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
             result.Should().NotBeNull();
             mockRequestClient.Verify(m => m.GetAsync<FeatureCollectionModel>(url), Times.Once());
             result.Should().Be(features);
@@ -183,7 +183,7 @@ public async Task GetSiteAddressesAsync_Success()
             var result = await service.GetSiteAddressesAsync(parameters);
 
             // Assert
-            var url = "https://geocoder.api.gov.bc.ca/addresses.json?addressString=address%20with%20encoding&maxResults=5&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=true&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
+            var url = "https://geocoder.api.gov.bc.ca/addresses.json?addressString=address%20with%20encoding&maxResults=25&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=false&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
             result.Should().NotBeNull();
             mockRequestClient.Verify(m => m.GetAsync<FeatureCollectionModel>(url), Times.Once());
             result.Should().Be(features);
@@ -217,7 +217,7 @@ public async Task GetSiteAddressesAsync_Format_Success()
             var result = await service.GetSiteAddressesAsync(parameters, "xml");
 
             // Assert
-            var url = "https://geocoder.api.gov.bc.ca/addresses.xml?addressString=address%20with%20encoding&maxResults=5&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=true&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
+            var url = "https://geocoder.api.gov.bc.ca/addresses.xml?addressString=address%20with%20encoding&maxResults=25&interpolation=adaptive&echo=false&autoComplete=true&exactSpelling=false&fuzzyMatch=false&minScore=0&maxDistance=0&provinceCode=BC&extrapolate=false&outputSRS=4326&locationDescriptor=any&setBack=0&brief=false";
             result.Should().NotBeNull();
             mockRequestClient.Verify(m => m.GetAsync<FeatureCollectionModel>(url), Times.Once());
             result.Should().Be(features);