diff --git a/frontend/src/app/[locale]/search/error.tsx b/frontend/src/app/[locale]/search/error.tsx
index b6c68226ae..0e165bb0f3 100644
--- a/frontend/src/app/[locale]/search/error.tsx
+++ b/frontend/src/app/[locale]/search/error.tsx
@@ -2,7 +2,7 @@
 import BetaAlert from "src/components/BetaAlert";
 import Breadcrumbs from "src/components/Breadcrumbs";
 import PageSEO from "src/components/PageSEO";
-import QueryProvider from "./QueryProvider";
+import QueryProvider from "src/app/[locale]/search/QueryProvider";
 import SearchBar from "src/components/search/SearchBar";
 import SearchCallToAction from "src/components/search/SearchCallToAction";
 import SearchFilterAccordion from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
@@ -86,25 +86,25 @@ export default function Error({ error }: ErrorProps) {
             <div className="tablet:grid-col-4">
               <SearchOpportunityStatus query={status} />
               <SearchFilterAccordion
-                options={fundingOptions}
+                filterOptions={fundingOptions}
                 title="Funding instrument"
                 queryParamKey="fundingInstrument"
                 query={fundingInstrument}
               />
               <SearchFilterAccordion
-                options={eligibilityOptions}
+                filterOptions={eligibilityOptions}
                 title="Eligibility"
                 queryParamKey="eligibility"
                 query={eligibility}
               />
               <SearchFilterAccordion
-                options={agencyOptions}
+                filterOptions={agencyOptions}
                 title="Agency"
                 queryParamKey="agency"
                 query={agency}
               />
               <SearchFilterAccordion
-                options={categoryOptions}
+                filterOptions={categoryOptions}
                 title="Category"
                 queryParamKey="category"
                 query={category}
diff --git a/frontend/src/app/[locale]/search/page.tsx b/frontend/src/app/[locale]/search/page.tsx
index 7a3c70fa1e..c91209ae38 100644
--- a/frontend/src/app/[locale]/search/page.tsx
+++ b/frontend/src/app/[locale]/search/page.tsx
@@ -3,7 +3,7 @@ import Breadcrumbs from "src/components/Breadcrumbs";
 import Loading from "src/app/[locale]/search/loading";
 import PageSEO from "src/components/PageSEO";
 import SearchResultsListFetch from "src/components/search/SearchResultsListFetch";
-import QueryProvider from "./QueryProvider";
+import QueryProvider from "src/app/[locale]/search/QueryProvider";
 import SearchBar from "src/components/search/SearchBar";
 import SearchCallToAction from "src/components/search/SearchCallToAction";
 import SearchFilterAccordion from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
@@ -84,25 +84,25 @@ function Search({ searchParams }: { searchParams: searchParamsTypes }) {
             <div className="tablet:grid-col-4">
               <SearchOpportunityStatus query={status} />
               <SearchFilterAccordion
-                options={fundingOptions}
+                filterOptions={fundingOptions}
                 title="Funding instrument"
                 queryParamKey="fundingInstrument"
                 query={fundingInstrument}
               />
               <SearchFilterAccordion
-                options={eligibilityOptions}
+                filterOptions={eligibilityOptions}
                 title="Eligibility"
                 queryParamKey="eligibility"
                 query={eligibility}
               />
               <SearchFilterAccordion
-                options={agencyOptions}
+                filterOptions={agencyOptions}
                 title="Agency"
                 queryParamKey="agency"
                 query={agency}
               />
               <SearchFilterAccordion
-                options={categoryOptions}
+                filterOptions={categoryOptions}
                 title="Category"
                 queryParamKey="category"
                 query={category}
diff --git a/frontend/src/components/search/SearchBar.tsx b/frontend/src/components/search/SearchBar.tsx
index 534661a737..331c2819a4 100644
--- a/frontend/src/components/search/SearchBar.tsx
+++ b/frontend/src/components/search/SearchBar.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { Icon } from "@trussworks/react-uswds";
-import { QueryContext } from "../../app/[locale]/search/QueryProvider";
+import { QueryContext } from "src/app/[locale]/search/QueryProvider";
 import { useContext } from "react";
 import { useSearchParamUpdater } from "src/hooks/useSearchParamUpdater";
 
diff --git a/frontend/src/components/search/SearchFilterAccordion/SearchFilterAccordion.tsx b/frontend/src/components/search/SearchFilterAccordion/SearchFilterAccordion.tsx
index 91eac14fde..084d45268f 100644
--- a/frontend/src/components/search/SearchFilterAccordion/SearchFilterAccordion.tsx
+++ b/frontend/src/components/search/SearchFilterAccordion/SearchFilterAccordion.tsx
@@ -1,7 +1,7 @@
 "use client";
-import SearchFilterCheckbox from "./SearchFilterCheckbox";
-import SearchFilterSection from "./SearchFilterSection/SearchFilterSection";
-import SearchFilterToggleAll from "./SearchFilterToggleAll";
+import SearchFilterCheckbox from "src/components/search/SearchFilterAccordion/SearchFilterCheckbox";
+import SearchFilterSection from "src/components/search/SearchFilterAccordion/SearchFilterSection/SearchFilterSection";
+import SearchFilterToggleAll from "src/components/search/SearchFilterAccordion/SearchFilterToggleAll";
 import { Accordion } from "@trussworks/react-uswds";
 import { QueryParamKey } from "src/types/search/searchResponseTypes";
 import { QueryContext } from "src/app/[locale]/search/QueryProvider";
@@ -34,14 +34,14 @@ export interface FilterOptionWithChildren {
 }
 
 interface SearchFilterAccordionProps {
-  options: FilterOption[];
+  filterOptions: FilterOption[];
   title: string; // Title in header of accordion
   query: Set<string>;
   queryParamKey: QueryParamKey; // Ex - In query params, search?{key}=first,second,third
 }
 
 export function SearchFilterAccordion({
-  options,
+  filterOptions,
   title,
   queryParamKey,
   query,
@@ -50,7 +50,7 @@ export function SearchFilterAccordion({
   const { updateQueryParams } = useSearchParamUpdater();
   const totalCheckedCount = query.size;
   // These are all of the available selectedable options.
-  const allOptionValues = options.map((options) => options.value);
+  const allOptionValues = filterOptions.map((options) => options.value);
   // This is the setting if all are selected.
   const allSelected = new Set(allOptionValues);
 
@@ -106,7 +106,7 @@ export function SearchFilterAccordion({
       />
 
       <ul className="usa-list usa-list--unstyled">
-        {options.map((option) => (
+        {filterOptions.map((option) => (
           <li key={option.id}>
             {/* If we have children, show a "section" dropdown, otherwise show just a checkbox */}
             {option.children ? (
diff --git a/frontend/src/components/search/SearchFilterAccordion/SearchFilterCheckbox.tsx b/frontend/src/components/search/SearchFilterAccordion/SearchFilterCheckbox.tsx
index 55ca4e39f7..59f3361afa 100644
--- a/frontend/src/components/search/SearchFilterAccordion/SearchFilterCheckbox.tsx
+++ b/frontend/src/components/search/SearchFilterAccordion/SearchFilterCheckbox.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import FilterCheckbox from "src/components/FilterCheckbox";
-import { FilterOption } from "./SearchFilterAccordion";
+import { FilterOption } from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
 
 interface SearchFilterCheckboxProps {
   option: FilterOption;
diff --git a/frontend/src/components/search/SearchFilterAccordion/SearchFilterOptions.ts b/frontend/src/components/search/SearchFilterAccordion/SearchFilterOptions.ts
index 3dd908a0f8..d2cdc589c0 100644
--- a/frontend/src/components/search/SearchFilterAccordion/SearchFilterOptions.ts
+++ b/frontend/src/components/search/SearchFilterAccordion/SearchFilterOptions.ts
@@ -1,4 +1,4 @@
-import { FilterOption } from "./SearchFilterAccordion";
+import { FilterOption } from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
 
 export const eligibilityOptions: FilterOption[] = [
   {
diff --git a/frontend/src/components/search/SearchFilterAccordion/SearchFilterSection/SearchFilterSection.tsx b/frontend/src/components/search/SearchFilterAccordion/SearchFilterSection/SearchFilterSection.tsx
index 9cdff022b2..6c843738e5 100644
--- a/frontend/src/components/search/SearchFilterAccordion/SearchFilterSection/SearchFilterSection.tsx
+++ b/frontend/src/components/search/SearchFilterAccordion/SearchFilterSection/SearchFilterSection.tsx
@@ -1,10 +1,10 @@
 "use client";
 import { useState } from "react";
-import { FilterOptionWithChildren } from "../SearchFilterAccordion";
-import SearchFilterCheckbox from "../SearchFilterCheckbox";
-import SearchFilterToggleAll from "../SearchFilterToggleAll";
-import SectionLinkCount from "./SectionLinkCount";
-import SectionLinkLabel from "./SectionLinkLabel";
+import { FilterOptionWithChildren } from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
+import SearchFilterCheckbox from "src/components/search/SearchFilterAccordion/SearchFilterCheckbox";
+import SearchFilterToggleAll from "src/components/search/SearchFilterAccordion/SearchFilterToggleAll";
+import SectionLinkCount from "src/components/search/SearchFilterAccordion/SearchFilterSection/SectionLinkCount";
+import SectionLinkLabel from "src/components/search/SearchFilterAccordion/SearchFilterSection/SectionLinkLabel";
 
 interface SearchFilterSectionProps {
   option: FilterOptionWithChildren;
diff --git a/frontend/src/components/search/SearchOpportunityStatus.tsx b/frontend/src/components/search/SearchOpportunityStatus.tsx
index b34621809b..752647b9d1 100644
--- a/frontend/src/components/search/SearchOpportunityStatus.tsx
+++ b/frontend/src/components/search/SearchOpportunityStatus.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { Checkbox } from "@trussworks/react-uswds";
-import { QueryContext } from "../../app/[locale]/search/QueryProvider";
+import { QueryContext } from "src/app/[locale]/search/QueryProvider";
 import { useContext } from "react";
 import { useSearchParamUpdater } from "src/hooks/useSearchParamUpdater";
 
diff --git a/frontend/src/components/search/SearchPaginationFetch.tsx b/frontend/src/components/search/SearchPaginationFetch.tsx
index a0193d1f19..7c3d921992 100644
--- a/frontend/src/components/search/SearchPaginationFetch.tsx
+++ b/frontend/src/components/search/SearchPaginationFetch.tsx
@@ -1,7 +1,7 @@
 "use server";
 import { getSearchFetcher } from "src/services/search/searchfetcher/SearchFetcherUtil";
 import { QueryParamData } from "src/services/search/searchfetcher/SearchFetcher";
-import SearchPagination from "./SearchPagination";
+import SearchPagination from "src/components/search/SearchPagination";
 
 interface SearchPaginationProps {
   searchParams: QueryParamData;
diff --git a/frontend/src/hooks/useSearchParamUpdater.ts b/frontend/src/hooks/useSearchParamUpdater.ts
index d67367882f..4317d06be0 100644
--- a/frontend/src/hooks/useSearchParamUpdater.ts
+++ b/frontend/src/hooks/useSearchParamUpdater.ts
@@ -40,7 +40,7 @@ export function useSearchParamUpdater() {
       params.delete("page");
     }
 
-    sendGAEvent("event", "search", { key: finalQueryParamValue });
+    sendGAEvent("event", "search_term", { key: finalQueryParamValue });
     let newPath = `${pathname}?${params.toString()}`;
     newPath = removeURLEncodedCommas(newPath);
     newPath = removeQuestionMarkIfNoParams(params, newPath);