diff --git a/client/src/components/mention-list/item.jsx b/client/src/components/mention-list/item.jsx
index 0073ffd..fab48b8 100644
--- a/client/src/components/mention-list/item.jsx
+++ b/client/src/components/mention-list/item.jsx
@@ -1,8 +1,10 @@
+import { Badge, Button, Col, Row, Text } from '@dataesr/dsfr-plus';
+import PropTypes from 'prop-types';
 import { useState } from 'react';
-import { Badge, Button, Col, Link, Row, Text } from '@dataesr/dsfr-plus';
+
 import { getIdLink } from '../../utils/works';
 
-export default function MentionListItem({ mention, index, selected, toggleToSelected }) {
+export default function MentionListItem({ mention }) {
   const [expanded, setExpanded] = useState(false);
 
   const getIdLinkDisplay = (idType, idValue) => {
@@ -15,10 +17,9 @@ export default function MentionListItem({ mention, index, selected, toggleToSele
 
   return (
     <li key={mention.id}>
-
       <Row>
         <Col>
-          <input type="checkbox" selected={selected} />
+          <input type="checkbox" selected={mention.selected} />
         </Col>
         <Col md={8}>
           <strong>
@@ -108,3 +109,7 @@ export default function MentionListItem({ mention, index, selected, toggleToSele
     </li>
   );
 }
+
+MentionListItem.propTypes = {
+  mention: PropTypes.object.isRequired,
+};
diff --git a/client/src/pages/datasets/search.jsx b/client/src/pages/datasets/search.jsx
index 80f5917..23b88ef 100644
--- a/client/src/pages/datasets/search.jsx
+++ b/client/src/pages/datasets/search.jsx
@@ -240,14 +240,12 @@ export default function DatasetsSearch() {
                       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>
@@ -260,14 +258,12 @@ export default function DatasetsSearch() {
                       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>
@@ -365,12 +361,12 @@ export default function DatasetsSearch() {
                   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>
@@ -383,12 +379,12 @@ export default function DatasetsSearch() {
                   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>
diff --git a/client/src/pages/mentions/index.jsx b/client/src/pages/mentions/index.jsx
index 063e4d5..a150077 100644
--- a/client/src/pages/mentions/index.jsx
+++ b/client/src/pages/mentions/index.jsx
@@ -852,9 +852,8 @@ export default function Mentions() {
               </Button>
             </div>
             <ul style={{ listStyle: 'none' }}>
-              {mentions.map((mention, index) => (
+              {mentions.map((mention) => (
                 <MentionListItem
-                  index={index}
                   key={mention.id}
                   mention={mention}
                 />
diff --git a/client/src/pages/openalex-affiliations/results/list-view.jsx b/client/src/pages/openalex-affiliations/results/list-view.jsx
index c7cb888..d08c50d 100644
--- a/client/src/pages/openalex-affiliations/results/list-view.jsx
+++ b/client/src/pages/openalex-affiliations/results/list-view.jsx
@@ -339,15 +339,12 @@ export default function ListView({
               <select
                 className="fr-select"
                 id="select-sort-on-number-of-rors"
-                onChange={(e) => {
-                  setSelectSortOnNumberOfRors(e.target.value);
-                }}
+                onChange={(e) => setSelectSortOnNumberOfRors(e.target.value)}
                 value={selectSortOnNumberOfRors}
               >
                 <option value="default">Works descending (default)</option>
                 <option value="numberASC">ROR ascending</option>
                 <option value="numberDESC">ROR descending</option>
-                {/* <option value="empty">No ROR detected</option> */}
               </select>
             </label>
           </div>
@@ -389,9 +386,7 @@ export default function ListView({
               <select
                 className="fr-select"
                 id="select-ror-country"
-                onChange={(e) => {
-                  setSelectRorCountry(e.target.value);
-                }}
+                onChange={(e) => setSelectRorCountry(e.target.value)}
                 value={selectRorCountry}
               >
                 <option value="all">All countries</option>
diff --git a/client/src/pages/openalex-affiliations/search.jsx b/client/src/pages/openalex-affiliations/search.jsx
index b80cba2..1453cc7 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>
@@ -381,12 +377,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>
@@ -399,12 +395,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>
diff --git a/client/src/pages/publications/search.jsx b/client/src/pages/publications/search.jsx
index 7cee3ad..fd57695 100644
--- a/client/src/pages/publications/search.jsx
+++ b/client/src/pages/publications/search.jsx
@@ -241,14 +241,12 @@ export default function PublicationsSearch() {
                       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>
@@ -261,14 +259,12 @@ export default function PublicationsSearch() {
                       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>
@@ -369,12 +365,12 @@ export default function PublicationsSearch() {
                   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>
@@ -387,12 +383,12 @@ export default function PublicationsSearch() {
                   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>