diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
index c2acf8439e..83409711b3 100644
--- a/source/backend/api/Pims.Api.csproj
+++ b/source/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>3.0.0-40.31</Version>
-    <Version>3.0.0-40.31</Version>
+    <Version>3.0.0-40.34</Version>
+    <Version>3.0.0-40.34</Version>
     <AssemblyVersion>3.0.0.40</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
diff --git a/source/frontend/package.json b/source/frontend/package.json
index 09335d9597..1d82396487 100644
--- a/source/frontend/package.json
+++ b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "3.0.0-40.31",
+  "version": "3.0.0-40.34",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",
diff --git a/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx b/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx
index b7d8941a62..0a34ea5808 100644
--- a/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx
+++ b/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx
@@ -62,7 +62,11 @@ export const DocumentFilterForm = (props: IDocumentFilterFormProps) => {
             <ColButtons xl="auto">
               <Row>
                 <Col xs="auto" className="pr-0">
-                  <SearchButton disabled={formikProps.isSubmitting} />
+                  <SearchButton
+                    onClick={() => formikProps.handleSubmit()}
+                    type="button"
+                    disabled={formikProps.isSubmitting}
+                  />
                 </Col>
                 <Col xs="auto">
                   <ResetButton
diff --git a/source/frontend/src/features/documents/list/DocumentFilter/__snapshots__/DocumentFilterForm.test.tsx.snap b/source/frontend/src/features/documents/list/DocumentFilter/__snapshots__/DocumentFilterForm.test.tsx.snap
index e81631ab7b..04f072bf7f 100644
--- a/source/frontend/src/features/documents/list/DocumentFilter/__snapshots__/DocumentFilterForm.test.tsx.snap
+++ b/source/frontend/src/features/documents/list/DocumentFilter/__snapshots__/DocumentFilterForm.test.tsx.snap
@@ -310,7 +310,7 @@ exports[`DocumentFilterForm component renders as expected 1`] = `
               data-testid="search"
               id="search-button"
               title="search"
-              type="submit"
+              type="button"
             >
               <div
                 class="Button__icon"
@@ -677,7 +677,7 @@ exports[`DocumentFilterForm component renders with data as expected 1`] = `
               data-testid="search"
               id="search-button"
               title="search"
-              type="submit"
+              type="button"
             >
               <div
                 class="Button__icon"
diff --git a/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap b/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
index eb72277cac..a623d42ca8 100644
--- a/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
+++ b/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
@@ -410,7 +410,7 @@ exports[`Document List View renders as expected 1`] = `
                   data-testid="search"
                   id="search-button"
                   title="search"
-                  type="submit"
+                  type="button"
                 >
                   <div
                     class="Button__icon"
@@ -1413,7 +1413,7 @@ exports[`Document List View renders as expected 2`] = `
                   data-testid="search"
                   id="search-button"
                   title="search"
-                  type="submit"
+                  type="button"
                 >
                   <div
                     class="Button__icon"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
index e009f33a5b..653b3f16af 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
@@ -340,7 +340,7 @@ exports[`Lease Documents Page renders as expected 1`] = `
                   data-testid="search"
                   id="search-button"
                   title="search"
-                  type="submit"
+                  type="button"
                 >
                   <div
                     class="Button__icon"
diff --git a/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx b/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx
index 8b24699104..3bb3552cea 100644
--- a/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx
+++ b/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx
@@ -27,7 +27,9 @@ export const MotiInventoryHeader: React.FunctionComponent<IMotiInventoryHeaderPr
   }
 
   const isLoading =
-    props.composedProperty.ltsaWrapper?.loading || props.composedProperty.apiWrapper?.loading;
+    props.composedProperty.ltsaWrapper?.loading ||
+    props.composedProperty.apiWrapper?.loading ||
+    props.composedProperty.parcelMapWrapper?.loading;
   return (
     <>
       <LoadingBackdrop show={isLoading} parentScreen={true} />
diff --git a/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityForm.test.tsx.snap b/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityForm.test.tsx.snap
index 6621b55872..16046cb196 100644
--- a/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityForm.test.tsx.snap
+++ b/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityForm.test.tsx.snap
@@ -653,7 +653,7 @@ exports[`ActivityForm test Renders as expected 1`] = `
                     data-testid="search"
                     id="search-button"
                     title="search"
-                    type="submit"
+                    type="button"
                   >
                     <div
                       class="Button__icon"
diff --git a/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityView.test.tsx.snap b/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityView.test.tsx.snap
index a0ff0a4d92..292b1efb77 100644
--- a/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityView.test.tsx.snap
+++ b/source/frontend/src/features/properties/map/activity/detail/__snapshots__/ActivityView.test.tsx.snap
@@ -653,7 +653,7 @@ exports[`ActivityView test Renders as expected 1`] = `
                     data-testid="search"
                     id="search-button"
                     title="search"
-                    type="submit"
+                    type="button"
                   >
                     <div
                       class="Button__icon"
diff --git a/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts b/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts
index 95393c40ee..bc04cc73f3 100644
--- a/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts
+++ b/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts
@@ -80,7 +80,7 @@ export const useApiRequestWrapper = <
         onSuccess && onSuccess(response);
         return response;
       } catch (e) {
-        if (!axios.isAxiosError(e)) {
+        if (!axios.isAxiosError(e) && throwError) {
           throw e;
         }
         if (!isMounted()) {
diff --git a/source/frontend/src/hooks/useComposedProperties.ts b/source/frontend/src/hooks/useComposedProperties.ts
index 8cc91e0b10..2503529e31 100644
--- a/source/frontend/src/hooks/useComposedProperties.ts
+++ b/source/frontend/src/hooks/useComposedProperties.ts
@@ -41,7 +41,7 @@ export const useComposedProperties = ({
     parcelMapFullyAttributed.name,
   );
   const { getSummaryWrapper } = useBcAssessmentLayer(bcAssessment.url, bcAssessment.names);
-  const retrievedPid = getApiPropertyWrapper?.response?.pid?.toString();
+  const retrievedPid = getApiPropertyWrapper?.response?.pid?.toString() ?? pid?.toString();
   const retrievedPin = getApiPropertyWrapper?.response?.pin?.toString();
 
   const typeCheckWrapper = useDeepCompareCallback(
@@ -74,11 +74,14 @@ export const useComposedProperties = ({
   const executeBcAssessmentSummary = getSummaryWrapper.execute;
 
   useEffect(() => {
-    if (!!retrievedPid) {
-      typeCheckWrapper(() => executeGetLtsa(retrievedPid), PROPERTY_TYPES.LTSA);
-      typeCheckWrapper(() => findByPid(retrievedPid), PROPERTY_TYPES.PARCEL_MAP);
+    if (retrievedPid !== undefined) {
+      typeCheckWrapper(() => executeGetLtsa(retrievedPid ?? ''), PROPERTY_TYPES.LTSA);
       typeCheckWrapper(
-        () => executeBcAssessmentSummary(retrievedPid),
+        () => findByPid((retrievedPid ?? '').padStart(9, '0'), true),
+        PROPERTY_TYPES.PARCEL_MAP,
+      );
+      typeCheckWrapper(
+        () => executeBcAssessmentSummary(retrievedPid ?? ''),
         PROPERTY_TYPES.BC_ASSESSMENT,
       );
     } else if (!!retrievedPin) {