diff --git a/components/neroshitron/tag_selector.tsx b/components/neroshitron/tag_selector.tsx
index 53dbed6..8d234e0 100644
--- a/components/neroshitron/tag_selector.tsx
+++ b/components/neroshitron/tag_selector.tsx
@@ -46,8 +46,14 @@ const TagSelector = forwardRef<TagSelectorProps, {tagsInput:any[], tagSearch: st
         return (
             (tags.length > 0)? (
                 <div className="animate-in flex md:w-full animate-in pt-4 justify-center items-center">
-                    <div className="z-10 grid p-4 grid-cols-2 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-8 gap-1 w-full h-max-72 overflow-y-scroll no-scrollbar pt-4 bg-neroshi-blue-900 rounded-md opacity-90 backdrop-filter backdrop-blur-md mx-auto">
-                        {props.tagsInput.map((tag: any) => (
+                    <div className="z-10 grid p-4 grid-cols-2 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-8 gap-1 w-full max-h-96 overflow-y-scroll pt-4 bg-neroshi-blue-900 rounded-md opacity-90 backdrop-filter backdrop-blur-md mx-auto">
+                    {props.tagsInput.map((tag: any) => (
+                            (tagSearch === '' || tag.name.toLowerCase().includes(tagSearch.toLowerCase())) && // Updated condition
+                            <Tag key={generateRandomString()} tag={tag.name} selected={selectedTags.includes(tag.name)} onTagClicked={(tag) => handleTag(tag)} />
+                        ))}{props.tagsInput.map((tag: any) => (
+                            (tagSearch === '' || tag.name.toLowerCase().includes(tagSearch.toLowerCase())) && // Updated condition
+                            <Tag key={generateRandomString()} tag={tag.name} selected={selectedTags.includes(tag.name)} onTagClicked={(tag) => handleTag(tag)} />
+                        ))}{props.tagsInput.map((tag: any) => (
                             (tagSearch === '' || tag.name.toLowerCase().includes(tagSearch.toLowerCase())) && // Updated condition
                             <Tag key={generateRandomString()} tag={tag.name} selected={selectedTags.includes(tag.name)} onTagClicked={(tag) => handleTag(tag)} />
                         ))}