diff --git a/patches/server/Improve-tag-parser-handling.patch b/patches/server/Improve-tag-parser-handling.patch
index fb61a00c31..377906a532 100644
--- a/patches/server/Improve-tag-parser-handling.patch
+++ b/patches/server/Improve-tag-parser-handling.patch
@@ -53,6 +53,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        super(EXCEPTION_TYPE, Component.literal(message));
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/commands/arguments/selector/SelectorPattern.java b/src/main/java/net/minecraft/commands/arguments/selector/SelectorPattern.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/commands/arguments/selector/SelectorPattern.java
++++ b/src/main/java/net/minecraft/commands/arguments/selector/SelectorPattern.java
+@@ -0,0 +0,0 @@ public record SelectorPattern(String pattern, EntitySelector resolved) {
+             EntitySelectorParser entitySelectorParser = new EntitySelectorParser(new StringReader(selector), true);
+             return DataResult.success(new SelectorPattern(selector, entitySelectorParser.parse()));
+         } catch (CommandSyntaxException var2) {
+-            return DataResult.error(() -> "Invalid selector component: " + selector + ": " + var2.getMessage());
++            return DataResult.error(() -> "Invalid selector component"); // Paper - limit selector error message
+         }
+     }
+ 
 diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/nbt/TagParser.java
diff --git a/patches/server/Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/Properly-track-the-changed-item-from-dispense-events.patch
index 53ebbbfd7f..7ff4ec03f3 100644
--- a/patches/server/Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/Properly-track-the-changed-item-from-dispense-events.patch
@@ -80,7 +80,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
 -        Projectile iprojectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, stack, enumdirection), worldserver, stack, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
-+        Projectile iprojectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, CraftItemStack.unwrap(event.getItem()), enumdirection), worldserver, stack, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // Paper - mtrack changed items in the dispense event; unwrap is safe here because all uses of the stack make their own copies
++        Projectile iprojectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, CraftItemStack.unwrap(event.getItem()), enumdirection), worldserver, stack, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // Paper - track changed items in the dispense event; unwrap is safe here because all uses of the stack make their own copies
          ((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(pointer.blockEntity());
          // itemstack.shrink(1); // CraftBukkit - Handled during event processing
          // CraftBukkit end
diff --git a/patches/server/improve-checking-handled-tags-in-itemmeta.patch b/patches/server/improve-checking-handled-tags-in-itemmeta.patch
index 3785c09af6..ab7a975885 100644
--- a/patches/server/improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/improve-checking-handled-tags-in-itemmeta.patch
@@ -565,7 +565,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        CraftMetaItem.ITEM_NAME.TYPE,
 +        CraftMetaItem.LORE.TYPE,
 +        CraftMetaItem.CUSTOM_MODEL_DATA.TYPE,
-+        CraftMetaItem.CUSTOM_MODEL_DATA.TYPE,
++        CraftMetaItem.ENCHANTABLE.TYPE,
 +        CraftMetaItem.BLOCK_DATA.TYPE,
 +        CraftMetaItem.REPAIR.TYPE,
 +        CraftMetaItem.ENCHANTMENTS.TYPE,
@@ -577,13 +577,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        CraftMetaItem.ENCHANTMENT_GLINT_OVERRIDE.TYPE,
 +        CraftMetaItem.GLIDER.TYPE,
 +        CraftMetaItem.DAMAGE_RESISTANT.TYPE,
-+        CraftMetaItem.ENCHANTABLE.TYPE,
 +        CraftMetaItem.MAX_STACK_SIZE.TYPE,
 +        CraftMetaItem.RARITY.TYPE,
 +        CraftMetaItem.USE_REMAINDER.TYPE,
 +        CraftMetaItem.USE_COOLDOWN.TYPE,
 +        CraftMetaItem.FOOD.TYPE,
 +        CraftMetaItem.TOOL.TYPE,
++        CraftMetaItem.EQUIPPABLE.TYPE,
 +        CraftMetaItem.JUKEBOX_PLAYABLE.TYPE,
 +        CraftMetaItem.DAMAGE.TYPE,
 +        CraftMetaItem.MAX_DAMAGE.TYPE,