diff --git a/src/FilterLists.Web/package-lock.json b/src/FilterLists.Web/package-lock.json
index 1fdb6ae31..0afdf1f95 100644
Binary files a/src/FilterLists.Web/package-lock.json and b/src/FilterLists.Web/package-lock.json differ
diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json
index 7fe369556..3c65d389f 100644
--- a/src/FilterLists.Web/package.json
+++ b/src/FilterLists.Web/package.json
@@ -9,9 +9,9 @@
     "@types/react-dom": "16.8.5",
     "@types/react-router-dom": "^4.3.4",
     "@types/react-table": "^6.8.5",
+    "axios": "^0.19.0",
     "bootstrap": "^4.3.1",
     "es6-promise": "^4.2.8",
-    "isomorphic-fetch": "^2.2.1",
     "moment": "^2.24.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
diff --git a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
index 5e6c2b558..30c403eb5 100644
--- a/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
+++ b/src/FilterLists.Web/src/modules/home/HomeContainer.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import "isomorphic-fetch";
+import axios from "axios";
 import { ILanguage } from "./interfaces/ILanguage";
 import { ILicense } from "./interfaces/ILicense";
 import { IList } from "./interfaces/IList";
@@ -36,62 +36,48 @@ export class HomeContainer extends React.Component<{}, IState> {
     }
 
     componentDidMount() {
-        this.fetchLanguages();
-        this.fetchLicenses();
         this.fetchLists();
+        this.fetchLanguages();
+        this.fetchLicenses();        
         this.fetchMaintainers();
         this.fetchSoftware();
         this.fetchSyntaxes();
         this.fetchTags();
-        // this.fetchRuleCount();
     };
 
     fetchLanguages() {
-        fetch("/api/v1/languages")
-            .then(r => r.json() as Promise<ILanguage[]>)
-            .then(p => { this.setState({ languages: p }); });
+        axios.request<ILanguage[]>({ url: "/api/v1/languages" })
+            .then(l => { this.setState({ languages: l.data }); })
     };
 
     fetchLicenses() {
-        fetch("/api/v1/licenses")
-            .then(r => r.json() as Promise<ILicense[]>)
-            .then(p => { this.setState({ licenses: p }); });
+        axios.request<ILicense[]>({ url: "/api/v1/licenses" })
+            .then(l => { this.setState({ licenses: l.data }); })
     };
 
     fetchLists() {
-        fetch("/api/v1/lists")
-            .then(r => r.json() as Promise<IList[]>)
-            .then(p => { this.setState({ lists: p }); });
+        axios.request<IList[]>({ url: "/api/v1/lists" })
+            .then(l => { this.setState({ lists: l.data }); })
     };
 
     fetchMaintainers() {
-        fetch("/api/v1/maintainers")
-            .then(r => r.json() as Promise<IMaintainer[]>)
-            .then(p => { this.setState({ maintainers: p }); });
+        axios.request<IMaintainer[]>({ url: "/api/v1/maintainers" })
+            .then(l => { this.setState({ maintainers: l.data }); })
     };
 
     fetchSoftware() {
-        fetch("/api/v1/software")
-            .then(r => r.json() as Promise<ISoftware[]>)
-            .then(p => { this.setState({ software: p }); });
+        axios.request<ISoftware[]>({ url: "/api/v1/software" })
+            .then(l => { this.setState({ software: l.data }); })
     };
 
     fetchSyntaxes() {
-        fetch("/api/v1/syntaxes")
-            .then(r => r.json() as Promise<ISyntax[]>)
-            .then(p => { this.setState({ syntaxes: p }); });
+        axios.request<ISyntax[]>({ url: "/api/v1/syntaxes" })
+            .then(l => { this.setState({ syntaxes: l.data }); })
     };
 
     fetchTags() {
-        fetch("/api/v1/tags")
-            .then(r => r.json() as Promise<ITag[]>)
-            .then(p => { this.setState({ tags: p }); });
-    };
-
-    fetchRuleCount() {
-        fetch("/api/v1/rules")
-            .then(r => r.json() as Promise<number>)
-            .then(p => { this.setState({ ruleCount: p }); });
+        axios.request<ITag[]>({ url: "/api/v1/tags" })
+            .then(l => { this.setState({ tags: l.data }); })
     };
 
     render() {