From 96a44e3171943f97c8308327670357c4cf2d69b2 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Sat, 7 Nov 2020 09:50:15 +0100
Subject: [PATCH] Final fix for search query in all questions

---
 src/pages/allQuestions.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/allQuestions.js b/src/pages/allQuestions.js
index fcbe5ec..a9bcb14 100644
--- a/src/pages/allQuestions.js
+++ b/src/pages/allQuestions.js
@@ -21,16 +21,15 @@ export default function AllQuestions({ router }) {
       })
       .then((data) => {
         setData(data)
+        
+        router.replace(
+          `${router.asPath.replace('.html', '')}`,
+          undefined,
+          { shallow: true }
+        )
+        const querySearch = router.query.q ? decodeURIComponent(router.query.q) : ''
+        setSearchTerm(querySearch)
       })
-    const querySearch = router.query.q ? decodeURIComponent(router.query.q) : ''
-    setSearchTerm(querySearch)
-    router.replace(
-      `${router.pathname.replace('.html', '')}${'?q='}${encodeURIComponent(
-        querySearch
-      )}`,
-      undefined,
-      { shallow: true }
-    )
   }, [])
 
   if (data) {