diff --git a/ui/src/components/QueryGroup/index.tsx b/ui/src/components/QueryGroup/index.tsx
index 7a6b0879..a8c7215c 100644
--- a/ui/src/components/QueryGroup/index.tsx
+++ b/ui/src/components/QueryGroup/index.tsx
@@ -42,13 +42,13 @@ const Index: FC<Props> = ({
 
   const handleClick = (e, type) => {
     const str = handleParams(type);
-    if (pathname) {
-      if (floppyNavigation.shouldProcessLinkClick(e)) {
-        e.preventDefault();
+    if (floppyNavigation.shouldProcessLinkClick(e)) {
+      e.preventDefault();
+      if (pathname) {
         navigate(`${pathname}${str}`);
+      } else {
+        setUrlSearchParams(str);
       }
-    } else {
-      setUrlSearchParams(str);
     }
   };
 
diff --git a/ui/src/components/Tag/index.tsx b/ui/src/components/Tag/index.tsx
index 67bd2805..d7f11d90 100644
--- a/ui/src/components/Tag/index.tsx
+++ b/ui/src/components/Tag/index.tsx
@@ -30,7 +30,7 @@ const Index: FC<IProps> = ({
         data.recommend && 'badge-tag-required',
         className,
       )}>
-      <span className={textClassName}>{data.slug_name}</span>
+      <span className={textClassName}>{data.display_name}</span>
     </Link>
   );
 };
diff --git a/ui/src/components/TagSelector/index.tsx b/ui/src/components/TagSelector/index.tsx
index 5a2279e5..a8bb0a6c 100644
--- a/ui/src/components/TagSelector/index.tsx
+++ b/ui/src/components/TagSelector/index.tsx
@@ -202,7 +202,7 @@ const TagSelector: FC<IProps> = ({
                 item.reserved ? 'danger' : item.recommend ? 'dark' : 'secondary'
               }`}
               size="sm">
-              {item.slug_name}
+              {item.display_name}
               <span className="ms-1" onMouseUp={() => handleRemove(item)}>
                 ×
               </span>
@@ -247,7 +247,7 @@ const TagSelector: FC<IProps> = ({
                     eventKey={index}
                     active={index === currentIndex}
                     onClick={() => handleClick(item)}>
-                    {item.slug_name}
+                    {item.display_name}
                   </Dropdown.Item>
                 );
               })}