diff --git a/src/main/java/carpet/commands/SpawnCommand.java b/src/main/java/carpet/commands/SpawnCommand.java
index 3fc58929..03aeb4b6 100644
--- a/src/main/java/carpet/commands/SpawnCommand.java
+++ b/src/main/java/carpet/commands/SpawnCommand.java
@@ -155,12 +155,12 @@ public class SpawnCommand
 
     private static int recentSpawnsForType(ServerCommandSource source, String mob_type)
     {
-        if (!Arrays.asList(Arrays.stream(EntityCategory.values()).map(Enum::toString)).contains(mob_type))
+        if (!Arrays.stream(EntityCategory.values()).map(EntityCategory::getName).collect(Collectors.toSet()).contains(mob_type))
         {
-            Messenger.m(source, "r Wrong mob type: "+mob_type+" should be "+String.join(", ",Arrays.stream(EntityCategory.values()).map(Enum::toString).collect(Collectors.toSet())) );
+            Messenger.m(source, "r Wrong mob type: "+mob_type+" should be "+ Arrays.stream(EntityCategory.values()).map(EntityCategory::getName).collect(Collectors.joining(", ")));
             return 0;
         }
-        //Messenger.send(source, SpawnReporter.recent_spawns(source.getWorld(), mob_type));
+        Messenger.send(source, SpawnReporter.recent_spawns(source.getWorld(), EntityCategory.valueOf(mob_type.toUpperCase())));
         return 1;
     }
 
diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java
index 986ed343..f4b9a862 100644
--- a/src/main/java/carpet/utils/SpawnReporter.java
+++ b/src/main/java/carpet/utils/SpawnReporter.java
@@ -159,7 +159,9 @@ public class SpawnReporter
         lst.add(Messenger.s(String.format("Recent %s spawns:",type_code)));
         for (Pair<EntityType, BlockPos> pair : spawned_mobs.get(Pair.of(world.getDimension().getType(),creature_type)).keySet())
         {
-            lst.add( Messenger.c(String.format("w  - %s ",pair.getLeft()), Messenger.tp("wb",pair.getRight())));
+            lst.add( Messenger.c(
+                    String.format("w  - %s ", Registry.ENTITY_TYPE.getId(pair.getLeft()).toString().replaceFirst("minecraft.","")),
+                    Messenger.tp("wb",pair.getRight())));
         }
         
         if (lst.size()==1)
@@ -272,7 +274,7 @@ public class SpawnReporter
             if (!(entity instanceof MobEntity) || !((MobEntity)entity).isPersistent())
             {
                 lst.add(Messenger.c("w  - ",
-                        Messenger.tp("w", entity.x, entity.y, entity.z),"w  : "+EntityType.getId(entity.getType())));
+                        Messenger.tp("w", entity.x, entity.y, entity.z),"w  : "+EntityType.getId(entity.getType()).toString().replaceFirst("minecraft.","")));
             }
         }
         if (lst.size()==1)