diff --git a/components/case/documents.js b/components/case/documents.js
index f02e1d8f..e1ec2df1 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -2,7 +2,7 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 import jsonpath from "jsonpath";
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useCallback } from "react";
 import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
 import transLookup from "../../data/lookuptranslations.json";
 import PaginationControl from "./pagination";
@@ -289,23 +289,27 @@ const DocumentDetails = (props) => {
         selectedOption,
         fieldSortState,
         orderByState,
+        getDocumentResults,
     ]);
 
-    const getDocumentResults = (pageNumber, orderBy, fieldSort) => {
-        getSearchDocumentDetailsPaged(
-            props.incidentid,
-            pageNumber,
-            orderBy,
-            fieldSort,
-            selectedOption
-        )
-            .then((data) => data)
-            .then((data) => {
-                //console.log("getting details", data);
-                setDocumentDetails(data);
-                setShowSpinnerState(false);
-            });
-    };
+    const getDocumentResults = useCallback(
+        (pageNumber, orderBy, fieldSort) => {
+            getSearchDocumentDetailsPaged(
+                props.incidentid,
+                pageNumber,
+                orderBy,
+                fieldSort,
+                selectedOption
+            )
+                .then((data) => data)
+                .then((data) => {
+                    //console.log("getting details", data);
+                    setDocumentDetails(data);
+                    setShowSpinnerState(false);
+                });
+        },
+        [props.incidentid, selectedOption, setDocumentDetails]
+    );
 
     const getDocumentDetails = async () => {
         let docObj = await getSearchDocumentDetailsPaged(
diff --git a/components/elements/index.js b/components/elements/index.js
index afde1d02..3c7aa921 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -73,10 +73,9 @@ export function Textfield(props) {
         hint,
     } = props;
     const required = (value) => (value ? undefined : "Required");
+    let { t } = useTranslation();
 
     if (name == "pinswg_name") {
-        let { t } = useTranslation();
-
         return (
             <>
                 <div className="govuk-form-group">
@@ -676,7 +675,7 @@ const RenderRadio = ({
                     >
                         {" "}
                         {custom.hint != false && (
-                            <div class="govuk-hint">{t(custom.hint)}</div>
+                            <div className="govuk-hint">{t(custom.hint)}</div>
                         )}
                         {Object.keys(options).map((key, index) => (
                             <div
diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
index 99ee6288..cf7e24e5 100644
--- a/components/newappeal/aboutyou.js
+++ b/components/newappeal/aboutyou.js
@@ -180,13 +180,13 @@ let AboutYou = (props) => {
                 label={t("newappeal:about-you-on-behalf-label")}
             />
             <div className="govuk-form-group">
-                <details class="govuk-details" data-module="govuk-details">
-                    <summary class="govuk-details__summary">
-                        <span class="govuk-details__summary-text">
+                <details className="govuk-details" data-module="govuk-details">
+                    <summary className="govuk-details__summary">
+                        <span className="govuk-details__summary-text">
                             Who can appeal?
                         </span>
                     </summary>
-                    <div class="govuk-details__text">
+                    <div className="govuk-details__text">
                         Only those named as an applicant on the original
                         application form can submit an appeal. if you are
                         submitting an appeal on behalf of a company state the
diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js
index 57cf7228..28edc2f6 100644
--- a/components/newappeal/buildsection.js
+++ b/components/newappeal/buildsection.js
@@ -267,7 +267,9 @@ let BuildSection = (props) => {
                                     <ol className="govuk-list govuk-list--bullet">
                                         {Object.entries(documentListObj).map(
                                             ([key, value]) => {
-                                                return <li>{value}</li>;
+                                                return (
+                                                    <li key={key}>{value}</li>
+                                                );
                                             }
                                         )}
                                     </ol>
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 8eb0ef67..3a7ad521 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -6,7 +6,7 @@ import jsonpath from "jsonpath";
 import _ from "lodash";
 import transLookup from "../../data/lookuptranslations.json";
 import PaginationControl from "./pagination";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useCallback } from "react";
 import LoadingOverlay from "react-loading-overlay";
 import {
     getBasicDNSSearchPaged,
@@ -334,21 +334,29 @@ const DNSSearchResults = (props) => {
               )
             : pagesCount;
 
-    const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
-        //console.log(advancedSearch, searchString, pageNumber);
+    const getSearchPageResults = useCallback(
+        (pageNumber, orderBy, fieldSort) => {
+            //console.log(advancedSearch, searchString, pageNumber);
 
-        getBasicDNSSearchPaged(pageNumber, orderBy, fieldSort, selectedOption)
-            .then((data) => {
-                return data;
-            })
-            .then((data) => {
-                setSearchResults(data);
-                return getSearchDetailsPaged(data).then((data) => {
-                    setSearchDetails(data);
-                    setShowSpinnerState(false);
+            getBasicDNSSearchPaged(
+                pageNumber,
+                orderBy,
+                fieldSort,
+                selectedOption
+            )
+                .then((data) => {
+                    return data;
+                })
+                .then((data) => {
+                    setSearchResults(data);
+                    return getSearchDetailsPaged(data).then((data) => {
+                        setSearchDetails(data);
+                        setShowSpinnerState(false);
+                    });
                 });
-            });
-    };
+        },
+        [selectedOption, setSearchDetails, setSearchResults]
+    );
 
     const sortDataBy = (whichField) => {
         setOrderbyState(whichField);
@@ -373,7 +381,13 @@ const DNSSearchResults = (props) => {
         } else {
             setSearchLoaded(true);
         }
-    }, [selectedOption, fieldSortState, orderByState, searchLoaded]);
+    }, [
+        selectedOption,
+        fieldSortState,
+        orderByState,
+        searchLoaded,
+        getSearchPageResults,
+    ]);
     return (
         <>
             <div className="govuk-grid-row">
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 2f60eb7d..9acda3a0 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -17,7 +17,7 @@ import {
     getAdvancedSearchPaged,
 } from "../../actions";
 import data from "../../data/collections.json";
-import { useState } from "react";
+import { useCallback, useState } from "react";
 import LoadingOverlay from "react-loading-overlay";
 
 import {
@@ -549,49 +549,58 @@ const SearchResults = (props) => {
               )
             : pagesCount;
 
-    const getSearchPageResults = (pageNumber, orderBy, fieldSort) => {
-        //console.log(advancedSearch, searchString, pageNumber);
+    const getSearchPageResults = useCallback(
+        (pageNumber, orderBy, fieldSort) => {
+            //console.log(advancedSearch, searchString, pageNumber);
 
-        if (advancedSearch) {
-            var searchoObj = Object.assign(
-                ...searchString.map(([key, val]) => ({ [key]: val }))
-            );
+            if (advancedSearch) {
+                var searchoObj = Object.assign(
+                    ...searchString.map(([key, val]) => ({ [key]: val }))
+                );
 
-            getAdvancedSearchPaged(
-                searchoObj,
-                pageNumber,
-                orderBy,
-                fieldSort,
-                selectedOption
-            )
-                .then((data) => data)
-                .then((data) => {
-                    //console.log("getting details", data);
-                    setSearchResults(data);
-                    return getSearchDetailsPaged(data).then((data) => {
-                        setSearchDetails(data);
-                        setShowSpinnerState(false);
+                getAdvancedSearchPaged(
+                    searchoObj,
+                    pageNumber,
+                    orderBy,
+                    fieldSort,
+                    selectedOption
+                )
+                    .then((data) => data)
+                    .then((data) => {
+                        //console.log("getting details", data);
+                        setSearchResults(data);
+                        return getSearchDetailsPaged(data).then((data) => {
+                            setSearchDetails(data);
+                            setShowSpinnerState(false);
+                        });
                     });
-                });
-        } else {
-            getBasicSearchPaged(
-                searchString,
-                pageNumber,
-                orderBy,
-                fieldSort,
-                selectedOption
-            )
-                .then((data) => data)
-                .then((data) => {
-                    //console.log("getting details", data);
-                    setSearchResults(data);
-                    return getSearchDetailsPaged(data).then((data) => {
-                        setSearchDetails(data);
-                        setShowSpinnerState(false);
+            } else {
+                getBasicSearchPaged(
+                    searchString,
+                    pageNumber,
+                    orderBy,
+                    fieldSort,
+                    selectedOption
+                )
+                    .then((data) => data)
+                    .then((data) => {
+                        //console.log("getting details", data);
+                        setSearchResults(data);
+                        return getSearchDetailsPaged(data).then((data) => {
+                            setSearchDetails(data);
+                            setShowSpinnerState(false);
+                        });
                     });
-                });
-        }
-    };
+            }
+        },
+        [
+            advancedSearch,
+            searchString,
+            selectedOption,
+            setSearchDetails,
+            setSearchResults,
+        ]
+    );
 
     const sortDataBy = (whichField) => {
         setOrderbyState(whichField);
@@ -616,7 +625,13 @@ const SearchResults = (props) => {
         } else {
             setSearchLoaded(true);
         }
-    }, [selectedOption, fieldSortState, orderByState, searchLoaded]);
+    }, [
+        selectedOption,
+        fieldSortState,
+        orderByState,
+        searchLoaded,
+        getSearchPageResults,
+    ]);
     // console.log(
     //     "page is here ",
     //     currentPage,