diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java
index 803b2f1..eaf7952 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java
@@ -6,7 +6,7 @@ import us.ajg0702.queue.commands.BaseCommand;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class SlashServerCommand extends BaseCommand {
@@ -60,6 +60,6 @@ public class SlashServerCommand extends BaseCommand {
 
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/leavequeue/LeaveCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/leavequeue/LeaveCommand.java
index 336a621..00909e6 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/leavequeue/LeaveCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/leavequeue/LeaveCommand.java
@@ -11,6 +11,7 @@ import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class LeaveCommand extends BaseCommand {
@@ -105,11 +106,12 @@ public class LeaveCommand extends BaseCommand {
 
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
+        if(args.length > 1) return Collections.emptyList();
         List<QueuePlayer> servers = main.getQueueManager().findPlayerInQueues(main.getPlatformMethods().senderToPlayer(sender));
         List<String> serverNames = new ArrayList<>();
         for(QueuePlayer queuePlayer : servers) {
             serverNames.add(queuePlayer.getQueueServer().getName());
         }
-        return serverNames;
+        return filterCompletion(serverNames, args[0]);
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java
index 2e9ff6c..814006c 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/listqueues/ListCommand.java
@@ -10,7 +10,7 @@ import us.ajg0702.queue.commands.BaseCommand;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ListCommand extends BaseCommand {
@@ -79,6 +79,6 @@ public class ListCommand extends BaseCommand {
 
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
index e0d5197..450a9fe 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java
@@ -81,10 +81,10 @@ public class Kick extends SubCommand {
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
         if(args.length == 1) {
-            return main.getPlatformMethods().getPlayerNames(false);
+            return filterCompletion(main.getPlatformMethods().getPlayerNames(false), args[0]);
         }
         if(args.length == 2) {
-            return main.getQueueManager().getServerNames();
+            return filterCompletion(main.getQueueManager().getServerNames(), args[1]);
         }
         return new ArrayList<>();
     }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
index 57ff453..2dbeaa9 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
@@ -9,6 +9,7 @@ import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class KickAll extends SubCommand {
@@ -65,9 +66,9 @@ public class KickAll extends SubCommand {
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
         if(args.length == 1) {
-            return main.getQueueManager().getServerNames();
+            return filterCompletion(main.getQueueManager().getServerNames(), args[0]);
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
 
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java
index b32e67a..d26fee2 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/ManageCommand.java
@@ -104,6 +104,6 @@ public class ManageCommand extends BaseCommand {
             commands.add(subCommand.getName());
             commands.addAll(subCommand.getAliases());
         }
-        return commands;
+        return filterCompletion(commands, args[0]);
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java
index 92205b7..bbe4121 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Pause.java
@@ -77,11 +77,11 @@ public class Pause extends SubCommand {
         if(args.length == 1) {
             List<String> servers = new ArrayList<>(main.getQueueManager().getServerNames());
             servers.add("all");
-            return servers;
+            return filterCompletion(servers, args[0]);
         }
         if(args.length == 2) {
-            return Arrays.asList("on", "off", "true", "false");
+            return filterCompletion(Arrays.asList("on", "off", "true", "false"), args[1]);
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/QueueList.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/QueueList.java
index 1aa49e3..fdc4961 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/QueueList.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/QueueList.java
@@ -11,7 +11,7 @@ import us.ajg0702.queue.commands.SubCommand;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -88,6 +88,6 @@ public class QueueList extends SubCommand {
 
     @Override
     public java.util.List<String> autoComplete(ICommandSender sender, String[] args) {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Reload.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Reload.java
index c45b0aa..9e8ac6c 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Reload.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Reload.java
@@ -9,7 +9,7 @@ import us.ajg0702.queue.commands.SubCommand;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class Reload extends SubCommand {
@@ -63,6 +63,6 @@ public class Reload extends SubCommand {
 
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }
diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Send.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Send.java
index 576d3c2..ff14169 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Send.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Send.java
@@ -10,6 +10,7 @@ import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class Send extends SubCommand {
@@ -93,12 +94,12 @@ public class Send extends SubCommand {
         if(args.length == 1) {
             List<String> options = new ArrayList<>(main.getPlatformMethods().getServerNames());
             options.addAll(main.getPlatformMethods().getPlayerNames(false));
-            return options;
+            return filterCompletion(options, args[0]);
         }
         if(args.length == 2) {
-            return main.getQueueManager().getServerNames();
+            return filterCompletion(main.getQueueManager().getServerNames(), args[1]);
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
 
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 0409689..8952bf3 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
@@ -8,10 +8,7 @@ import us.ajg0702.queue.commands.BaseCommand;
 import us.ajg0702.queue.common.QueueMain;
 import us.ajg0702.utils.common.Messages;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class QueueCommand extends BaseCommand {
@@ -92,7 +89,7 @@ public class QueueCommand extends BaseCommand {
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
         if(!main.getConfig().getBoolean("tab-complete-queues")) {
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
         if(args.length == 1) {
             List<String> servers = filterCompletion(main.getQueueManager().getServerNames(), args[0]);
@@ -101,6 +98,6 @@ public class QueueCommand extends BaseCommand {
             }
             return servers;
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 }