From 86792af2141787630bb6d44102da6cafedf9ce40 Mon Sep 17 00:00:00 2001
From: Florian Zevedei <florian.dahn@fdsoftware.de>
Date: Tue, 30 Jan 2024 18:27:48 +0100
Subject: [PATCH] Fixing incorrect behaviour with tags

---
 TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs b/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
index 666382b..1d19519 100644
--- a/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
+++ b/TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
@@ -927,8 +927,7 @@ public class TaggedButtonGrid : MultiView
     {
         Message m = null;
 
-        var form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
-                                        EnableSearch ? SearchQuery : null);
+        ButtonForm form = null;
 
         //if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
         //{
@@ -941,7 +940,16 @@ public class TaggedButtonGrid : MultiView
 
         if (Tags != null && SelectedTags != null)
         {
+            form = DataSource.PickAllItems(EnableSearch ? SearchQuery : null); //CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
+
             form = form.TagDuplicate(SelectedTags);
+
+            form = new ButtonForm(form.ToRowList().Skip(CurrentPageIndex * ItemRowsPerPage).Take(ItemRowsPerPage));
+        }
+        else
+        {
+            form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
+                                        EnableSearch ? SearchQuery : null);
         }
 
         if (EnablePaging)