diff --git a/.all-contributorsrc b/.all-contributorsrc
index 5ecd64a93..619463028 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -740,6 +740,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rockyroed",
+      "name": "roed",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108738926?v=4",
+      "profile": "https://github.com/rockyroed",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"
diff --git a/README.md b/README.md
index b1ef78201..1e5f7991e 100644
--- a/README.md
+++ b/README.md
@@ -236,10 +236,11 @@ Thanks to all our contributors!
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mvictor55"><img src="https://avatars.githubusercontent.com/u/71357256?v=4?s=100" width="100px;" alt="mvictor55"/><br /><sub><b>mvictor55</b></sub></a><br /><a href="#business-mvictor55" title="Business development">💼</a> <a href="#projectManagement-mvictor55" title="Project Management">📆</a> <a href="#fundingFinding-mvictor55" title="Funding Finding">🔍</a> <a href="https://github.com/codeforboston/maple/commits?author=mvictor55" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pranay8297"><img src="https://avatars.githubusercontent.com/u/47974414?v=4?s=100" width="100px;" alt="pranay"/><br /><sub><b>pranay</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=pranay8297" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ren0nie0"><img src="https://avatars.githubusercontent.com/u/32780767?v=4?s=100" width="100px;" alt="ren0nie0"/><br /><sub><b>ren0nie0</b></sub></a><br /><a href="#research-ren0nie0" title="Research">🔬</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rockyroed"><img src="https://avatars.githubusercontent.com/u/108738926?v=4?s=100" width="100px;" alt="roed"/><br /><sub><b>roed</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=rockyroed" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sammymyi"><img src="https://avatars.githubusercontent.com/u/105759252?v=4?s=100" width="100px;" alt="sammymyi"/><br /><sub><b>sammymyi</b></sub></a><br /><a href="#design-sammymyi" title="Design">🎨</a> <a href="#userTesting-sammymyi" title="User Testing">📓</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sashamaryl"><img src="https://avatars.githubusercontent.com/u/30247522?v=4?s=100" width="100px;" alt="sashamaryl"/><br /><sub><b>sashamaryl</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=sashamaryl" title="Code">💻</a> <a href="#mentoring-sashamaryl" title="Mentoring">🧑‍🏫</a> <a href="#research-sashamaryl" title="Research">🔬</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sashamaryl"><img src="https://avatars.githubusercontent.com/u/30247522?v=4?s=100" width="100px;" alt="sashamaryl"/><br /><sub><b>sashamaryl</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=sashamaryl" title="Code">💻</a> <a href="#mentoring-sashamaryl" title="Mentoring">🧑‍🏫</a> <a href="#research-sashamaryl" title="Research">🔬</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/shannonh800"><img src="https://avatars.githubusercontent.com/u/113308101?v=4?s=100" width="100px;" alt="shannonh800"/><br /><sub><b>shannonh800</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=shannonh800" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yasminekarni"><img src="https://avatars.githubusercontent.com/u/47721405?v=4?s=100" width="100px;" alt="yasminekarni"/><br /><sub><b>yasminekarni</b></sub></a><br /><a href="https://github.com/codeforboston/maple/commits?author=yasminekarni" title="Code">💻</a></td>
     </tr>
diff --git a/components/HearingsScheduled/HearingsScheduled.tsx b/components/HearingsScheduled/HearingsScheduled.tsx
index 723c4ff48..1474afcec 100644
--- a/components/HearingsScheduled/HearingsScheduled.tsx
+++ b/components/HearingsScheduled/HearingsScheduled.tsx
@@ -219,8 +219,8 @@ export const HearingsScheduled = () => {
               wrap={false}
               activeIndex={monthIndex}
               onSelect={handleSelect}
-              prevIcon={<CarouselControlNextIcon aria-hidden="true" />}
-              nextIcon={<CarouselControlPrevIcon aria-hidden="true" />}
+              prevIcon={<CarouselControlPrevIcon aria-hidden="true" />}
+              nextIcon={<CarouselControlNextIcon aria-hidden="true" />}
             >
               {monthsList?.map(month => {
                 return (
diff --git a/components/search/NoResults.tsx b/components/search/NoResults.tsx
index d98a03b42..dcdfa33f4 100644
--- a/components/search/NoResults.tsx
+++ b/components/search/NoResults.tsx
@@ -19,11 +19,11 @@ const Container = styled.div`
 export const NoResults: React.FC<React.PropsWithChildren<unknown>> = ({
   children
 }) => {
-  const { t } = useTranslation("common")
+  const { t } = useTranslation("search")
   return (
     <Container>
-      <Image src="/no-results.svg" alt={t("noResults")} />
-      <div className="fs-3">Looks Pretty Empty Here</div>
+      <Image src="/no-results.svg" alt={t("no_results")} />
+      <div className="fs-3">{t("looks_pretty_empty_here")}</div>
       <div className="text-center">{children}</div>
     </Container>
   )
diff --git a/components/search/ResultCount.tsx b/components/search/ResultCount.tsx
index 28ad52669..d7d83b730 100644
--- a/components/search/ResultCount.tsx
+++ b/components/search/ResultCount.tsx
@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next"
 import { useStats } from "react-instantsearch"
 import styled from "styled-components"
 
@@ -13,7 +14,11 @@ export function ResultCount(props: any) {
 
   return (
     <ResultContainer {...props}>
-      Showing {pageStart}-{pageEnd} of {nbHits} Results
+      {useTranslation("search").t("result_count", {
+        pageStart,
+        pageEnd,
+        nbHits
+      })}
     </ResultContainer>
   )
 }
diff --git a/components/search/SearchErrorBoundary.tsx b/components/search/SearchErrorBoundary.tsx
index 8372464ca..020cecce4 100644
--- a/components/search/SearchErrorBoundary.tsx
+++ b/components/search/SearchErrorBoundary.tsx
@@ -1,9 +1,10 @@
 import React, { ReactNode } from "react"
 import { Alert } from "react-bootstrap"
+import { withTranslation, WithTranslation } from "next-i18next"
 
-export class SearchErrorBoundary extends React.Component<{
-  children?: ReactNode
-}> {
+class SearchErrorBoundaryBase extends React.Component<
+  { children?: ReactNode } & WithTranslation
+> {
   state: { error: string | null } = { error: null }
 
   promiseRejectionHandler = (event: PromiseRejectionEvent) => {
@@ -16,8 +17,7 @@ export class SearchErrorBoundary extends React.Component<{
     if (this.state.error) {
       return (
         <Alert variant="danger">
-          Something went wrong. Please try again. Original message:{" "}
-          {this.state.error}
+          {this.props.t("search_error", { error: this.state.error })}
         </Alert>
       )
     }
@@ -44,3 +44,7 @@ export class SearchErrorBoundary extends React.Component<{
     )
   }
 }
+
+export const SearchErrorBoundary = withTranslation("search")(
+  SearchErrorBoundaryBase
+)
diff --git a/components/search/bills/BillSearch.tsx b/components/search/bills/BillSearch.tsx
index faadd018e..e536e986a 100644
--- a/components/search/bills/BillSearch.tsx
+++ b/components/search/bills/BillSearch.tsx
@@ -147,7 +147,7 @@ const Layout: FC<
   const refinements = useBillRefinements()
   const status = useSearchStatus()
 
-  const { t } = useTranslation("billSearch")
+  const { t } = useTranslation("search")
 
   return (
     <SearchContainer>
diff --git a/components/search/bills/useBillHierarchicalMenu.tsx b/components/search/bills/useBillHierarchicalMenu.tsx
deleted file mode 100644
index e2fbd7371..000000000
--- a/components/search/bills/useBillHierarchicalMenu.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useHierarchicalMenu } from "../useHierarchicalMenu"
-
-export const useBillHierarchicalMenu = () => {
-  const baseProps = { limit: 500, searchable: true }
-  const propsList = [
-    {
-      attribute: "topics.lvl0",
-      ...baseProps
-    },
-    {
-      attribute: "topics.lvl1",
-      ...baseProps
-    }
-  ]
-
-  return useHierarchicalMenu({ hierarchicalMenuProps: propsList })
-}
diff --git a/components/search/bills/useBillRefinements.tsx b/components/search/bills/useBillRefinements.tsx
index cbd560579..b42a16f81 100644
--- a/components/search/bills/useBillRefinements.tsx
+++ b/components/search/bills/useBillRefinements.tsx
@@ -1,7 +1,8 @@
 import { generalCourts } from "functions/src/shared"
 import { RefinementListItem } from "instantsearch.js/es/connectors/refinement-list/connectRefinementList"
-import { useCallback } from "react"
+import { useMemo } from "react"
 import { useRefinements } from "../useRefinements"
+import { useTranslation } from "next-i18next"
 
 // for legacy code purposes, things like:
 //
@@ -17,58 +18,35 @@ import { useRefinements } from "../useRefinements"
 //   searchablePlaceholder: "Legislative Session",
 
 export const useBillRefinements = () => {
-  const baseProps = { limit: 500, searchable: true }
-  const propsList = [
-    {
-      transformItems: useCallback(
-        (i: RefinementListItem[]) =>
-          i
-            .map(i => ({
-              ...i,
-              label: generalCourts[i.value as any]?.Name ?? i.label
-            }))
-            .sort((a, b) => Number(b.value) - Number(a.value)),
-        []
-      ),
-      attribute: "court",
-      searchablePlaceholder: "Legislative Session",
-      ...baseProps
-    },
-    {
-      attribute: "currentCommittee",
-      ...baseProps,
-      searchablePlaceholder: "Current Committee"
-    },
-    {
-      attribute: "city",
-      searchablePlaceholder: "City",
-      ...baseProps
-    },
-    {
-      attribute: "primarySponsor",
-      ...baseProps,
-      searchablePlaceholder: "Primary Sponsor"
-    },
-    {
-      attribute: "cosponsors",
-      ...baseProps,
-      searchablePlaceholder: "Cosponsor"
-    }
-  ]
-
-  const hierarchicalPropsList = [
-    {
-      attribute: "topics.lvl0",
-      ...baseProps
-    },
-    {
-      attribute: "topics.lvl1",
-      ...baseProps
-    }
-  ]
+  const { t } = useTranslation("search")
 
   return useRefinements({
-    hierarchicalMenuProps: hierarchicalPropsList,
-    refinementProps: propsList
+    hierarchicalMenuProps: { attributes: ["topics.lvl0", "topics.lvl1"] },
+    refinementProps: useMemo(
+      () =>
+        [
+          {
+            transformItems: (items: RefinementListItem[]) =>
+              items
+                .map(i => ({
+                  ...i,
+                  label: generalCourts[parseInt(i.value, 10)]?.Name ?? i.label
+                }))
+                .sort((a, b) => Number(b.value) - Number(a.value)),
+
+            attribute: "court"
+          },
+          { attribute: "currentCommittee" },
+          { attribute: "city" },
+          { attribute: "primarySponsor" },
+          { attribute: "cosponsors" }
+        ].map(props => ({
+          limit: 500,
+          searchable: true,
+          searchablePlaceholder: t(`refinements.bill.${props.attribute}`),
+          ...props
+        })),
+      [t]
+    )
   })
 }
diff --git a/components/search/bills/useBillSort.tsx b/components/search/bills/useBillSort.tsx
index fad2abedb..ca73c151e 100644
--- a/components/search/bills/useBillSort.tsx
+++ b/components/search/bills/useBillSort.tsx
@@ -1,31 +1,33 @@
 import { useMemo, useRef } from "react"
 import { SortByWithConfigurationItem } from "../SortBy"
+import { useTranslation } from "next-i18next"
 
 export const useBillSort = () => {
   const now = useRef(new Date().getTime())
+  const { t } = useTranslation("search")
 
   // refer to
   // https://github.com/typesense/typesense-instantsearch-adapter#with-react-instantsearch
   const items: SortByWithConfigurationItem[] = useMemo(
     () => [
       {
-        label: "Sort by Most Recent Testimony",
+        label: t("sort_by.most_recent_testimony"),
         value: "bills/sort/latestTestimonyAt:desc"
       },
       {
-        label: "Sort by Relevance",
+        label: t("sort_by.relevance"),
         value: "bills/sort/_text_match:desc,testimonyCount:desc"
       },
       {
-        label: "Sort by Testimony Count",
+        label: t("sort_by.testimony_count"),
         value: "bills/sort/testimonyCount:desc"
       },
       {
-        label: "Sort by Cosponsor Count",
+        label: t("sort_by.cosponsor_count"),
         value: "bills/sort/cosponsorCount:desc"
       },
       {
-        label: "Sort by Next Hearing Date",
+        label: t("sort_by.next_hearing_date"),
         value: "bills/sort/nextHearingAt:asc",
         configure: {
           numericRefinements: {
@@ -36,7 +38,7 @@ export const useBillSort = () => {
         }
       }
     ],
-    []
+    [t]
   )
   return items
 }
diff --git a/components/search/testimony/TestimonyHit.tsx b/components/search/testimony/TestimonyHit.tsx
index 52fe8996d..51f9c599d 100644
--- a/components/search/testimony/TestimonyHit.tsx
+++ b/components/search/testimony/TestimonyHit.tsx
@@ -1,6 +1,6 @@
 import { Hit } from "instantsearch.js"
 import Link from "next/link"
-import { useTranslation } from "next-i18next"
+import { Trans, useTranslation } from "next-i18next"
 import { Image } from "react-bootstrap"
 import { useMediaQuery } from "usehooks-ts"
 
@@ -25,8 +25,6 @@ export const TestimonyHit = ({ hit }: { hit: Hit<Testimony> }) => {
 }
 
 const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
-  const { t } = useTranslation(["auth"])
-
   const date = new Date(
     parseInt(hit.publishedAt.toString())
   ).toLocaleDateString("en-US", {
@@ -37,12 +35,6 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
   const { loading, error, result: bill } = useBill(hit.court, hit.billId)
   const committee = bill?.currentCommittee
   const isOrg = hit.authorRole === "organization"
-  const writtenBy =
-    isOrg || hit.public ? (
-      <Link href={`/profile?id=${hit.authorUid}`}>{hit.fullName}</Link>
-    ) : (
-      hit.fullName
-    )
   const { user } = useAuth()
   const { followOrg } = useFlags()
   const isCurrentUser = user?.uid === hit.authorUid
@@ -67,12 +59,25 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
       >
         <Image
           src={isOrg ? "/profile-org-icon.svg" : "/profile-individual-icon.svg"}
-          alt={t("profileIcon")}
+          alt={useTranslation("auth").t("profileIcon")}
           height="30px"
           width="30px"
         />
         <span style={{ flexGrow: 1 }}>
-          <b>Written by {writtenBy}</b>
+          <b>
+            <Trans
+              ns="testimony"
+              i18nKey="testimonyHit.writtenBy"
+              values={{ author: hit.fullName }}
+              components={[
+                isOrg || hit.public ? (
+                  <Link href={`/profile?id=${hit.authorUid}`} />
+                ) : (
+                  <></>
+                )
+              ]}
+            />
+          </b>
         </span>
         {hit.public && !isCurrentUser && followOrg && user && (
           <FollowUserButton profileId={hit.authorUid} />
@@ -95,7 +100,11 @@ const TestimonyResult = ({ hit }: { hit: Hit<Testimony> }) => {
           <div style={{ display: "flex", alignItems: "center", gap: "15px" }}>
             {/* <Link href={maple.bill({ court: hit.court, id: hit.billId })}> */}
             {/* <a> */}
-            <h2>Bill #{formatBillId(hit.billId)}</h2>
+            <h2>
+              {useTranslation("testimony").t("testimonyHit.bill", {
+                billId: formatBillId(hit.billId)
+              })}
+            </h2>
             {/* </a> */}
             {/* </Link> */}
             {committee && (
diff --git a/components/search/testimony/TestimonySearch.tsx b/components/search/testimony/TestimonySearch.tsx
index e77b42645..c32010444 100644
--- a/components/search/testimony/TestimonySearch.tsx
+++ b/components/search/testimony/TestimonySearch.tsx
@@ -12,7 +12,7 @@ import {
 } from "components/EditProfilePage/StyledEditProfileComponents"
 import { currentGeneralCourt } from "functions/src/shared"
 import { SortByItem } from "instantsearch.js/es/connectors/sort-by/connectSortBy"
-import { useState } from "react"
+import { useState, useMemo } from "react"
 import { TabContainer, TabPane } from "react-bootstrap"
 import styled from "styled-components"
 import TypesenseInstantSearchAdapter from "typesense-instantsearch-adapter"
@@ -27,6 +27,7 @@ import { useRouting } from "../useRouting"
 import { TestimonyHit } from "./TestimonyHit"
 import { useTestimonyRefinements } from "./useTestimonyRefinements"
 import { FollowContext, OrgFollowStatus } from "components/shared/FollowContext"
+import { useTranslation } from "next-i18next"
 
 const searchClient = new TypesenseInstantSearchAdapter({
   server: getServerConfig(),
@@ -36,41 +37,49 @@ const searchClient = new TypesenseInstantSearchAdapter({
   }
 }).searchClient
 
-const items: SortByItem[] = [
-  {
-    label: "Sort by New -> Old",
-    value: "publishedTestimony/sort/publishedAt:desc"
-  },
-  {
-    label: "Sort by Old -> New",
-    value: "publishedTestimony/sort/publishedAt:asc"
-  },
-  {
-    label: "Sort by Relevance",
-    value: "publishedTestimony/sort/_text_match:desc,publishedAt:desc"
-  }
-]
-
-export const initialSortByValue = items[0].value
+export const useTestimonySort = () => {
+  const { t } = useTranslation("search")
+  const items: SortByItem[] = useMemo(
+    () => [
+      {
+        label: t("sort_by.newest"),
+        value: "publishedTestimony/sort/publishedAt:desc"
+      },
+      {
+        label: t("sort_by.oldest"),
+        value: "publishedTestimony/sort/publishedAt:asc"
+      },
+      {
+        label: t("sort_by.relevance"),
+        value: "publishedTestimony/sort/_text_match:desc,publishedAt:desc"
+      }
+    ],
+    [t]
+  )
+  return items
+}
 
-export const TestimonySearch = () => (
-  <SearchErrorBoundary>
-    <InstantSearch
-      indexName={initialSortByValue}
-      initialUiState={{
-        [initialSortByValue]: {
-          refinementList: { court: [String(currentGeneralCourt)] }
-        }
-      }}
-      searchClient={searchClient}
-      routing={useRouting()}
-      future={{ preserveSharedStateOnUnmount: true }}
-    >
-      <VirtualFilters type="testimony" />
-      <Layout />
-    </InstantSearch>
-  </SearchErrorBoundary>
-)
+export const TestimonySearch = () => {
+  const initialSortByValue = useTestimonySort()[0].value
+  return (
+    <SearchErrorBoundary>
+      <InstantSearch
+        indexName={initialSortByValue}
+        initialUiState={{
+          [initialSortByValue]: {
+            refinementList: { court: [String(currentGeneralCourt)] }
+          }
+        }}
+        searchClient={searchClient}
+        routing={useRouting()}
+        future={{ preserveSharedStateOnUnmount: true }}
+      >
+        <VirtualFilters type="testimony" />
+        <Layout />
+      </InstantSearch>
+    </SearchErrorBoundary>
+  )
+}
 
 const RefinementRow = styled.div`
   display: inline-flex;
@@ -100,6 +109,7 @@ const Layout = () => {
   const refinements = useTestimonyRefinements()
   const status = useSearchStatus()
   const { indexUiState, setIndexUiState } = useInstantSearch()
+  const { t } = useTranslation("search")
 
   const onTabClick = (t: Tab) => {
     setKey(t)
@@ -157,7 +167,7 @@ const Layout = () => {
             <Col className="d-flex flex-column">
               <RefinementRow>
                 <ResultCount className="flex-grow-1 m-1" />
-                <SortBy items={items} />
+                <SortBy items={useTestimonySort()} />
                 {refinements.show}
               </RefinementRow>
               <CurrentRefinements
@@ -166,9 +176,9 @@ const Layout = () => {
               />
               {status === "empty" ? (
                 <NoResults>
-                  Your search has yielded zero results!
+                  {t("zero_results")}
                   <br />
-                  <b>Try another search term</b>
+                  <b>{t("another_term")}</b>
                 </NoResults>
               ) : (
                 <Hits hitComponent={TestimonyHit} />
diff --git a/components/search/testimony/useTestimonyRefinements.tsx b/components/search/testimony/useTestimonyRefinements.tsx
index 4642073a0..932356df5 100644
--- a/components/search/testimony/useTestimonyRefinements.tsx
+++ b/components/search/testimony/useTestimonyRefinements.tsx
@@ -1,41 +1,31 @@
 import { RefinementListItem } from "instantsearch.js/es/connectors/refinement-list/connectRefinementList"
 import { useRefinements } from "../useRefinements"
-import { useCallback } from "react"
+import { useMemo } from "react"
+import { useTranslation } from "next-i18next"
 
 export const useTestimonyRefinements = () => {
-  const baseProps = { limit: 500, searchable: true }
-  const propsList = [
-    {
-      transformItems: useCallback(
-        (i: RefinementListItem[]) => i.filter(i => i.label !== "private"),
-        []
-      ),
-      attribute: "authorDisplayName",
-      ...baseProps,
-      searchablePlaceholder: "Author Name"
-    },
-    {
-      attribute: "court",
-      ...baseProps,
-      searchablePlaceholder: "Court"
-    },
-    {
-      attribute: "position",
-      ...baseProps,
-      searchablePlaceholder: "Position"
-    },
-    {
-      attribute: "billId",
-      ...baseProps,
-      searchablePlaceholder: "Bill"
-    },
-    {
-      attribute: "authorRole",
-      ...baseProps,
-      searchable: false,
-      hidden: true
-    }
-  ]
+  const { t } = useTranslation("search")
 
-  return useRefinements({ refinementProps: propsList })
+  return useRefinements({
+    refinementProps: useMemo(
+      () =>
+        [
+          {
+            transformItems: (i: RefinementListItem[]) =>
+              i.filter(i => i.label !== "private"),
+            attribute: "authorDisplayName"
+          },
+          { attribute: "court" },
+          { attribute: "position" },
+          { attribute: "billId" },
+          { attribute: "authorRole", searchable: false, hidden: true }
+        ].map(props => ({
+          limit: 500,
+          searchable: true,
+          searchablePlaceholder: t(`refinements.testimony.${props.attribute}`),
+          ...props
+        })),
+      [t]
+    )
+  })
 }
diff --git a/components/search/useHierarchicalMenu.tsx b/components/search/useHierarchicalMenu.tsx
deleted file mode 100644
index 755c9736d..000000000
--- a/components/search/useHierarchicalMenu.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { useTranslation } from "next-i18next"
-import { useInstantSearch } from "react-instantsearch"
-import { faFilter } from "@fortawesome/free-solid-svg-icons"
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
-import { useCallback, useState } from "react"
-import styled from "styled-components"
-import { useMediaQuery } from "usehooks-ts"
-import { Button, Offcanvas } from "../bootstrap"
-import { SearchContainer } from "./SearchContainer"
-import { MultiselectHierarchicalMenu } from "./HierarchicalMenuWidget"
-export const FilterButton = styled(Button)`
-  font-size: 1rem;
-  line-height: 1rem;
-  min-height: 2rem;
-  padding: 0.25rem 0.5rem 0.25rem 0.5rem;
-  align-self: flex-start;
-`
-const useHasRefinements = () => {
-  const { results } = useInstantSearch()
-  const refinements = results.getRefinements()
-  return refinements.length !== 0
-}
-
-export const useHierarchicalMenu = ({
-  hierarchicalMenuProps
-}: {
-  hierarchicalMenuProps: any[]
-}) => {
-  const inline = useMediaQuery("(min-width: 768px)")
-  const [show, setShow] = useState(false)
-  const handleClose = useCallback(() => setShow(false), [])
-  const handleOpen = useCallback(() => setShow(true), [])
-
-  const hierarchicalMenu = (
-    <>
-      <MultiselectHierarchicalMenu
-        attributes={[
-          hierarchicalMenuProps[0].attribute,
-          hierarchicalMenuProps[1].attribute
-        ]}
-      />
-    </>
-  )
-  const hasRefinements = useHasRefinements()
-
-  const { t } = useTranslation("billSearch")
-
-  return {
-    options: inline ? (
-      <div>{hierarchicalMenu}</div>
-    ) : (
-      <Offcanvas show={show} onHide={handleClose}>
-        <Offcanvas.Header closeButton>
-          <Offcanvas.Title>{t("topics")}</Offcanvas.Title>
-        </Offcanvas.Header>
-        <Offcanvas.Body>
-          <SearchContainer>{hierarchicalMenu}</SearchContainer>
-        </Offcanvas.Body>
-      </Offcanvas>
-    ),
-    show: inline ? null : (
-      <FilterButton
-        variant="secondary"
-        active={show}
-        onClick={handleOpen}
-        className={hasRefinements ? "ais-FilterButton-has-refinements" : ""}
-      >
-        <FontAwesomeIcon icon={faFilter} /> {t("topics")}
-      </FilterButton>
-    )
-  }
-}
diff --git a/components/search/useRefinements.tsx b/components/search/useRefinements.tsx
index c07374160..c26da8322 100644
--- a/components/search/useRefinements.tsx
+++ b/components/search/useRefinements.tsx
@@ -1,12 +1,19 @@
 import { useTranslation } from "next-i18next"
-import { RefinementList, useInstantSearch } from "react-instantsearch"
+import {
+  RefinementList,
+  RefinementListProps,
+  useInstantSearch
+} from "react-instantsearch"
 import { faFilter } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import { useCallback, useState } from "react"
 import styled from "styled-components"
 import { useMediaQuery } from "usehooks-ts"
 import { Button, Offcanvas } from "../bootstrap"
-import { MultiselectHierarchicalMenu } from "./HierarchicalMenuWidget"
+import {
+  MultiselectHierarchicalMenu,
+  MultiselectHierarchicalMenuParams
+} from "./HierarchicalMenuWidget"
 import { SearchContainer } from "./SearchContainer"
 
 export const FilterButton = styled(Button)`
@@ -27,8 +34,8 @@ export const useRefinements = ({
   hierarchicalMenuProps,
   refinementProps
 }: {
-  hierarchicalMenuProps?: any[]
-  refinementProps: any[]
+  hierarchicalMenuProps?: MultiselectHierarchicalMenuParams
+  refinementProps: RefinementListProps[]
 }) => {
   const inline = useMediaQuery("(min-width: 768px)")
   const [show, setShow] = useState(false)
@@ -38,29 +45,20 @@ export const useRefinements = ({
   const refinements = (
     <>
       {refinementProps.map((p, i) => (
-        <RefinementList className="mb-4" key={i} {...(p as any)} />
+        <RefinementList className="mb-4" key={i} {...p} />
       ))}
     </>
   )
 
-  let hierarchicalMenu = <></>
-
-  if (hierarchicalMenuProps) {
-    hierarchicalMenu = (
-      <>
-        <MultiselectHierarchicalMenu
-          attributes={[
-            hierarchicalMenuProps[0].attribute,
-            hierarchicalMenuProps[1].attribute
-          ]}
-        />
-      </>
-    )
-  }
+  const hierarchicalMenu = hierarchicalMenuProps ? (
+    <MultiselectHierarchicalMenu {...hierarchicalMenuProps} />
+  ) : (
+    <></>
+  )
 
   const hasRefinements = useHasRefinements()
 
-  const { t } = useTranslation("billSearch")
+  const { t } = useTranslation("search")
 
   return {
     options: inline ? (
diff --git a/functions/src/email/handlebarsHelpers.ts b/functions/src/email/handlebarsHelpers.ts
index 45fa89c1b..3ec7e0230 100644
--- a/functions/src/email/handlebarsHelpers.ts
+++ b/functions/src/email/handlebarsHelpers.ts
@@ -34,6 +34,8 @@ export const registerPartials = (directoryPath: string) => {
 }
 
 export const prepareHandlebars = () => {
+  console.log("Preparing handlebars helpers and partials")
   registerHelpers()
   registerPartials(path.join(__dirname, PARTIALS_DIR))
+  console.log("Handlebars helpers and partials prepared")
 }
diff --git a/functions/src/notifications/deliverNotifications.ts b/functions/src/notifications/deliverNotifications.ts
index 979753559..46c029341 100644
--- a/functions/src/notifications/deliverNotifications.ts
+++ b/functions/src/notifications/deliverNotifications.ts
@@ -18,6 +18,7 @@ import {
 import { prepareHandlebars } from "../email/handlebarsHelpers"
 import { Frequency } from "../auth/types"
 
+const PROFILE_BATCH_SIZE = 50
 const NUM_BILLS_TO_DISPLAY = 4
 const NUM_USERS_TO_DISPLAY = 4
 const NUM_TESTIMONIES_TO_DISPLAY = 6
@@ -45,89 +46,116 @@ const getVerifiedUserEmail = async (uid: string) => {
 const deliverEmailNotifications = async () => {
   const now = Timestamp.fromDate(startOfDay(new Date()))
 
-  console.log("Preparing handlebars helpers and partials")
   prepareHandlebars()
-  console.log("Handlebars helpers and partials prepared")
 
-  const profilesSnapshot = await db
+  let numProfilesProcessed = 0
+
+  let profilesSnapshot = await db
     .collection("profiles")
     .where("nextDigestAt", "<=", now)
+    .limit(PROFILE_BATCH_SIZE)
     .get()
 
-  console.log(
-    `Processing ${
-      profilesSnapshot.size
-    } profiles with nextDigestAt <= ${now.toDate()}`
-  )
+  if (profilesSnapshot.empty) {
+    console.log(
+      `No profiles found with nextDigestAt <= ${now.toDate()} - sending 0 emails`
+    )
+    return
+  }
 
-  const emailPromises = profilesSnapshot.docs.map(async profileDoc => {
-    const profile = profileDoc.data() as Profile
-    if (!profile || !profile.notificationFrequency) {
-      console.log(
-        `User ${profileDoc.id} has no notificationFrequency - skipping`
-      )
-      return
-    }
+  do {
+    console.log(
+      `Processing batch of ${
+        profilesSnapshot.size
+      } profiles with nextDigestAt <= ${now.toDate()} starting with ${
+        profilesSnapshot.docs[0].id
+      }`
+    )
+    numProfilesProcessed += profilesSnapshot.size
 
-    // TODO: Temporarily using email from the profile to test the non-auth issues
-    //       Should only use email from `auth` once that's working
-    const defaultEmail = profile.email || profile.contactInfo?.publicEmail
-    const verifiedEmail =
-      (await getVerifiedUserEmail(profileDoc.id)) || defaultEmail
-    if (!verifiedEmail) {
-      console.log(
-        `Skipping user ${profileDoc.id} because they have no verified email address`
+    const emailPromises = profilesSnapshot.docs.map(async profileDoc => {
+      const profile = profileDoc.data() as Profile
+      if (
+        !profile ||
+        !profile.notificationFrequency ||
+        profile.notificationFrequency === "None"
+      ) {
+        console.log(
+          `User ${profileDoc.id} has no notificationFrequency - skipping`
+        )
+        return
+      }
+
+      // TODO: Temporarily using email from the profile to test the non-auth issues
+      //       Should only use email from `auth` once that's working
+      const defaultEmail = profile.email || profile.contactInfo?.publicEmail
+      const verifiedEmail =
+        (await getVerifiedUserEmail(profileDoc.id)) || defaultEmail
+      if (!verifiedEmail) {
+        console.log(
+          `Skipping user ${profileDoc.id} because they have no verified email address`
+        )
+        return
+      }
+
+      const digestData = await buildDigestData(
+        profileDoc.id,
+        now,
+        profile.notificationFrequency
       )
-      return
-    }
 
-    const digestData = await buildDigestData(
-      profileDoc.id,
-      now,
-      profile.notificationFrequency
-    )
+      const batch = db.batch()
 
-    const batch = db.batch()
+      // If there are no new notifications, don't send an email
+      if (
+        digestData.numBillsWithNewTestimony === 0 &&
+        digestData.numUsersWithNewTestimony === 0
+      ) {
+        console.log(
+          `No new notifications for ${profileDoc.id} - not sending email`
+        )
+      } else {
+        console.log(
+          `Sending email to user ${profileDoc.id} with data: ${digestData}`
+        )
+        const htmlString = renderToHtmlString(digestData)
 
-    // If there are no new notifications, don't send an email
-    if (
-      digestData.numBillsWithNewTestimony === 0 &&
-      digestData.numUsersWithNewTestimony === 0
-    ) {
-      console.log(
-        `No new notifications for ${profileDoc.id} - not sending email`
-      )
-    } else {
-      console.log(
-        `Sending email to user ${profileDoc.id} with data: ${digestData}`
-      )
-      const htmlString = renderToHtmlString(digestData)
-
-      const email = {
-        to: [verifiedEmail],
-        message: {
-          subject: "Your Notifications Digest",
-          text: convertHtmlToText(htmlString), // TODO: Just make a text template for this
-          html: htmlString
-        },
-        createdAt: Timestamp.now()
+        const email = {
+          to: [verifiedEmail],
+          message: {
+            subject: "Your Notifications Digest",
+            text: convertHtmlToText(htmlString), // TODO: Just make a text template for this
+            html: htmlString
+          },
+          createdAt: Timestamp.now()
+        }
+        batch.create(db.collection("emails").doc(), email)
+
+        console.log(`Saving email message to user ${profileDoc.id}`)
       }
-      batch.create(db.collection("emails").doc(), email)
 
-      console.log(`Saving email message to user ${profileDoc.id}`)
-    }
+      const nextDigestAt = getNextDigestAt(profile.notificationFrequency)
+      batch.update(profileDoc.ref, { nextDigestAt })
+      await batch.commit()
+
+      console.log(
+        `Updated nextDigestAt for ${profileDoc.id} to ${nextDigestAt?.toDate()}`
+      )
+    })
 
-    const nextDigestAt = getNextDigestAt(profile.notificationFrequency)
-    batch.update(profileDoc.ref, { nextDigestAt })
-    await batch.commit()
+    // Wait for all email documents to be created
+    await Promise.all(emailPromises)
 
-    console.log(
-      `Updated nextDigestAt for ${profileDoc.id} to ${nextDigestAt?.toDate()}`
-    )
-  })
+    // Fetch the next batch of profiles
+    profilesSnapshot = await db
+      .collection("profiles")
+      .where("nextDigestAt", "<=", now)
+      .startAfter(profilesSnapshot.docs[profilesSnapshot.docs.length - 1])
+      .limit(PROFILE_BATCH_SIZE)
+      .get()
+  } while (!profilesSnapshot.empty)
 
-  // Wait for all email documents to be created
-  await Promise.all(emailPromises)
+  console.log(`Finished processing ${numProfilesProcessed} profiles`)
 }
 
 // TODO: Unit tests
@@ -239,6 +267,8 @@ const renderToHtmlString = (digestData: NotificationEmailDigest) => {
     path.join(__dirname, EMAIL_TEMPLATE_PATH),
     "utf8"
   )
+  // TODO: Can we move the compilation up so we only compile the template
+  //       once per job run instead of once per email?
   const compiledTemplate = handlebars.compile(templateSource)
   return compiledTemplate(digestData)
 }
diff --git a/llm/requirements.txt b/llm/requirements.txt
index 8187253d4..92dbdd75b 100644
--- a/llm/requirements.txt
+++ b/llm/requirements.txt
@@ -1,5 +1,5 @@
 Flask==3.1.0
-chromadb==0.5.0
+chromadb==0.5.4
 firebase-admin==6.7.0
 firebase-functions==0.4.2
 langchain-community==0.2.1
diff --git a/pages/bills/index.tsx b/pages/bills/index.tsx
index b44a18305..183722e5f 100644
--- a/pages/bills/index.tsx
+++ b/pages/bills/index.tsx
@@ -7,7 +7,7 @@ import { createGetStaticTranslationProps } from "components/translations"
 export default createPage({
   titleI18nKey: "navigation.browseBills",
   Page: () => {
-    const { t } = useTranslation("billSearch")
+    const { t } = useTranslation("search")
 
     return (
       <Container fluid="md" className="mt-3">
@@ -20,7 +20,7 @@ export default createPage({
 
 export const getStaticProps = createGetStaticTranslationProps([
   "auth",
-  "billSearch",
+  "search",
   "common",
   "footer",
   "testimony"
diff --git a/pages/testimony/index.tsx b/pages/testimony/index.tsx
index a782d9963..3a3c074fe 100644
--- a/pages/testimony/index.tsx
+++ b/pages/testimony/index.tsx
@@ -20,7 +20,7 @@ export default createPage({
 
 export const getStaticProps = createGetStaticTranslationProps([
   "auth",
-  "billSearch",
+  "search",
   "common",
   "footer",
   "testimony",
diff --git a/public/locales/en/billSearch.json b/public/locales/en/billSearch.json
deleted file mode 100644
index 7d9e4c1a4..000000000
--- a/public/locales/en/billSearch.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "another_term" : "Try another search term",
-  "browse_bills" : "Browse Bills",
-  "filter" : "Filter",
-  "topics" : "Topics",
-  "zero_results" : "Your search has yielded zero results!"
-}
\ No newline at end of file
diff --git a/public/locales/en/search.json b/public/locales/en/search.json
new file mode 100644
index 000000000..8562bdf6b
--- /dev/null
+++ b/public/locales/en/search.json
@@ -0,0 +1,36 @@
+{
+  "another_term": "Try another search term",
+  "browse_bills": "Browse Bills",
+  "filter": "Filter",
+  "topics": "Topics",
+  "zero_results": "Your search has yielded zero results!",
+  "refinements": {
+    "bill": {
+      "court": "Legislative Session",
+      "currentCommittee": "Current Committee",
+      "city": "City",
+      "primarySponsor": "Primary Sponsor",
+      "cosponsors": "Cosponsor"
+    },
+    "testimony": {
+      "authorDisplayName": "Author Name",
+      "court": "Legislative Session",
+      "position": "Position",
+      "billId": "Bill",
+      "authorRole": "Author Role"
+    }
+  },
+  "sort_by": {
+    "most_recent_testimony": "Sort by Most Recent Testimony",
+    "newest": "Sort by Old -> New",
+    "oldest": "Sort by New -> Old",
+    "relevance": "Sort by Relevance",
+    "testimony_count": "Sort by Testimony Count",
+    "cosponsor_count": "Sort by Cosponsor Count",
+    "next_hearing_date": "Sort by Next Hearing Date"
+  },
+  "no_results": "No Results",
+  "looks_pretty_empty_here": "Looks Pretty Empty Here",
+  "result_count": "Showing {{pageStart}}-{{pageEnd}} of {{nbHits}} Results",
+  "search_error": "Something went wrong. Please try again. Original message: {{error}}"
+}
diff --git a/public/locales/en/testimony.json b/public/locales/en/testimony.json
index 3641724f6..f0ad58828 100644
--- a/public/locales/en/testimony.json
+++ b/public/locales/en/testimony.json
@@ -38,6 +38,10 @@
       "label": "Verify Your Email"
     }
   },
+  "testimonyHit": {
+    "writtenBy": "Written by <0>{{author}}</0>",
+    "bill": "Bill #{{billId}}"
+  },
   "testimonyDetail": {
     "what": "What",
     "says": "says",