diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index c99479ddb1..441fea4330 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -450,8 +450,7 @@ public class RequestEnchantItem implements ClientPacket
 					break;
 				}
 			}
-			player.sendItemList();
-			player.broadcastUserInfo();
+			
 			request.setProcessing(false);
 		}
 	}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
index bc46bff182..581da7ca53 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant;
 
-import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
  */
 public class RequestExRemoveEnchantSupportItem implements ClientPacket
 {
-	@Override
-	public void read(ReadablePacket packet)
-	{
-	}
-	
 	@Override
 	public void run(GameClient client)
 	{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
index 43aa9451c0..840c13b053 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
 			return;
 		}
 		
-		if (player.getRequest(EnchantItemRequest.class) != null)
+		if (player.getRequest(EnchantItemRequest.class) == null)
 		{
-			player.removeRequest(EnchantItemRequest.class);
+			return;
 		}
+		
+		player.removeRequest(EnchantItemRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index 9cb1c62e4c..c141e9726a 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -345,9 +345,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
 			}
 		}
 		
-		for (int i : _failureReward.keySet())
+		for (ItemHolder failure : _failureReward.values())
 		{
-			request.addMultiEnchantFailItems(_failureReward.get(i));
+			request.addMultiEnchantFailItems(failure);
 		}
 		request.setProcessing(false);
 		
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
index 4577ac54dd..fb7a1ad65d 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
 
 /**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
 		
 		final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
 		player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
index ac7ecd8c78..5f3dee3c44 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
@@ -16,11 +16,27 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
 
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 
 /**
- * @author Index
+ * @author Mobius
  */
 public class ExRequestViewEnchantResult implements ClientPacket
 {
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
index 0832cb5ff5..9936652cfc 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 			writeInt(_successEnchant.size());
 			if (_successEnchant.size() != 0)
 			{
-				for (int i : _successEnchant.keySet())
+				for (int[] success : _successEnchant.values())
 				{
-					int[] intArray = _successEnchant.get(i);
-					writeInt(intArray[0]);
-					writeInt(intArray[1]);
+					writeInt(success[0]);
+					writeInt(success[1]);
 				}
 			}
 		}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		writeInt(_failureEnchant.size());
 		if (_failureEnchant.size() != 0)
 		{
-			for (int i : _failureEnchant.keySet())
+			for (int failure : _failureEnchant.values())
 			{
-				writeInt(_failureEnchant.get(i));
+				writeInt(failure);
 				writeInt(0);
 			}
 		}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		{
 			writeInt(request.getMultiFailItemsCount());
 			_failureReward = request.getMultiEnchantFailItems();
-			for (int i : _failureReward.keySet())
+			for (ItemHolder failure : _failureReward.values())
 			{
-				ItemHolder itemHolder = _failureReward.get(i);
-				writeInt(itemHolder.getId());
-				writeInt((int) itemHolder.getCount());
+				writeInt(failure.getId());
+				writeInt((int) failure.getCount());
 			}
 			if (_isResult)
 			{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index c99479ddb1..441fea4330 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -450,8 +450,7 @@ public class RequestEnchantItem implements ClientPacket
 					break;
 				}
 			}
-			player.sendItemList();
-			player.broadcastUserInfo();
+			
 			request.setProcessing(false);
 		}
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
index bc46bff182..581da7ca53 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant;
 
-import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
  */
 public class RequestExRemoveEnchantSupportItem implements ClientPacket
 {
-	@Override
-	public void read(ReadablePacket packet)
-	{
-	}
-	
 	@Override
 	public void run(GameClient client)
 	{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
index 43aa9451c0..840c13b053 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
 			return;
 		}
 		
-		if (player.getRequest(EnchantItemRequest.class) != null)
+		if (player.getRequest(EnchantItemRequest.class) == null)
 		{
-			player.removeRequest(EnchantItemRequest.class);
+			return;
 		}
+		
+		player.removeRequest(EnchantItemRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index 9cb1c62e4c..c141e9726a 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -345,9 +345,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
 			}
 		}
 		
-		for (int i : _failureReward.keySet())
+		for (ItemHolder failure : _failureReward.values())
 		{
-			request.addMultiEnchantFailItems(_failureReward.get(i));
+			request.addMultiEnchantFailItems(failure);
 		}
 		request.setProcessing(false);
 		
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
index 4577ac54dd..fb7a1ad65d 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
 
 /**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
 		
 		final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
 		player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
index ac7ecd8c78..5f3dee3c44 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
@@ -16,11 +16,27 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
 
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 
 /**
- * @author Index
+ * @author Mobius
  */
 public class ExRequestViewEnchantResult implements ClientPacket
 {
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
index 0832cb5ff5..9936652cfc 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 			writeInt(_successEnchant.size());
 			if (_successEnchant.size() != 0)
 			{
-				for (int i : _successEnchant.keySet())
+				for (int[] success : _successEnchant.values())
 				{
-					int[] intArray = _successEnchant.get(i);
-					writeInt(intArray[0]);
-					writeInt(intArray[1]);
+					writeInt(success[0]);
+					writeInt(success[1]);
 				}
 			}
 		}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		writeInt(_failureEnchant.size());
 		if (_failureEnchant.size() != 0)
 		{
-			for (int i : _failureEnchant.keySet())
+			for (int failure : _failureEnchant.values())
 			{
-				writeInt(_failureEnchant.get(i));
+				writeInt(failure);
 				writeInt(0);
 			}
 		}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		{
 			writeInt(request.getMultiFailItemsCount());
 			_failureReward = request.getMultiEnchantFailItems();
-			for (int i : _failureReward.keySet())
+			for (ItemHolder failure : _failureReward.values())
 			{
-				ItemHolder itemHolder = _failureReward.get(i);
-				writeInt(itemHolder.getId());
-				writeInt((int) itemHolder.getCount());
+				writeInt(failure.getId());
+				writeInt((int) failure.getCount());
 			}
 			if (_isResult)
 			{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index a29ba53039..6890f83704 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -456,8 +456,7 @@ public class RequestEnchantItem implements ClientPacket
 					break;
 				}
 			}
-			player.sendItemList();
-			player.broadcastUserInfo();
+			
 			request.setProcessing(false);
 		}
 	}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
index bc46bff182..581da7ca53 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant;
 
-import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
  */
 public class RequestExRemoveEnchantSupportItem implements ClientPacket
 {
-	@Override
-	public void read(ReadablePacket packet)
-	{
-	}
-	
 	@Override
 	public void run(GameClient client)
 	{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
index 43aa9451c0..840c13b053 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
 			return;
 		}
 		
-		if (player.getRequest(EnchantItemRequest.class) != null)
+		if (player.getRequest(EnchantItemRequest.class) == null)
 		{
-			player.removeRequest(EnchantItemRequest.class);
+			return;
 		}
+		
+		player.removeRequest(EnchantItemRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index f776347b42..c638d43273 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -351,9 +351,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
 			}
 		}
 		
-		for (int i : _failureReward.keySet())
+		for (ItemHolder failure : _failureReward.values())
 		{
-			request.addMultiEnchantFailItems(_failureReward.get(i));
+			request.addMultiEnchantFailItems(failure);
 		}
 		request.setProcessing(false);
 		
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
index 4577ac54dd..fb7a1ad65d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
 
 /**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
 		
 		final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
 		player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
index ac7ecd8c78..5f3dee3c44 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
@@ -16,11 +16,27 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
 
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 
 /**
- * @author Index
+ * @author Mobius
  */
 public class ExRequestViewEnchantResult implements ClientPacket
 {
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
index 0832cb5ff5..9936652cfc 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 			writeInt(_successEnchant.size());
 			if (_successEnchant.size() != 0)
 			{
-				for (int i : _successEnchant.keySet())
+				for (int[] success : _successEnchant.values())
 				{
-					int[] intArray = _successEnchant.get(i);
-					writeInt(intArray[0]);
-					writeInt(intArray[1]);
+					writeInt(success[0]);
+					writeInt(success[1]);
 				}
 			}
 		}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		writeInt(_failureEnchant.size());
 		if (_failureEnchant.size() != 0)
 		{
-			for (int i : _failureEnchant.keySet())
+			for (int failure : _failureEnchant.values())
 			{
-				writeInt(_failureEnchant.get(i));
+				writeInt(failure);
 				writeInt(0);
 			}
 		}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		{
 			writeInt(request.getMultiFailItemsCount());
 			_failureReward = request.getMultiEnchantFailItems();
-			for (int i : _failureReward.keySet())
+			for (ItemHolder failure : _failureReward.values())
 			{
-				ItemHolder itemHolder = _failureReward.get(i);
-				writeInt(itemHolder.getId());
-				writeInt((int) itemHolder.getCount());
+				writeInt(failure.getId());
+				writeInt((int) failure.getCount());
 			}
 			if (_isResult)
 			{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
index a29ba53039..6890f83704 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java
@@ -456,8 +456,7 @@ public class RequestEnchantItem implements ClientPacket
 					break;
 				}
 			}
-			player.sendItemList();
-			player.broadcastUserInfo();
+			
 			request.setProcessing(false);
 		}
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
index bc46bff182..581da7ca53 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExRemoveEnchantSupportItem.java
@@ -16,7 +16,6 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant;
 
-import org.l2jmobius.commons.network.ReadablePacket;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.model.item.instance.Item;
@@ -30,11 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnch
  */
 public class RequestExRemoveEnchantSupportItem implements ClientPacket
 {
-	@Override
-	public void read(ReadablePacket packet)
-	{
-	}
-	
 	@Override
 	public void run(GameClient client)
 	{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
index 43aa9451c0..840c13b053 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestFinishMultiEnchantScroll.java
@@ -35,9 +35,11 @@ public class ExRequestFinishMultiEnchantScroll implements ClientPacket
 			return;
 		}
 		
-		if (player.getRequest(EnchantItemRequest.class) != null)
+		if (player.getRequest(EnchantItemRequest.class) == null)
 		{
-			player.removeRequest(EnchantItemRequest.class);
+			return;
 		}
+		
+		player.removeRequest(EnchantItemRequest.class);
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
index f776347b42..c638d43273 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java
@@ -351,9 +351,9 @@ public class ExRequestMultiEnchantItemList implements ClientPacket
 			}
 		}
 		
-		for (int i : _failureReward.keySet())
+		for (ItemHolder failure : _failureReward.values())
 		{
-			request.addMultiEnchantFailItems(_failureReward.get(i));
+			request.addMultiEnchantFailItems(failure);
 		}
 		request.setProcessing(false);
 		
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
index 4577ac54dd..fb7a1ad65d 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestViewMultiEnchantResult.java
@@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.enchant.multi.ExResultMultiEnchantItemList;
 
 /**
@@ -50,5 +51,9 @@ public class ExRequestViewMultiEnchantResult implements ClientPacket
 		
 		final EnchantItemRequest request = player.getRequest(EnchantItemRequest.class);
 		player.sendPacket(new ExResultMultiEnchantItemList(player, request.getMultiSuccessEnchantList(), request.getMultiFailureEnchantList(), true));
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
index ac7ecd8c78..5f3dee3c44 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/single/ExRequestViewEnchantResult.java
@@ -16,11 +16,27 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.enchant.single;
 
+import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
+import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 
 /**
- * @author Index
+ * @author Mobius
  */
 public class ExRequestViewEnchantResult implements ClientPacket
 {
+	@Override
+	public void run(GameClient client)
+	{
+		final Player player = client.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+		player.sendItemList();
+		player.sendPacket(new ShortCutInit(player));
+		player.broadcastUserInfo();
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
index 0832cb5ff5..9936652cfc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/multi/ExResultMultiEnchantItemList.java
@@ -92,11 +92,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 			writeInt(_successEnchant.size());
 			if (_successEnchant.size() != 0)
 			{
-				for (int i : _successEnchant.keySet())
+				for (int[] success : _successEnchant.values())
 				{
-					int[] intArray = _successEnchant.get(i);
-					writeInt(intArray[0]);
-					writeInt(intArray[1]);
+					writeInt(success[0]);
+					writeInt(success[1]);
 				}
 			}
 		}
@@ -109,9 +108,9 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		writeInt(_failureEnchant.size());
 		if (_failureEnchant.size() != 0)
 		{
-			for (int i : _failureEnchant.keySet())
+			for (int failure : _failureEnchant.values())
 			{
-				writeInt(_failureEnchant.get(i));
+				writeInt(failure);
 				writeInt(0);
 			}
 		}
@@ -125,11 +124,10 @@ public class ExResultMultiEnchantItemList extends ServerPacket
 		{
 			writeInt(request.getMultiFailItemsCount());
 			_failureReward = request.getMultiEnchantFailItems();
-			for (int i : _failureReward.keySet())
+			for (ItemHolder failure : _failureReward.values())
 			{
-				ItemHolder itemHolder = _failureReward.get(i);
-				writeInt(itemHolder.getId());
-				writeInt((int) itemHolder.getCount());
+				writeInt(failure.getId());
+				writeInt((int) failure.getCount());
 			}
 			if (_isResult)
 			{