diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png
index 96b914c2f..d81374721 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png
index 7fbbd5150..bcbf4367f 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png
index 4d6d4fb7e..d9546b0d3 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
index 35b8601cc..d012724ae 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png
index f5d89df50..e0ffd028c 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png
index 2ac84b336..01bccea18 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png
index d1087e05f..c0ae30a53 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png
index 1a07d89db..200a24360 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png
index 5055e9ee6..1c105efb7 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png
index 2538d8c07..46616b5b3 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
index 454add18d..ab60f2da7 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png
index ae5b4d64d..79bb1b5d4 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png
index c3a5b7494..43ccb6519 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png
index 8f1ade80d..5cc16c78c 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png
index ba13aef72..e7d9c79a8 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png
index 9b0ceea46..22995cc8b 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png
index 228c75d28..10d7a0f30 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png
index 12f6eedf9..225d63339 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png
index c6dec19f6..d3e1e1e4f 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png
index 156f7e381..9967eb3b9 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png
index 7e8161742..916100a35 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png
index 9f2b122bc..71013945e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png differ
diff --git a/src/libs/routing/utils.ts b/src/libs/routing/utils.ts
index 5a29b5796..adb85d454 100644
--- a/src/libs/routing/utils.ts
+++ b/src/libs/routing/utils.ts
@@ -50,34 +50,44 @@ export const parseSearchWith = (parser: (str: string) => any) => {
 
     let query: Record<string, unknown> = decode(searchStr);
 
-    const skipParsing = (key: string) => {
-      if (key === 'settings') return true;
-      if (key === 'type') return true;
-      if (key === 'anchor') return true;
-      if (key === 'direction') return true;
-      if (key === 'buySettings') return true;
-      if (key === 'sellSettings') return true;
-      return false;
+    const keysToSkipParse = [
+      'settings',
+      'type',
+      'anchor',
+      'direction',
+      'buySettings',
+      'sellSettings',
+      'editType',
+      'action',
+      'buyAction',
+      'sellAction',
+      'chartType',
+    ];
+
+    const skipParsing = (key: string) => keysToSkipParse.includes(key);
+
+    const formatNumberParam = (value: string): string => {
+      const number = /^\d*\.*\d*$/;
+      if (value.match(number)) return `"${formatNumber(value)}"`;
+      return value;
     };
 
     // Try to parse any query params that might be json
     for (let key in query) {
-      if (!query[key]) continue;
       if (
+        !query[key] ||
         isAddress(String(query[key])) ||
         isDate(String(query[key])) ||
         skipParsing(key)
-      ) {
-        // eslint-disable-next-line
-        query[key] = query[key];
-      } else {
-        const value = query[key];
-        if (typeof value === 'string') {
-          try {
-            query[key] = parser(value);
-          } catch (err) {
-            console.error(`Error parsing param for key ${key}: `, err);
-          }
+      )
+        continue;
+
+      const value = query[key];
+      if (typeof value === 'string') {
+        try {
+          query[key] = parser(formatNumberParam(value));
+        } catch (err) {
+          //
         }
       }
     }