diff --git a/pom.xml b/pom.xml
index a9d6321..94dc219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,13 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.19-R0.1-SNAPSHOT</version>
+			<version>1.21.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.2</version>
+			<version>2.11.6</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/src/ParseOtherExpansion.java b/src/ParseOtherExpansion.java
index 509b275..5717267 100644
--- a/src/ParseOtherExpansion.java
+++ b/src/ParseOtherExpansion.java
@@ -27,56 +27,51 @@ public String getVersion() {
   @SuppressWarnings("deprecation")
   @Override
   public String onRequest(OfflinePlayer p, String s) {
-    
-    boolean unsafe = false;
-    if (s.startsWith("unsafe_")) {
-      s = s.substring(7);
-      unsafe = true;
-    }
-    
-    String[] strings = s.split("(?<!\\\\)\\}_", 2);
-    strings[0] = strings[0].substring(1);
-    strings[0] = strings[0].replaceAll("\\\\}_", "}_");
-    strings[1] = strings[1].substring(1, strings[1].length() - 1);
-    OfflinePlayer player;
-    if (unsafe) {
-      String user = PlaceholderAPI.setPlaceholders(p, ("%" + strings[0] + "%"));
-      if (user.contains("%")) {
-        try {
-          UUID id = UUID.fromString(strings[0]);
-          player = Bukkit.getOfflinePlayer(id);
-          if (player.getName() == null)
-            player = Bukkit.getOfflinePlayer(strings[0]);
-        } catch (IllegalArgumentException e) {
-          player = Bukkit.getOfflinePlayer(strings[0]);
-        }
-      } else {
-        try {
-          UUID id = UUID.fromString(user);
-          player = Bukkit.getOfflinePlayer(id);
-          if (player.getName() == null)
-            player = Bukkit.getOfflinePlayer(user);
-        } catch (IllegalArgumentException e) {
-          player = Bukkit.getOfflinePlayer(user);
-        }
+      boolean unsafe = false;
+      if (s.startsWith("unsafe_")) {
+          s = s.substring(7);
+          unsafe = true;
       }
-    } else {
-      String user = strings[0];
+
+      String[] strings = s.split("(?<!\\\\)\\}_", 2);
+      strings[0] = strings[0].substring(1);
+      strings[0] = strings[0].replaceAll("\\\\}_", "}_");
+      strings[1] = strings[1].substring(1, strings[1].length() - 1);
+
+      OfflinePlayer target = null;
+      String input = strings[0];
+
+      if (unsafe) {
+          String resolved = PlaceholderAPI.setPlaceholders(p, "%" + input + "%");
+          input = (resolved == null || resolved.contains("%") || resolved.isEmpty()) ? input : resolved;
+      }
+
+      // Intentar como UUID primero
       try {
-        UUID id = UUID.fromString(user);
-        player = Bukkit.getOfflinePlayer(id);
-        if (player.getName() == null)
-          player = Bukkit.getOfflinePlayer(user);
+          UUID id = UUID.fromString(input);
+          OfflinePlayer found = Bukkit.getOfflinePlayer(id);
+          if (found.hasPlayedBefore()) {
+              target = found;
+          }
       } catch (IllegalArgumentException e) {
-        player = Bukkit.getOfflinePlayer(user);
+          for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
+              if (op.getName() != null && op.getName().equalsIgnoreCase(input)) {
+                  target = op;
+                  break;
+              }
+          }
+      }
+      if (target == null || !target.hasPlayedBefore()) {
+          return "";
       }
-    }
-    String placeholder = PlaceholderAPI.setPlaceholders(player, ("%" + strings[1] + "%"));
-    if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
-      placeholder = strings[1];
-    }
-    
-    return PlaceholderAPI.setPlaceholders(player, placeholder);
+
+      String placeholder = PlaceholderAPI.setPlaceholders(target, "%" + strings[1] + "%");
+      if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
+          return "";
+      }
+
+      return placeholder;
   }
-  
+
+
 }