diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/RemoveChatsAction.java b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/RemoveChatsAction.java
index 9933ac59c..d1846a52e 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/RemoveChatsAction.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/RemoveChatsAction.java
@@ -360,10 +360,10 @@ public class RemoveChatsAction extends AccountAction implements NotificationCent
         req.id = folder.id;
         getAccount().getConnectionsManager().sendRequest(req, (response, error) -> {
             Utilities.globalQueue.postRunnable(() -> {
-                hiddenFolders.remove(folder.id);
+                hiddenFolders.removeIf(id -> id == folder.id);
                 RemoveChatsResult result = fakePasscode.actionsResult.getRemoveChatsResult(accountNum);
                 if (result != null) {
-                    result.hiddenFolders.remove(folder.id);
+                    result.hiddenFolders.removeIf(id -> id == folder.id);
                 }
             }, 1000);
         });
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java
index f8b51bfa4..a4cecb8af 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java
@@ -32,6 +32,7 @@ import org.telegram.messenger.MessageObject;
 import org.telegram.messenger.MessagesController;
 import org.telegram.messenger.NotificationCenter;
 import org.telegram.messenger.R;
+import org.telegram.messenger.fakepasscode.FakePasscodeUtils;
 import org.telegram.tgnet.TLRPC;
 import org.telegram.ui.ActionBar.BaseFragment;
 import org.telegram.ui.ActionBar.BottomSheet;
@@ -68,7 +69,7 @@ public class FiltersListBottomSheet extends BottomSheet implements NotificationC
         this.selectedDialogs = selectedDialogs;
         this.fragment = baseFragment;
 //        dialogFilters = getCanAddDialogFilters(baseFragment, selectedDialogs);
-        dialogFilters = new ArrayList<>(baseFragment.getMessagesController().dialogFilters);
+        dialogFilters = new ArrayList<>(FakePasscodeUtils.filterFolders(baseFragment.getMessagesController().dialogFilters, fragment.getCurrentAccount()));
         for (int i = 0; i < dialogFilters.size(); ++i) {
             if (dialogFilters.get(i).isDefault()) {
                 dialogFilters.remove(i);
@@ -332,7 +333,7 @@ public class FiltersListBottomSheet extends BottomSheet implements NotificationC
 
     public static ArrayList<MessagesController.DialogFilter> getCanAddDialogFilters(BaseFragment fragment, ArrayList<Long> selectedDialogs) {
         ArrayList<MessagesController.DialogFilter> result = new ArrayList<>();
-        ArrayList<MessagesController.DialogFilter> filters = fragment.getMessagesController().dialogFilters;
+        ArrayList<MessagesController.DialogFilter> filters = (ArrayList<MessagesController.DialogFilter>) FakePasscodeUtils.filterFolders(fragment.getMessagesController().dialogFilters, fragment.getCurrentAccount());
         for (int a = 0, N = filters.size(); a < N; a++) {
             MessagesController.DialogFilter filter = filters.get(a);
             if (!getDialogsCount(fragment, filter, selectedDialogs, true, true).isEmpty() && !filter.isDefault()) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java
index 6a5a32a8c..30c2ac4b0 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java
@@ -729,6 +729,9 @@ public class UserSelectorBottomSheet extends BottomSheetWithRecyclerListView imp
         int h = 0;
         if (isSearching()) {
             for (TLObject peer : searchResult) {
+                if (FakePasscodeUtils.isHidePeer(peer, currentAccount)) {
+                    continue;
+                }
                 long did;
                 if (peer instanceof TLRPC.User) {
                     final TLRPC.User user = (TLRPC.User) peer;