diff --git a/client/Messages.cs b/client/Messages.cs
index cfd5ca9..d31c662 100644
--- a/client/Messages.cs
+++ b/client/Messages.cs
@@ -92,7 +92,7 @@ internal class Messages : IDisposable {
             var resp = await ServerHelper.SendRequest(
                 this.Plugin.Config.ApiKey,
                 HttpMethod.Get,
-                $"/messages/{territory}"
+                $"/messages/{territory}?filter=1"
             );
             var json = await resp.Content.ReadAsStringAsync();
             var messages = JsonConvert.DeserializeObject<Message[]>(json)!;
diff --git a/client/PluginUi.cs b/client/PluginUi.cs
index f42b973..312e295 100644
--- a/client/PluginUi.cs
+++ b/client/PluginUi.cs
@@ -35,16 +35,18 @@ public class PluginUi : IDisposable {
 
     private void DrawModals() {
         while (this.ToShow.TryDequeue(out var toShow)) {
-            ImGui.OpenPopup(toShow);
+            ImGui.OpenPopup($"{this.Plugin.Name}##{toShow}");
         }
 
         var toRemove = -1;
         for (var i = 0; i < this.Modals.Count; i++) {
             var (id, text) = this.Modals[i];
-            if (!ImGui.BeginPopupModal($"{this.Plugin.Name}###{id}")) {
+            if (!ImGui.BeginPopupModal($"{this.Plugin.Name}##{id}")) {
                 continue;
             }
 
+            ImGui.PushID(id);
+
             ImGui.TextUnformatted(text);
             ImGui.Separator();
 
@@ -54,6 +56,8 @@ public class PluginUi : IDisposable {
                 toRemove = i;
             }
 
+            ImGui.PopID();
+
             ImGui.EndPopup();
         }