diff --git a/src/app/collective-rewards/active-builders/ActiveBuildersContent.tsx b/src/app/collective-rewards/active-builders/ActiveBuildersContent.tsx
index 8f618623..7e303d34 100644
--- a/src/app/collective-rewards/active-builders/ActiveBuildersContent.tsx
+++ b/src/app/collective-rewards/active-builders/ActiveBuildersContent.tsx
@@ -11,19 +11,16 @@ export const isActive = (stateFlags?: BuilderStateFlags) => {
   return activeFlags.some(flag => stateFlags?.[flag])
 }
 
-export type BuilderWithStatus = Builder & { builderStatus: 'active' | 'inProgress' }
-
 export const ActiveBuildersContent = () => {
   const { data: builders, isLoading, error } = useGetBuildersByState(undefined, true)
   useHandleErrors({ error, title: 'Error loading builders' })
 
-  const buildersWithStatus = builders.map(builder => {
-    const builderStatus = isActive(builder.stateFlags) ? 'active' : 'inProgress'
-    return {
-      ...builder,
-      builderStatus,
-    }
-  })
+  const filterFunction = (builder: Builder, status: string) => {
+    if (status === 'all') return true
+    if (status === 'active') return isActive(builder.stateFlags)
+    if (status === 'inProgress') return !isActive(builder.stateFlags)
+    return false
+  }
 
   const status = [
     { label: 'All', value: 'all' },
@@ -33,7 +30,7 @@ export const ActiveBuildersContent = () => {
 
   return (
     <>
-      <SearchContextProvider builders={buildersWithStatus}>
+      <SearchContextProvider builders={builders} filterFunction={filterFunction}>
         <Search status={status} />
         {withSpinner(ActiveBuildersGrid)({ isLoading })}
       </SearchContextProvider>
diff --git a/src/app/collective-rewards/active-builders/ActiveBuildersGrid.tsx b/src/app/collective-rewards/active-builders/ActiveBuildersGrid.tsx
index dd9e9178..958dac71 100644
--- a/src/app/collective-rewards/active-builders/ActiveBuildersGrid.tsx
+++ b/src/app/collective-rewards/active-builders/ActiveBuildersGrid.tsx
@@ -1,10 +1,10 @@
 import { FC } from 'react'
-import { ActiveBuildersGridItem, BuilderWithStatus } from '@/app/collective-rewards/active-builders'
+import { ActiveBuildersGridItem } from '@/app/collective-rewards/active-builders'
 import { useSearchContext } from '@/app/collective-rewards/shared'
+import { Builder } from '@/app/collective-rewards/types'
 
 export const ActiveBuildersGrid: FC = () => {
-  const { getValues } = useSearchContext()
-  const items = getValues<BuilderWithStatus>()
+  const { data: items } = useSearchContext<Builder>()
 
   return (
     <div className="grid grid-cols-3 gap-6">
diff --git a/src/app/collective-rewards/active-builders/ActiveBuildersGridItem.tsx b/src/app/collective-rewards/active-builders/ActiveBuildersGridItem.tsx
index 5d97b946..18939b12 100644
--- a/src/app/collective-rewards/active-builders/ActiveBuildersGridItem.tsx
+++ b/src/app/collective-rewards/active-builders/ActiveBuildersGridItem.tsx
@@ -8,9 +8,10 @@ import { Jdenticon } from '@/components/Header/Jdenticon'
 import { shortAddress } from '@/lib/utils'
 import { isAddress, Address } from 'viem'
 import { crStatusColorClasses } from '@/app/collective-rewards/utils'
-import { BuilderWithStatus } from '@/app/collective-rewards/active-builders'
+import { Builder } from '@/app/collective-rewards/types'
+import { isActive } from '@/app/collective-rewards/active-builders'
 
-type ActiveBuildersGridItemProps = BuilderWithStatus
+type ActiveBuildersGridItemProps = Builder
 
 const Card = ({ header, body }: { header: ReactNode; body: ReactNode }) => {
   return (
@@ -30,11 +31,12 @@ const builderStatusMap = {
 export const ActiveBuildersGridItem: FC<ActiveBuildersGridItemProps> = ({
   address,
   builderName,
-  builderStatus,
+  stateFlags,
   proposal: { id: proposalId, date: joiningDate, name: proposalName },
 }) => {
   const router = useRouter()
   const shortenAddress = shortAddress(address as Address)
+  const builderState = isActive(stateFlags) ? 'active' : 'inProgress'
   const Header = (
     <div className="flex flex-row w-full items-center gap-x-3 min-h-11">
       <Jdenticon className="rounded-md bg-white" value={address} size="32" />
@@ -61,14 +63,14 @@ export const ActiveBuildersGridItem: FC<ActiveBuildersGridItemProps> = ({
             />
           </Typography>
         </Popover>
-        {builderStatus === 'active' && (
+        {builderState === 'active' && (
           <Paragraph className="text-sm font-light"> Joined {joiningDate}</Paragraph>
         )}
       </div>
       <div className="flex justify-center items-center">
         <Badge
-          content={builderStatusMap[builderStatus]}
-          className={`${crStatusColorClasses[builderStatus]} py-1 px-2`}
+          content={builderStatusMap[builderState]}
+          className={`${crStatusColorClasses[builderState]} py-1 px-2`}
         />
       </div>
     </div>
diff --git a/src/app/collective-rewards/leaderboard/BuildersLeaderBoardTable.tsx b/src/app/collective-rewards/leaderboard/BuildersLeaderBoardTable.tsx
index c343cf08..59e68552 100644
--- a/src/app/collective-rewards/leaderboard/BuildersLeaderBoardTable.tsx
+++ b/src/app/collective-rewards/leaderboard/BuildersLeaderBoardTable.tsx
@@ -1,7 +1,7 @@
 import { BuildersRewards } from '@/app/collective-rewards/rewards'
 import { TableBody, TableCore, TableHead, TableRow } from '@/components/Table'
 import { useBasicPaginationUi } from '@/shared/hooks/usePaginationUi'
-import { FC, useContext, useEffect, useMemo, useState } from 'react'
+import { FC, useMemo, useState } from 'react'
 import {
   ISortConfig,
   TableHeader,
@@ -13,8 +13,6 @@ import {
   TotalAllocationCell,
   useSearchContext,
 } from '@/app/collective-rewards/shared'
-import { PaginatedDataContext } from '../context/PaginatedDataContext'
-import { Pagination } from '../shared/components/Pagination'
 
 enum RewardsColumnKeyEnum {
   builder = 'builder',
@@ -42,8 +40,7 @@ const tableHeaders: TableHeader[] = [
 ]
 
 export const BuildersLeaderBoardTable: FC = () => {
-  const { getValues } = useSearchContext()
-  const rewardsData = getValues<BuildersRewards>()
+  const { data: rewardsData } = useSearchContext<BuildersRewards>()
 
   const [sortConfig, setSortConfig] = useState<ISortConfig>({
     key: RewardsColumnKeyEnum.totalAllocationPercentage,
diff --git a/src/app/collective-rewards/rewards/backers/hooks/useGetBackerRewards.ts b/src/app/collective-rewards/rewards/backers/hooks/useGetBackerRewards.ts
index e031102f..88bbf6f5 100644
--- a/src/app/collective-rewards/rewards/backers/hooks/useGetBackerRewards.ts
+++ b/src/app/collective-rewards/rewards/backers/hooks/useGetBackerRewards.ts
@@ -6,7 +6,6 @@ import {
   RifSvg,
   RbtcSvg,
 } from '@/app/collective-rewards/rewards'
-import { useBuilderContext } from '@/app/collective-rewards/user'
 import { useGaugesGetFunction } from '@/app/collective-rewards//shared'
 import { Address } from 'viem'
 import { usePricesContext } from '@/shared/context/PricesContext'
@@ -73,8 +72,8 @@ export const useGetBackerRewards = (
   const rbtcPrice = prices[rbtc.symbol]?.price ?? 0
 
   const data = buildersV2.map(({ address, builderName, gauge, stateFlags }) => {
-    const builderTotalAllocation = totalAllocation[gauge]
-    const backerAllocationOf = allocationOf[gauge]
+    const builderTotalAllocation = totalAllocation[gauge] ?? 0n
+    const backerAllocationOf = allocationOf[gauge] ?? 0n
     const totalAllocationPercentage = builderTotalAllocation
       ? (backerAllocationOf * 100n) / builderTotalAllocation
       : 0n
diff --git a/src/app/collective-rewards/shared/context/SearchContext.tsx b/src/app/collective-rewards/shared/context/SearchContext.tsx
index a6eed3a4..9aff29d9 100644
--- a/src/app/collective-rewards/shared/context/SearchContext.tsx
+++ b/src/app/collective-rewards/shared/context/SearchContext.tsx
@@ -1,18 +1,28 @@
-import { createContext, Dispatch, FC, ReactNode, SetStateAction, useContext, useMemo, useState } from 'react'
+import {
+  Context,
+  createContext,
+  Dispatch,
+  ReactNode,
+  SetStateAction,
+  useContext,
+  useMemo,
+  useState,
+} from 'react'
 
 type StateWithUpdate<T> = {
   value: T
   onChange: Dispatch<SetStateAction<T>>
 }
 
-type SearchContextValue = {
-  getValues: <T>() => T[]
+type SearchContextValue<Type> = {
+  data: Type[]
   search: StateWithUpdate<string>
   filterBy: StateWithUpdate<string>
 }
 
-export const SearchContext = createContext<SearchContextValue>({
-  getValues: () => [],
+type SearchValue = { builderName: string; address: string }
+export const SearchContext = createContext<SearchContextValue<SearchValue>>({
+  data: [],
   search: {
     value: '',
     onChange: () => {},
@@ -23,14 +33,18 @@ export const SearchContext = createContext<SearchContextValue>({
   },
 })
 
-type SearchValue = { builderName: string; address: string; builderStatus?: string }
-type SearchProviderProps = {
+type SearchProviderProps<T> = {
   children: ReactNode
-  builders: SearchValue[]
+  builders: T[]
+  filterFunction?: (param: T, status: string) => boolean
 }
 
 const lowerCaseCompare = (a: string, b: string) => a?.toLowerCase().includes(b?.toLowerCase())
-export const SearchContextProvider: FC<SearchProviderProps> = ({ children, builders }) => {
+export const SearchContextProvider = <T extends SearchValue>({
+  children,
+  builders,
+  filterFunction,
+}: SearchProviderProps<T>) => {
   const [search, setSearch] = useState('')
   const [filterBy, setFilterBy] = useState('all')
 
@@ -46,17 +60,15 @@ export const SearchContextProvider: FC<SearchProviderProps> = ({ children, build
       )
     }
 
-    if (filterBy !== 'all') {
-      filteredBuilders = filteredBuilders.filter(builder => builder.builderStatus === filterBy)
+    if (filterBy !== 'all' && filterFunction) {
+      filteredBuilders = filteredBuilders.filter(builder => filterFunction(builder, filterBy))
     }
 
     return filteredBuilders
   }, [builders, search, filterBy])
 
-  const getValues = <T,>() => data as T[]
-
-  const valueOfContext: SearchContextValue = {
-    getValues,
+  const valueOfContext: SearchContextValue<T> = {
+    data,
     search: { value: search, onChange: setSearch },
     filterBy: { value: filterBy, onChange: setFilterBy },
   }
@@ -64,4 +76,5 @@ export const SearchContextProvider: FC<SearchProviderProps> = ({ children, build
   return <SearchContext.Provider value={valueOfContext}>{children}</SearchContext.Provider>
 }
 
-export const useSearchContext = () => useContext(SearchContext)
+export const useSearchContext = <T extends SearchValue>() =>
+  useContext(SearchContext as unknown as Context<SearchContextValue<T>>)
diff --git a/src/app/collective-rewards/user/components/Button/BecomeABuilderButton.tsx b/src/app/collective-rewards/user/components/Button/BecomeABuilderButton.tsx
index 93c197fc..22c2da29 100644
--- a/src/app/collective-rewards/user/components/Button/BecomeABuilderButton.tsx
+++ b/src/app/collective-rewards/user/components/Button/BecomeABuilderButton.tsx
@@ -11,7 +11,7 @@ import { BuilderState, BuilderStateFlags } from '@/app/collective-rewards/types'
 import { useHandleErrors } from '@/app/collective-rewards/utils'
 
 type StatusBadgeProps = {
-  builderStatus?: BuilderState
+  builderState?: BuilderState
 }
 
 const BuilderRegistrationButton = () => {
@@ -24,7 +24,7 @@ const BuilderRegistrationButton = () => {
   )
 }
 
-const StatusBadge: FC<StatusBadgeProps> = ({ builderStatus }) => {
+const StatusBadge: FC<StatusBadgeProps> = ({ builderState }) => {
   const InProgressComponent = (
     <Badge content="In Progress" className="bg-[#4B5CF0] color-text-primary py-2 px-1" />
   )
@@ -38,7 +38,7 @@ const StatusBadge: FC<StatusBadgeProps> = ({ builderStatus }) => {
     inProgress: InProgressComponent,
     active: WhitelistedComponent,
     undefined: BuilderRegistrationButton,
-  }[builderStatus as BuilderState]
+  }[builderState as BuilderState]
 }
 
 const getBuilderState = (builderStateFlags?: BuilderStateFlags): BuilderState => {
@@ -51,7 +51,7 @@ export const BecomeABuilderHandler = ({ address }: { address: Address }) => {
   const { getBuilderByAddress, isLoading: builderLoading, error: builderLoadingError } = useBuilderContext()
 
   const builder = getBuilderByAddress(address)
-  const builderStatus = getBuilderState(builder?.stateFlags)
+  const builderState = getBuilderState(builder?.stateFlags)
 
   useHandleErrors({ error: builderLoadingError, title: `Error loading builder with address ${address}` })
 
@@ -63,7 +63,7 @@ export const BecomeABuilderHandler = ({ address }: { address: Address }) => {
     return <BuilderRegistrationButton />
   }
 
-  return <StatusBadge builderStatus={builderStatus} />
+  return <StatusBadge builderState={builderState} />
 }
 
 export const BecomeABuilderButton = ({ address }: { address: Address }) => {