diff --git a/data/XML/quests.xml b/data/XML/quests.xml
index a649ae8..666d3f8 100644
--- a/data/XML/quests.xml
+++ b/data/XML/quests.xml
@@ -471,18 +471,18 @@
 			<missionstate id="4" description="Go to Morgan and tell him this codeword: 'firebird' to get the outfit addon!" />
 			<missionstate id="5" description="You got the Outfit Addon!" />
 		</mission>
-		<mission name="Oriental Addon: Hipwear" storageid="50137" startvalue="1" endvalue="2">
+		<!-- /\ -->
+		<mission name="Oriental Addon: Hipwear" storageid="17555" startvalue="1" endvalue="2">
 			<missionstate id="1" description="Your current task is to find a mermaid's comb. If you have ever encountered a mermaid, you should ask her. Bring the comb to Habdel if you are male or to Ishina if you are female." />
 			<missionstate id="2" description="You have received the first oriental addon." />
 		</mission>
-		<mission name="Oriental Addon: Headgear" storageid="50138" startvalue="1" endvalue="5">
+		<mission name="Oriental Addon: Headgear" storageid="17557" startvalue="1" endvalue="5">
 			<missionstate id="1" description="Your current task is to bring 100 pieces of ape fur to Razan if you are male, or to Miraia if you are female." />
 			<missionstate id="2" description="Your current task is to bring 100 fish fins to Razan if you are male, or to Miraia if you are female." />
 			<missionstate id="3" description="Your current task is to bring 2 enchanted chicken wings to Razan if you are male, or to Miraia if you are female." />
 			<missionstate id="4" description="Your current task is to bring 100 pieces of blue cloth to Razan if you are male, or to Miraia if you are female." />
 			<missionstate id="5" description="You have received the second oriental addon." />
 		</mission>
-		<!-- /\ -->
 		<mission name="Shaman Addon: Staff" storageid="17570" startvalue="2" endvalue="3" ignoreendvalue="true">
 			<missionstate id="2" description="Try to find a monster which sometimes lurks in the Tiquandian jungle as the revenge of the jungle against mankind. Bring the rare root it carries to Chondur as well as 5 voodoo dolls." />
 			<missionstate id="3" description="You have received the first shaman addon." />
diff --git a/data/npc/habdel.npc b/data/npc/habdel.npc
index 984247e..be874ee 100644
--- a/data/npc/habdel.npc
+++ b/data/npc/habdel.npc
@@ -117,7 +117,7 @@ Topic=2                                   -> "Maybe next time."
 Topic=3,"yes" -> "Listen, um... I know that Ishina has been wanting a comb for a long time... not just any comb, but a mermaid's comb. She said it prevents split ends... or something. ...",
 				"Do you think you could get one for me so I can give it to her? I really would appreciate it.", Topic=4
 Topic=3 -> "Maybe another time."
-Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1)
+Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1), SetQuestValue(17594,1)
 Topic=4 -> "Maybe another time."
 
 "comb",QuestValue(17555)=1,male -> Type=5945, Amount=1, "Have you brought a mermaid's comb for Ishina?", Topic=5
diff --git a/data/npc/ishina.npc b/data/npc/ishina.npc
index 71747e2..2f254c1 100644
--- a/data/npc/ishina.npc
+++ b/data/npc/ishina.npc
@@ -90,7 +90,7 @@ Topic=2                                   -> "Maybe next time."
 Topic=3,"yes" -> "Listen, um... I was wanting a comb for a long time... not just any comb, but a mermaid's comb. ...",
 				"Do you think you could get one for me? I really would appreciate it.", Topic=4
 Topic=3 -> "Hmm, but next time."
-Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1)
+Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1), SetQuestValue(17594,1)
 Topic=4 -> "Hmm, but next time."
 
 "comb",QuestValue(17555)=1,female -> Type=5945, Amount=1, "Have you brought a mermaid's comb?", Topic=5
diff --git a/data/npc/miraia.npc b/data/npc/miraia.npc
index 257776e..b1b0893 100644
--- a/data/npc/miraia.npc
+++ b/data/npc/miraia.npc
@@ -78,7 +78,7 @@ Topic=5,"yes" -> "Alright, then listen to the following requirements. We are cur
 				"Last but not least, just drop by with 100 pieces of blue cloth and I will happily show you how to create this veil. ...",
 				"Did you understand everything I told you and are willing to handle this task?", Topic=6
 Topic=5 -> "Maybe next time."
-Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 pieces of ape fur.", SetQuestValue(17557,1)
+Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 pieces of ape fur.", SetQuestValue(17557,1), SetQuestValue(17594,1)
 Topic=6 -> "Maybe next time."
 
 "ape","fur",QuestValue(17557)=1,female -> Type=5883, Amount=100, "Have you really managed to fulfil the task and brought me 100 pieces of ape fur?", Topic=7
diff --git a/data/npc/razan.npc b/data/npc/razan.npc
index 7b71a78..2931d88 100644
--- a/data/npc/razan.npc
+++ b/data/npc/razan.npc
@@ -130,7 +130,7 @@ Topic=5,"yes" -> "Alright, then listen to the following requirements. We are cur
 				"Last but not least, just drop by with 100 pieces of blue cloth and I will happily show you how to make a turban. ...",
 				"Did you understand everything I told you and are willing to handle this task?", Topic=6
 Topic=5 -> "Maybe next time."
-Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 pieces of ape fur.", SetQuestValue(17557,1)
+Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 pieces of ape fur.", SetQuestValue(17557,1), SetQuestValue(17594,1)
 Topic=6 -> "Maybe next time."
 
 "ape","fur",QuestValue(17557)=1,male -> Type=5883, Amount=100, "Have you really managed to fulfil the task and brought me 100 pieces of ape fur?", Topic=7