diff --git a/ui/pages/Chart.tsx b/ui/pages/Chart.tsx
index fc5ed7b9b1..684db47170 100644
--- a/ui/pages/Chart.tsx
+++ b/ui/pages/Chart.tsx
@@ -110,7 +110,10 @@ const Chart = () => {
     router.push({
       pathname: router.pathname,
       query: { ...router.query, resolution },
-    });
+    },
+    undefined,
+    { shallow: true },
+    );
   }, [ setResolution, router ]);
 
   const handleReset = React.useCallback(() => {
diff --git a/ui/shared/EntityTags/utils.ts b/ui/shared/EntityTags/utils.ts
index 4454d87872..8951d3b729 100644
--- a/ui/shared/EntityTags/utils.ts
+++ b/ui/shared/EntityTags/utils.ts
@@ -1,6 +1,6 @@
 import type { EntityTag } from './types';
 
-import { route } from 'nextjs-routes';
+// import { route } from 'nextjs-routes';
 
 export function getTagLinkParams(data: EntityTag): { type: 'external' | 'internal'; href: string } | undefined {
   if (data.meta?.warpcastHandle) {
@@ -17,10 +17,10 @@ export function getTagLinkParams(data: EntityTag): { type: 'external' | 'interna
     };
   }
 
-  if (data.tagType === 'generic' || data.tagType === 'protocol') {
-    return {
-      type: 'internal',
-      href: route({ pathname: '/accounts/label/[slug]', query: { slug: data.slug, tagType: data.tagType, tagName: data.name } }),
-    };
-  }
+  // if (data.tagType === 'generic' || data.tagType === 'protocol') {
+  //   return {
+  //     type: 'internal',
+  //     href: route({ pathname: '/accounts/label/[slug]', query: { slug: data.slug, tagType: data.tagType, tagName: data.name } }),
+  //   };
+  // }
 }
diff --git a/ui/snippets/searchBar/SearchBar.tsx b/ui/snippets/searchBar/SearchBar.tsx
index 51bbdce9a8..98ea690ffa 100644
--- a/ui/snippets/searchBar/SearchBar.tsx
+++ b/ui/snippets/searchBar/SearchBar.tsx
@@ -106,7 +106,7 @@ const SearchBar = ({ isHomepage }: Props) => {
   React.useEffect(() => {
     handleSearchTermChange('');
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ router.pathname ]);
+  }, [ router.asPath?.split('?')?.[0] ]);
 
   React.useEffect(() => {
     const inputEl = inputRef.current;