diff --git a/src/course-search/SearchContext.jsx b/src/course-search/SearchContext.jsx
index d36dff33..9a12b780 100644
--- a/src/course-search/SearchContext.jsx
+++ b/src/course-search/SearchContext.jsx
@@ -53,11 +53,14 @@ const SearchData = ({ children, searchFacetFilters }) => {
     }
   }, [newQueryString]);
 
-  const value = {
-    refinementsFromQueryParams,
-    dispatch,
-    searchFacetFilters,
-  };
+  const value = useMemo(
+    () => ({
+      refinementsFromQueryParams,
+      dispatch,
+      searchFacetFilters,
+    }),
+    [refinementsFromQueryParams, dispatch, searchFacetFilters],
+  );
 
   return (
     <SearchContext.Provider value={value}>{children}</SearchContext.Provider>
diff --git a/src/course-search/SearchHeader.jsx b/src/course-search/SearchHeader.jsx
index 6430fc04..1b299a3c 100644
--- a/src/course-search/SearchHeader.jsx
+++ b/src/course-search/SearchHeader.jsx
@@ -15,9 +15,9 @@ const SearchHeader = () => {
     <div className="bg-brand-primary">
       <Container size="lg">
         <Row className="pt-4 pb-3">
-          <Col xs={12} md={10} lg={8}>
+          <Col xs={12} md={8}>
             <SearchBox
-              className="mb-3"
+              className="mb-4"
               defaultRefinement={searchQueryFromQueryParams}
               refinementsFromQueryParams={refinementsFromQueryParams}
             />
diff --git a/src/course-search/data/constants.js b/src/course-search/data/constants.js
index 4473ab0d..16aad3c9 100644
--- a/src/course-search/data/constants.js
+++ b/src/course-search/data/constants.js
@@ -31,6 +31,10 @@ export const SEARCH_FACET_FILTERS = [
     attribute: 'availability',
     title: 'Availability',
   },
+  {
+    attribute: 'language',
+    title: 'Language',
+  },
 ];
 
 export const BOOLEAN_FILTERS = [SHOW_ALL_NAME];