diff --git a/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs b/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
index 7fac716..c2fec7e 100644
--- a/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
+++ b/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
@@ -277,10 +277,10 @@ public class TaggedButtonGrid : MultiView
 
             var max = DataSource.CalculateMax(EnableSearch ? SearchQuery : null);
 
-            //if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
-            //{
-            //    bf = bf.FilterDuplicate(this.SearchQuery);
-            //}
+            if(SelectedTags.Count < Tags.Count)
+            {
+                max = DataSource.ButtonForm.TagDuplicate(SelectedTags).Count;
+            }
 
             if (max == 0)
             {