diff --git a/client/src/layout/footer.jsx b/client/src/layout/footer.jsx
index 61cb93d..0083f57 100644
--- a/client/src/layout/footer.jsx
+++ b/client/src/layout/footer.jsx
@@ -1,7 +1,5 @@
 import { Col, Container, Link, Logo, Row, Title } from '@dataesr/dsfr-plus';
-import cn from 'classnames';
 import { useIntl } from 'react-intl';
-
 import {
   Footer,
   FooterBody,
@@ -16,255 +14,186 @@ const {
 
 export default function MainFooter() {
   const intl = useIntl();
-
   return (
     <Footer fluid>
       <FooterTop>
         <Container>
-          <Row gutters verticalAlign="middle">
-            <Col xs={12} lg={4}>
-              <Row horizontalAlign="left">
-                <div className="text-left">
-                  <Title
-                    as="h3"
-                    className={cn('fr-footer__top-cat', 'text-left')}
+          <Row gutters verticalAlign="top">
+            <Col md={2} xs={12}>
+              <div className="text-left">
+                <Title
+                  as="h3"
+                  className="fr-footer__top-cat"
+                >
+                  About
+                </Title>
+                <ul className="fr-footer__top-list">
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="/about"
+                      icon="mail-fill"
+                      iconPosition="left"
+                    >
+                      What is the Works-magnet?
+                    </Link>
+                  </li>
+                </ul>
+              </div>
+            </Col>
+            <Col md={2} xs={12}>
+              <Title
+                as="h3"
+                className="fr-footer__top-cat"
+              >
+                Communication
+              </Title>
+              <ul>
+                <li>
+                  <Link
+                    className="fr-footer__top-link"
+                    href="https://hal.univ-lorraine.fr/hal-04598201"
+                    icon="pie-chart-box-fill"
+                    iconPosition="left"
+                    target="_blank"
                   >
-                    About
-                  </Title>
-                  <ul className="fr-footer__top-list">
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="/about"
-                        icon="mail-fill"
-                        iconPosition="left"
-                      >
-                        What is the Works-magnet?
-                      </Link>
-                    </li>
-                  </ul>
-                  <Title
-                    as="h3"
-                    className={cn('fr-footer__top-cat', 'text-left')}
+                    Poster
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__top-link"
+                    href="https://www.youtube.com/watch?v=zkLFj5Wnsy0"
+                    icon="play-circle-fill"
+                    iconPosition="left"
+                    target="_blank"
                   >
-                    Contact
-                  </Title>
-                  <ul className="fr-footer__top-list">
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="mailto:bso@recherche.gouv.fr"
-                        icon="mail-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Email
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://groupes.renater.fr/sympa/info/bso-etablissements"
-                        icon="group-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Mailing-list
-                      </Link>
-                    </li>
-                  </ul>
-                  <Title
-                    as="h3"
-                    className={cn(
-                      'fr-footer__top-cat',
-                      'fr-mt-2w',
-                      'text-left',
-                    )}
+                    Tutorial [FR]
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__top-link"
+                    href="https://youtube.com/watch?v=OIFHhz2OQPg"
+                    icon="play-circle-fill"
+                    iconPosition="left"
+                    target="_blank"
                   >
-                    Communication
-                  </Title>
-                  <ul>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://hal.univ-lorraine.fr/hal-04598201"
-                        icon="pie-chart-box-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Poster
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://www.youtube.com/watch?v=zkLFj5Wnsy0"
-                        icon="play-circle-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Tutorial [FR]
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://youtube.com/watch?v=OIFHhz2OQPg"
-                        icon="play-circle-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Tutorial [EN]
-                      </Link>
-                    </li>
-                  </ul>
-                </div>
-              </Row>
+                    Tutorial [EN]
+                  </Link>
+                </li>
+              </ul>
             </Col>
-            <Col xs={12} lg={4}>
-              <Row horizontalAlign="center">
-                <div className="text-center">
-                  <Title
-                    as="h3"
-                    className={cn('fr-footer__top-cat', 'text-center')}
+            <Col md={4} xs={12}>
+              <Title
+                as="h3"
+                className="fr-footer__top-cat"
+              >
+                Open
+              </Title>
+              <ul>
+                <li>
+                  <Link
+                    className="fr-footer__top-link"
+                    href="https://data.enseignementsup-recherche.gouv.fr/explore/dataset/openalex-affiliations-corrections/information/"
+                    icon="table-fill"
+                    iconPosition="left"
+                    target="_blank"
                   >
-                    Follow us
-                  </Title>
-                  <ul className="fr-footer__top-list">
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://x.com/dataESR"
-                        icon="twitter-x-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        X
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://www.linkedin.com/company/enseignementsup-recherche/mycompany/"
-                        icon="linkedin-box-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Linkedin
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://www.facebook.com/enseignementsup.recherche"
-                        icon="facebook-circle-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Facebook
-                      </Link>
-                    </li>
-                  </ul>
-                  <Title
-                    as="h3"
-                    className={cn('fr-footer__top-cat', 'text-center')}
+                    Open data
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__top-link"
+                    href="https://github.com/dataesr/works-magnet/"
+                    icon="code-s-slash-line"
+                    iconPosition="left"
+                    target="_blank"
                   >
-                    Open
-                  </Title>
-                  <ul>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://data.enseignementsup-recherche.gouv.fr/explore/dataset/openalex-affiliations-corrections/information/"
-                        icon="table-fill"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Open data
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://github.com/dataesr/works-magnet/"
-                        icon="code-s-slash-line"
-                        iconPosition="left"
-                        target="_blank"
-                      >
-                        Open source
-                      </Link>
-                    </li>
-                  </ul>
-                </div>
-              </Row>
+                    Open source
+                  </Link>
+                </li>
+              </ul>
             </Col>
-            <Col xs={12} lg={4}>
-              <Row horizontalAlign="right">
-                <div className="text-right">
-                  <Title
-                    as="h3"
-                    className={cn('fr-footer__top-cat', 'text-right')}
-                  >
-                    See also
-                  </Title>
-                  <ul className="fr-footer__top-list">
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://github.com/dataesr"
-                        target="_blank"
-                      >
-                        GitHub
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://frenchopensciencemonitor.esr.gouv.fr/"
-                        target="_blank"
-                      >
-                        French Open Science Monitor
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://scanr.enseignementsup-recherche.gouv.fr/"
-                        target="_blank"
-                      >
-                        scanR, explore the world of French research & innovation
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://curiexplore.enseignementsup-recherche.gouv.fr/"
-                        target="_blank"
-                      >
-                        CurieXplore
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://data.enseignementsup-recherche.gouv.fr/pages/home/"
-                        target="_blank"
-                      >
-                        Open Data Platform
-                      </Link>
-                    </li>
-                    <li>
-                      <Link
-                        className="fr-footer__top-link"
-                        href="https://data.esr.gouv.fr/EN/"
-                        target="_blank"
-                      >
-                        #dataESR
-                      </Link>
-                    </li>
-                  </ul>
-                </div>
-              </Row>
+            <Col md={2} xs={12}>
+              <div className="text-left">
+                <Title
+                  as="h3"
+                  className="fr-footer__top-cat"
+                >
+                  Contact
+                </Title>
+                <ul className="fr-footer__top-list">
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="mailto:bso@recherche.gouv.fr"
+                      icon="mail-fill"
+                      iconPosition="left"
+                      target="_blank"
+                    >
+                      Email
+                    </Link>
+                  </li>
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="https://groupes.renater.fr/sympa/info/bso-etablissements"
+                      icon="group-fill"
+                      iconPosition="left"
+                      target="_blank"
+                    >
+                      Mailing-list
+                    </Link>
+                  </li>
+                </ul>
+              </div>
+            </Col>
+            <Col md={2} xs={12}>
+              <div className="text-left">
+                <Title
+                  as="h3"
+                  className="fr-footer__top-cat"
+                >
+                  Follow us
+                </Title>
+                <ul className="fr-footer__top-list">
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="https://x.com/dataESR"
+                      icon="twitter-x-fill"
+                      iconPosition="left"
+                      target="_blank"
+                    >
+                      X
+                    </Link>
+                  </li>
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="https://www.linkedin.com/company/enseignementsup-recherche/mycompany/"
+                      icon="linkedin-box-fill"
+                      iconPosition="left"
+                      target="_blank"
+                    >
+                      Linkedin
+                    </Link>
+                  </li>
+                  <li>
+                    <Link
+                      className="fr-footer__top-link"
+                      href="https://www.facebook.com/enseignementsup.recherche"
+                      icon="facebook-circle-fill"
+                      iconPosition="left"
+                      target="_blank"
+                    >
+                      Facebook
+                    </Link>
+                  </li>
+                </ul>
+              </div>
             </Col>
           </Row>
         </Container>
@@ -312,6 +241,70 @@ export default function MainFooter() {
         </Link>
       </FooterBody>
       <FooterBottom>
+        <div className="fr-footer__partners">
+          <h2 className="fr-footer__partners-title">See also</h2>
+          <div className="fr-footer__partners-logos">
+            <div className="fr-footer__partners-sub">
+              <ul>
+                {/* <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://github.com/dataesr"
+                    target="_blank"
+                  >
+                    GitHub
+                  </Link>
+                </li> */}
+                <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://frenchopensciencemonitor.esr.gouv.fr/"
+                    target="_blank"
+                  >
+                    French Open Science Monitor
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://scanr.enseignementsup-recherche.gouv.fr/"
+                    target="_blank"
+                  >
+                    scanR, explore the world of French research & innovation
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://curiexplore.enseignementsup-recherche.gouv.fr/"
+                    target="_blank"
+                  >
+                    CurieXplore
+                  </Link>
+                </li>
+                <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://data.enseignementsup-recherche.gouv.fr/pages/home/"
+                    target="_blank"
+                  >
+                    Open Data Platform
+                  </Link>
+                </li>
+                {/* <li>
+                  <Link
+                    className="fr-footer__partners-link"
+                    href="https://data.esr.gouv.fr/EN/"
+                    target="_blank"
+                  >
+                    #dataESR
+                  </Link>
+                </li> */}
+              </ul>
+            </div>
+
+          </div>
+        </div>
         {/* <Link className="fr-footer__bottom-link" href="/about/accessibility">
           Accessibility: currently being optimized
         </Link>
diff --git a/client/src/pages/openalex-affiliations/search.jsx b/client/src/pages/openalex-affiliations/search.jsx
index be32a2c..cdf3e23 100644
--- a/client/src/pages/openalex-affiliations/search.jsx
+++ b/client/src/pages/openalex-affiliations/search.jsx
@@ -268,14 +268,12 @@ export default function Search() {
                       buttonLabel={currentSearchParams.startYear}
                       label="Start year"
                       onSelectionChange={(startYear) => setSearchParams({ ...currentSearchParams, startYear })}
+                      selectedKey={currentSearchParams.startYear}
                     >
                       {years.map((year) => (
                         <SelectOption
                           color="blue-cumulus"
                           key={year.value}
-                          selected={
-                            year.value === currentSearchParams.startYear
-                          }
                         >
                           {year.label}
                         </SelectOption>
@@ -288,14 +286,12 @@ export default function Search() {
                       buttonLabel={currentSearchParams.endYear}
                       label="End year"
                       onSelectionChange={(endYear) => setSearchParams({ ...currentSearchParams, endYear })}
+                      selectedKey={currentSearchParams.endYear}
                     >
                       {years.map((year) => (
                         <SelectOption
                           color="blue-cumulus"
                           key={year.value}
-                          selected={
-                            year.value === currentSearchParams.startYear
-                          }
                         >
                           {year.label}
                         </SelectOption>
@@ -355,7 +351,7 @@ export default function Search() {
       </Container>
       <Container as="section" className="filters fr-my-5w">
         <Row className="fr-pt-2w fr-pr-2w fr-pb-0 fr-pl-2w">
-          <Col className="step-ror-to-add" xs="8" style={{ minHeight: '200px' }}>
+          <Col className="step-ror-to-add" xs={12} md={8} style={{ minHeight: '200px' }}>
             <TagInput
               getRorChildren={currentSearchParams.getRorChildren === '1'}
               hint="Press ENTER to search for several terms / expressions. If several, an OR operator is used."
@@ -375,7 +371,7 @@ export default function Search() {
               tags={tags}
             />
           </Col>
-          <Col offsetXs="1" className="text-right fr-pl-3w fr-mt-4w" style={{ minHeight: '180px' }}>
+          <Col offsetMd="1" className="fr-mt-4w" style={{ minHeight: '180px' }}>
             <Row gutters verticalAlign="bottom">
               <Col className="step-year-start">
                 <Select
@@ -417,7 +413,7 @@ export default function Search() {
           </Col>
         </Row>
         <Row className="fr-p-2w fr-pt-0" style={{ minHeight: '150px' }}>
-          <Col className="step-ror-to-exclude" xs="8">
+          <Col className="step-ror-to-exclude" xs={12} md={8}>
             <TextInput
               hint="You can focus on recall issues in OpenAlex (missing ROR). This way, only affiliation strings that are NOT matched in OpenAlex to this specific ROR will be retrieved. If several ROR to exclude, separate them by space."
               label="ROR to exclude: exclude affiliation strings already mapped to a specific ROR in OpenAlex"