diff --git a/build.gradle.kts b/build.gradle.kts
index f9159a5..12c2b48 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 allprojects {
-    version = "2.0.7-pre1"
+    version = "2.0.7-pre2"
     group = "us.ajg0702"
 
     plugins.apply("java")
diff --git a/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java b/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java
index b2e0718..e8ffc3d 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/BaseCommand.java
@@ -7,7 +7,9 @@ import us.ajg0702.queue.api.commands.ICommandSender;
 import us.ajg0702.queue.api.commands.ISubCommand;
 import us.ajg0702.utils.common.Messages;
 
+import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 public class BaseCommand implements IBaseCommand {
     @Override
@@ -64,4 +66,9 @@ public class BaseCommand implements IBaseCommand {
     public List<String> autoComplete(ICommandSender sender, String[] args) {
         return null;
     }
+
+    public List<String> filterCompletion(List<String> in, String current) {
+        in.removeIf(t -> !t.toLowerCase(Locale.ROOT).contains(current.toLowerCase(Locale.ROOT)));
+        return in;
+    }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java
index 474aeb1..baf1071 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java
@@ -75,7 +75,7 @@ public class QueueCommand extends BaseCommand {
             return new ArrayList<>();
         }
         if(args.length == 1) {
-            return main.getQueueManager().getServerNames();
+            return filterCompletion(main.getQueueManager().getServerNames(), args[0]);
         }
         return new ArrayList<>();
     }