diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 19493e31..b67fe1dd 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.*;
+import de.steamwar.bungeecore.tablist.TablistManager;
 import de.steamwar.sql.*;
 import de.steamwar.bungeecore.util.BauLock;
 import de.steamwar.bungeecore.util.Chat19;
@@ -32,9 +33,7 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 public class TpCommand extends SWCommand {
 
@@ -65,7 +64,7 @@ public class TpCommand extends SWCommand {
     }
 
     @Mapper("to")
-    @Cached(cacheDuration = 10, global = true)
+    @Cached(cacheDuration = 10)
     public TypeMapper<String> tabCompleter() {
         return new TypeMapper<String>() {
             @Override
@@ -86,6 +85,11 @@ public class TpCommand extends SWCommand {
                         list.add(team.getTeamKuerzel());
                     });
                 }
+                if (Storage.teamServers.containsValue(((ProxiedPlayer) sender).getServer().getInfo())) {
+                    Storage.directTabItems.getOrDefault((ProxiedPlayer) sender, Collections.emptyMap()).forEach((uuid, item) -> {
+                        list.add(item.getUsername());
+                    });
+                }
                 return list;
             }
         };
diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/bungeecore/tablist/Tablist.java
index a9a088f3..4ac0208a 100644
--- a/src/de/steamwar/bungeecore/tablist/Tablist.java
+++ b/src/de/steamwar/bungeecore/tablist/Tablist.java
@@ -218,7 +218,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                                 item.setDisplayName(new TextComponent());
                                 item.setListed(false);
                             } else if (item.getDisplayName() == null) {
-                                item.setDisplayName(new TextComponent(item.getUsername()));
+                                item.setDisplayName(TextComponent.fromLegacy("§7" + item.getUsername()));
                             }
                             item.setPublicKey(null);
                             if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
@@ -273,7 +273,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                                     item.setDisplayName(new TextComponent());
                                     item.setListed(false);
                                 } else if (item.getDisplayName() == null) {
-                                    item.setDisplayName(new TextComponent(item.getUsername()));
+                                    item.setDisplayName(TextComponent.fromLegacy("§7" + item.getUsername()));
                                 }
                                 item.setPublicKey(null);
                                 if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)