diff --git a/src/components/People/PeopleFilters.tsx b/src/components/People/PeopleFilters.tsx
index 508bc5dea..475483bcd 100644
--- a/src/components/People/PeopleFilters.tsx
+++ b/src/components/People/PeopleFilters.tsx
@@ -8,6 +8,7 @@ export const PeopleFilters = () => {
 
   const allCenturies = searchParams.getAll('centuries');
   const sex = searchParams.get('sex');
+  const possibleCenturies = ['16', '17', '18', '19', '20'];
 
   const setSexFilterActiveClass = (selectedSex: string) => {
     return classNames(
@@ -93,45 +94,15 @@ export const PeopleFilters = () => {
       <div className="panel-block">
         <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
           <div className="level-left">
-            <SearchLink
-              data-cy="century"
-              className={setSearchCenturyClass('16')}
-              params={{ centuries: setCenturyValues('16') }}
-            >
-              16
-            </SearchLink>
-
-            <SearchLink
-              data-cy="century"
-              className={setSearchCenturyClass('17')}
-              params={{ centuries: setCenturyValues('17') }}
-            >
-              17
-            </SearchLink>
-
-            <SearchLink
-              data-cy="century"
-              className={setSearchCenturyClass('18')}
-              params={{ centuries: setCenturyValues('18') }}
-            >
-              18
-            </SearchLink>
-
-            <SearchLink
-              data-cy="century"
-              className={setSearchCenturyClass('19')}
-              params={{ centuries: setCenturyValues('19') }}
-            >
-              19
-            </SearchLink>
-
-            <SearchLink
-              data-cy="century"
-              className={setSearchCenturyClass('20')}
-              params={{ centuries: setCenturyValues('20') }}
-            >
-              20
-            </SearchLink>
+            {possibleCenturies.map(century => (
+              <SearchLink
+                data-cy="century"
+                className={setSearchCenturyClass(century)}
+                params={{ centuries: setCenturyValues(century) }}
+              >
+                {century}
+              </SearchLink>
+            ))}
           </div>
 
           <div className="level-right ml-4">
diff --git a/src/components/People/PeoplePage.tsx b/src/components/People/PeoplePage.tsx
index 0288e967b..c5eb969db 100644
--- a/src/components/People/PeoplePage.tsx
+++ b/src/components/People/PeoplePage.tsx
@@ -11,7 +11,7 @@ export const PeoplePage = () => {
   const [people, setPeople] = useState<Person[] | null>(null);
   const [isError, setIsError] = useState(false);
 
-  const showLoader = people === null && !isError;
+  const showLoader = !people && !isError;
   const peopleLoaded = people && people.length > 0;
 
   useEffect(() => {
@@ -42,7 +42,7 @@ export const PeoplePage = () => {
                 <p data-cy="peopleLoadingError">Something went wrong</p>
               )}
 
-              {people && people.length === 0 && (
+              {people && !people.length && (
                 <p data-cy="noPeopleMessage">
                   There are no people on the server
                 </p>