diff --git a/src/routers/challenge-list/index.jsx b/src/routers/challenge-list/index.jsx
index 1e032b3..a682dbb 100644
--- a/src/routers/challenge-list/index.jsx
+++ b/src/routers/challenge-list/index.jsx
@@ -9,7 +9,7 @@ import { FeedbackButton, showMenu } from "@topcoder/micro-frontends-earn-app";
 import actions from "../../actions";
 import * as utils from "../../utils";
 import store from "../../store";
-import { initialChallengeFilter } from "../..//reducers/filter";
+import { initialChallengeFilter } from "../../reducers/filter";
 import _ from "lodash";
 
 import "react-date-range/dist/theme/default.css";
@@ -29,12 +29,19 @@ const App = () => {
 
   useEffect(() => {
     if (!location.search) {
-      const filterChange = utils.challenge.createEmptyChallengeFilter();
-      store.dispatch(actions.filter.clearChallengeFilter(filterChange));
-      store.dispatch(actions.challenges.getChallengesInit());
-      store.dispatch(
-        actions.challenges.getChallengesDone(initialChallengeFilter)
-      );
+      const currentFilter = store.getState().filter.challenge;
+      const diff = !_.isEqual(initialChallengeFilter, currentFilter);
+
+      if (diff) {
+        const params = utils.challenge.createChallengeParams(currentFilter);
+        utils.url.updateQuery(params, true);
+      } else {
+        store.dispatch(actions.challenges.getChallengesInit());
+        store.dispatch(
+          actions.challenges.getChallengesDone(currentFilter)
+        );
+      }
+      
       return;
     }
 
diff --git a/src/utils/lifeCycle.js b/src/utils/lifeCycle.js
index 7eed6d4..b363e48 100644
--- a/src/utils/lifeCycle.js
+++ b/src/utils/lifeCycle.js
@@ -5,20 +5,24 @@ import * as utils from "../utils";
 export default function appInit() {
   let initialQuery;
   let urlPath;
+  let firstMounted = true;
 
   function bootstrap() {
     return Promise.resolve().then(() => {
       initialQuery = window.location.search;
-      urlPath = window.location.pathname;
+      urlPath = utils.url.removeTrailingSlash(window.location.pathname);
     });
   }
 
   async function mount() {
     try {
-      if (initialQuery) {
-        const params = utils.url.parseUrlQuery(initialQuery);
-        const filter = utils.challenge.createChallengeFilter(params);
-        store.dispatch(action.initApp(filter));
+      if (firstMounted) {
+        if (initialQuery && urlPath === '/earn/find/challenges') {
+          const params = utils.url.parseUrlQuery(initialQuery);
+          const filter = utils.challenge.createChallengeFilter(params);
+          store.dispatch(action.initApp(filter));
+        }
+        firstMounted = false;
       }
     } catch (error) {
       console.error(error)
diff --git a/src/utils/url.js b/src/utils/url.js
index bb4a84a..1ace7ac 100644
--- a/src/utils/url.js
+++ b/src/utils/url.js
@@ -37,12 +37,16 @@ export function parseUrlQuery(queryString) {
   return params
 }
 
-export function updateQuery(params) {
+export function updateQuery(params, replace = false) {
   const oldQuery = decodeURIComponent(window.location.search);
   let query = buildQueryString(params);
   query = `?${query.substring(1).split("&").sort().join("&")}`;
   if (query !== oldQuery) {
-    window.history.pushState(window.history.state, "", query);
+    if (replace) {
+      window.history.replaceState(window.history.state, "", query);
+    } else {
+      window.history.pushState(window.history.state, "", query);
+    }
   }
 }