diff --git a/package.json b/package.json
index d3a8aad..889cd1a 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "serve:test": "cross-env NODE_ENV=test nodemon --exec babel-node server/index.js",
     "start-front": "react-scripts start",
     "build": "node ./buildScript",
-    "lint": "npx eslint --ext jsx,js src server",
+    "lint": "npx eslint --fix --ext jsx,js src server",
     "test": "npm run lint && react-scripts test",
     "test:e2e": "concurrently \"npm run serve:test\" \"cypress run\" --kill-others --success first",
     "start": "concurrently \"npm run start-server\" \"npm run start-front\" --kill-others --kill-others-on-fail",
diff --git a/src/pages/HomePage/HomePage.jsx b/src/pages/HomePage/HomePage.jsx
index 7eea060..22b3c7e 100644
--- a/src/pages/HomePage/HomePage.jsx
+++ b/src/pages/HomePage/HomePage.jsx
@@ -27,27 +27,29 @@ const HomePage = ({
     const dispatch = useDispatch();
 
     const [techParams, setTechParams] = useState(isTech);
+    const [previousTechParams, setPreviousTechParams] = useState(isTech);
 
     const onSelectTech = (value) => {
         setIsLoading(true);
+        setPreviousTechParams(isTech);
         setTechParams(value);
         dispatch(setSortByRoles(value));
     };
 
     useEffect(() => {
         if (domains.length === 0) {
-            if (isTech === 'init') {
-                (async () => {
-                    await fetchDomains(0, false, isTech);
-                    setIsLoading(false);
-                })();
-            } else {
-                (async () => {
-                    await fetchDomains(0, false, isTech);
-                    setIsLoading(false);
-                })();
-            }
-        } else {
+            (async () => {
+                await fetchDomains(0, false, isTech);
+                setIsLoading(false);
+            })();
+                }
+        else if (previousTechParams !== isTech) {
+            (async () => {
+                await fetchDomains(0, false, isTech);
+                setIsLoading(false);
+            })();
+                }
+        else {
             setIsLoading(false);
         }
     }, [fetchDomains, isTech]);
diff --git a/src/redux/reducers/domains.js b/src/redux/reducers/domains.js
index 804dbbc..0c08367 100644
--- a/src/redux/reducers/domains.js
+++ b/src/redux/reducers/domains.js
@@ -143,30 +143,6 @@ const failDomainUnlock = (payload) => ({
     type: UNLOCK_DOMAIN_FAILURE,
 });
 
-// const fetchRawDomainList = async (isTech) => {
-//     let offset = 0;
-//     let domains = [];
-//     let count = 0;
-
-//     let res = await api.fetchDomains(null, offset, false, isTech);
-//     domains = domains.concat(res.data.domains);
-//     count = res.data.count;
-//     if (offset < count) {
-//         offset += 200;
-//     } else {
-//         return domains;
-//     }
-
-//     while (offset < count) {
-//         res = api.fetchDomains(null, offset, false);
-//         domains = domains.concat(res.data.domains);
-//         if (offset < count) {
-//             offset += 200;
-//         }
-//     }
-//     return domains;
-// };
-
 const fetchDomain = (uuid) => (dispatch) => {
     dispatch(requestDomain());
     return api
@@ -368,5 +344,4 @@ export {
     lockDomain,
     parseDomain,
     unlockDomain,
-    // fetchRawDomainList,
 };