diff --git a/src/domains/ManageDomains.tsx b/src/domains/ManageDomains.tsx
index 1b0ddfc0..3c149dd1 100644
--- a/src/domains/ManageDomains.tsx
+++ b/src/domains/ManageDomains.tsx
@@ -3,7 +3,7 @@ import Message from '../utils/Message';
 import { Result } from '../utils/Result';
 import { ShlinkApiError } from '../api/ShlinkApiError';
 import { SimpleCard } from '../utils/SimpleCard';
-import SearchField from '../utils/SearchField';
+import { SearchField } from '../utils/SearchField';
 import { ShlinkDomainRedirects } from '../api/types';
 import { SelectedServer } from '../servers/data';
 import { DomainsList } from './reducers/domainsList';
diff --git a/src/servers/ManageServers.tsx b/src/servers/ManageServers.tsx
index 032fe203..53c364ce 100644
--- a/src/servers/ManageServers.tsx
+++ b/src/servers/ManageServers.tsx
@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Link } from 'react-router-dom';
 import { NoMenuLayout } from '../common/NoMenuLayout';
 import { SimpleCard } from '../utils/SimpleCard';
-import SearchField from '../utils/SearchField';
+import { SearchField } from '../utils/SearchField';
 import { Result } from '../utils/Result';
 import { StateFlagTimeout } from '../utils/helpers/hooks';
 import { ImportServersBtnProps } from './helpers/ImportServersBtn';
diff --git a/src/short-urls/ShortUrlsFilteringBar.tsx b/src/short-urls/ShortUrlsFilteringBar.tsx
index 9861e2e3..205c62ef 100644
--- a/src/short-urls/ShortUrlsFilteringBar.tsx
+++ b/src/short-urls/ShortUrlsFilteringBar.tsx
@@ -5,7 +5,7 @@ import { Button, InputGroup, Row, UncontrolledTooltip } from 'reactstrap';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTag, faTags } from '@fortawesome/free-solid-svg-icons';
 import classNames from 'classnames';
-import SearchField from '../utils/SearchField';
+import { SearchField } from '../utils/SearchField';
 import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
 import { formatIsoDate } from '../utils/helpers/date';
 import { DateRange } from '../utils/dates/types';
@@ -29,7 +29,7 @@ export interface ShortUrlsFilteringProps {
 
 const dateOrNull = (date?: string) => (date ? parseISO(date) : null);
 
-const ShortUrlsFilteringBar = (
+export const ShortUrlsFilteringBar = (
   ExportShortUrlsBtn: FC<ExportShortUrlsBtnProps>,
   TagsSelector: FC<TagsSelectorProps>,
 ): FC<ShortUrlsFilteringProps> => ({ selectedServer, className, shortUrlsAmount, order, handleOrderBy }) => {
@@ -96,5 +96,3 @@ const ShortUrlsFilteringBar = (
     </div>
   );
 };
-
-export default ShortUrlsFilteringBar;
diff --git a/src/short-urls/services/provideServices.ts b/src/short-urls/services/provideServices.ts
index f0c31f58..3124ba93 100644
--- a/src/short-urls/services/provideServices.ts
+++ b/src/short-urls/services/provideServices.ts
@@ -1,5 +1,5 @@
 import Bottle from 'bottlejs';
-import ShortUrlsFilteringBar from '../ShortUrlsFilteringBar';
+import { ShortUrlsFilteringBar } from '../ShortUrlsFilteringBar';
 import ShortUrlsList from '../ShortUrlsList';
 import ShortUrlsRow from '../helpers/ShortUrlsRow';
 import ShortUrlsRowMenu from '../helpers/ShortUrlsRowMenu';
diff --git a/src/tags/TagsList.tsx b/src/tags/TagsList.tsx
index d5ac0a00..ca8c3ca7 100644
--- a/src/tags/TagsList.tsx
+++ b/src/tags/TagsList.tsx
@@ -2,7 +2,7 @@ import { FC, useEffect, useState } from 'react';
 import { Row } from 'reactstrap';
 import { pipe } from 'ramda';
 import Message from '../utils/Message';
-import SearchField from '../utils/SearchField';
+import { SearchField } from '../utils/SearchField';
 import { SelectedServer } from '../servers/data';
 import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
 import { Result } from '../utils/Result';
diff --git a/src/utils/SearchField.tsx b/src/utils/SearchField.tsx
index 5c84ed69..a05576ba 100644
--- a/src/utils/SearchField.tsx
+++ b/src/utils/SearchField.tsx
@@ -15,7 +15,7 @@ interface SearchFieldProps {
   initialValue?: string;
 }
 
-const SearchField = ({ onChange, className, large = true, noBorder = false, initialValue = '' }: SearchFieldProps) => {
+export const SearchField = ({ onChange, className, large = true, noBorder = false, initialValue = '' }: SearchFieldProps) => {
   const [searchTerm, setSearchTerm] = useState(initialValue);
 
   const resetTimer = () => {
@@ -55,5 +55,3 @@ const SearchField = ({ onChange, className, large = true, noBorder = false, init
     </div>
   );
 };
-
-export default SearchField;
diff --git a/src/visits/VisitsTable.tsx b/src/visits/VisitsTable.tsx
index b6bfd5ca..28ca9c61 100644
--- a/src/visits/VisitsTable.tsx
+++ b/src/visits/VisitsTable.tsx
@@ -5,7 +5,7 @@ import { faCheck as checkIcon, faRobot as botIcon } from '@fortawesome/free-soli
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { UncontrolledTooltip } from 'reactstrap';
 import { SimplePaginator } from '../common/SimplePaginator';
-import SearchField from '../utils/SearchField';
+import { SearchField } from '../utils/SearchField';
 import { determineOrderDir, Order, sortList } from '../utils/helpers/ordering';
 import { prettify } from '../utils/helpers/numbers';
 import { supportsBotVisits } from '../utils/helpers/features';
diff --git a/test/servers/ManageServers.test.tsx b/test/servers/ManageServers.test.tsx
index c3940678..49292a1e 100644
--- a/test/servers/ManageServers.test.tsx
+++ b/test/servers/ManageServers.test.tsx
@@ -4,7 +4,7 @@ import { Button } from 'reactstrap';
 import ServersExporter from '../../src/servers/services/ServersExporter';
 import { ManageServers as createManageServers } from '../../src/servers/ManageServers';
 import { ServersMap, ServerWithId } from '../../src/servers/data';
-import SearchField from '../../src/utils/SearchField';
+import { SearchField } from '../../src/utils/SearchField';
 import { Result } from '../../src/utils/Result';
 
 describe('<ManageServers />', () => {
diff --git a/test/short-urls/ShortUrlsFilteringBar.test.tsx b/test/short-urls/ShortUrlsFilteringBar.test.tsx
index 62d034bf..113196cf 100644
--- a/test/short-urls/ShortUrlsFilteringBar.test.tsx
+++ b/test/short-urls/ShortUrlsFilteringBar.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { Mock } from 'ts-mockery';
 import { endOfDay, formatISO, startOfDay } from 'date-fns';
 import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom';
-import filteringBarCreator from '../../src/short-urls/ShortUrlsFilteringBar';
+import { ShortUrlsFilteringBar as filteringBarCreator } from '../../src/short-urls/ShortUrlsFilteringBar';
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { DateRange } from '../../src/utils/dates/types';
 import { formatDate } from '../../src/utils/helpers/date';
diff --git a/test/tags/TagsList.test.tsx b/test/tags/TagsList.test.tsx
index 82c441a4..d642a060 100644
--- a/test/tags/TagsList.test.tsx
+++ b/test/tags/TagsList.test.tsx
@@ -7,7 +7,7 @@ import { TagsList } from '../../src/tags/reducers/tagsList';
 import { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
 import { Result } from '../../src/utils/Result';
 import { TagsModeDropdown } from '../../src/tags/TagsModeDropdown';
-import SearchField from '../../src/utils/SearchField';
+import { SearchField } from '../../src/utils/SearchField';
 import { Settings } from '../../src/settings/reducers/settings';
 import { TagsOrderableFields } from '../../src/tags/data/TagsListChildrenProps';
 import { OrderingDropdown } from '../../src/utils/OrderingDropdown';
diff --git a/test/visits/VisitsTable.test.tsx b/test/visits/VisitsTable.test.tsx
index c4ddac6a..279ada47 100644
--- a/test/visits/VisitsTable.test.tsx
+++ b/test/visits/VisitsTable.test.tsx
@@ -3,7 +3,7 @@ import { Mock } from 'ts-mockery';
 import VisitsTable, { VisitsTableProps } from '../../src/visits/VisitsTable';
 import { rangeOf } from '../../src/utils/utils';
 import { SimplePaginator } from '../../src/common/SimplePaginator';
-import SearchField from '../../src/utils/SearchField';
+import { SearchField } from '../../src/utils/SearchField';
 import { NormalizedVisit } from '../../src/visits/types';
 import { ReachableServer, SelectedServer } from '../../src/servers/data';
 import { SemVer } from '../../src/utils/helpers/version';