diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index 6ca2be042..985c302cc 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -413,9 +413,9 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote eEmote, const std::string& Title
 
 void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID)
 {
-    WorldPacket data(SMSG_QUESTGIVER_STATUS, 9);
+    WorldPacket data(SMSG_QUESTGIVER_STATUS, 12);
     data << npcGUID;
-    data << uint8(questStatus);
+    data << uint32(questStatus);
 
     GetMenuSession()->SendPacket(&data);
     DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_STATUS for %s", npcGUID.GetString().c_str());
diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index 8bd5085b1..79dcd3eca 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -139,8 +139,8 @@ void InitializeOpcodes()
     //OPCODE(SMSG_PAGE_TEXT_QUERY_RESPONSE,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_QUEST_QUERY,                             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestQueryOpcode          );
     OPCODE(SMSG_QUEST_QUERY_RESPONSE,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_GAMEOBJECT_QUERY,                        STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleGameObjectQueryOpcode     );
-    //OPCODE(SMSG_GAMEOBJECT_QUERY_RESPONSE,               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_GAMEOBJECT_QUERY,                        STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleGameObjectQueryOpcode     );
+    OPCODE(SMSG_GAMEOBJECT_QUERY_RESPONSE,               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_CREATURE_QUERY,                          STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleCreatureQueryOpcode       );
     OPCODE(SMSG_CREATURE_QUERY_RESPONSE,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_WHO,                                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoOpcode                 );
@@ -453,15 +453,15 @@ void InitializeOpcodes()
     //OPCODE(SMSG_PET_MODE,                                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_GOSSIP_HELLO,                            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGossipHelloOpcode         );
     //OPCODE(CMSG_GOSSIP_SELECT_OPTION,                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGossipSelectOptionOpcode  );
-    //OPCODE(SMSG_GOSSIP_MESSAGE,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(SMSG_GOSSIP_COMPLETE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_NPC_TEXT_QUERY,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNpcTextQueryOpcode        );
-    //OPCODE(SMSG_NPC_TEXT_UPDATE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_GOSSIP_MESSAGE,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_GOSSIP_COMPLETE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_NPC_TEXT_QUERY,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNpcTextQueryOpcode        );
+    OPCODE(SMSG_NPC_TEXT_UPDATE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_NPC_WONT_TALK,                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_QUESTGIVER_STATUS_QUERY,                 STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleQuestgiverStatusQueryOpcode);
-    //OPCODE(SMSG_QUESTGIVER_STATUS,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_QUESTGIVER_HELLO,                        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestgiverHelloOpcode     );
-    //OPCODE(SMSG_QUESTGIVER_QUEST_LIST,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_QUESTGIVER_STATUS_QUERY,                 STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleQuestgiverStatusQueryOpcode);
+    OPCODE(SMSG_QUESTGIVER_STATUS,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_QUESTGIVER_HELLO,                        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestgiverHelloOpcode     );
+    OPCODE(SMSG_QUESTGIVER_QUEST_LIST,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_QUESTGIVER_QUERY_QUEST,                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestgiverQueryQuestOpcode);
     //OPCODE(CMSG_QUESTGIVER_QUEST_AUTOLAUNCH,             STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQuestgiverQuestAutoLaunch );
     //OPCODE(SMSG_QUESTGIVER_QUEST_DETAILS,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index f4a1545f3..dec92c9d9 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -133,8 +133,8 @@ enum Opcodes
     SMSG_PAGE_TEXT_QUERY_RESPONSE                         = 0x105C,
     CMSG_QUEST_QUERY                                      = 0x0D06, // 4.3.4 15595
     SMSG_QUEST_QUERY_RESPONSE                             = 0x6936, // 4.3.4 15595
-    CMSG_GAMEOBJECT_QUERY                                 = 0x105F,
-    SMSG_GAMEOBJECT_QUERY_RESPONSE                        = 0x1060,
+    CMSG_GAMEOBJECT_QUERY                                 = 0x4017, // 4.3.4 15595
+    SMSG_GAMEOBJECT_QUERY_RESPONSE                        = 0x0915, // 4.3.4 15595
     CMSG_CREATURE_QUERY                                   = 0x2706, // 4.3.4 15595
     SMSG_CREATURE_QUERY_RESPONSE                          = 0x6024, // 4.3.4 15595
     CMSG_WHO                                              = 0x6C15, // 4.3.4 15595
@@ -438,15 +438,15 @@ enum Opcodes
     SMSG_PET_MODE                                         = 0x117B,
     CMSG_GOSSIP_HELLO                                     = 0x117C,
     CMSG_GOSSIP_SELECT_OPTION                             = 0x117D,
-    SMSG_GOSSIP_MESSAGE                                   = 0x117E,
-    SMSG_GOSSIP_COMPLETE                                  = 0x117F,
-    CMSG_NPC_TEXT_QUERY                                   = 0x1180,
-    SMSG_NPC_TEXT_UPDATE                                  = 0x1181,
+    SMSG_GOSSIP_MESSAGE                                   = 0x2035, // 4.3.4 15595
+    SMSG_GOSSIP_COMPLETE                                  = 0x0806, // 4.3.4 15595
+    CMSG_NPC_TEXT_QUERY                                   = 0x4E24, // 4.3.4 15595
+    SMSG_NPC_TEXT_UPDATE                                  = 0x4436, // 4.3.4 15595
     SMSG_NPC_WONT_TALK                                    = 0x1182,
-    CMSG_QUESTGIVER_STATUS_QUERY                          = 0x1183,
-    SMSG_QUESTGIVER_STATUS                                = 0x1184,
-    CMSG_QUESTGIVER_HELLO                                 = 0x1185,
-    SMSG_QUESTGIVER_QUEST_LIST                            = 0x1186,
+    CMSG_QUESTGIVER_STATUS_QUERY                          = 0x4407, // 4.3.4 15595
+    SMSG_QUESTGIVER_STATUS                                = 0x2115, // 4.3.4 15595
+    CMSG_QUESTGIVER_HELLO                                 = 0x0D17, // 4.3.4 15595
+    SMSG_QUESTGIVER_QUEST_LIST                            = 0x0134, // 4.3.4 15595
     CMSG_QUESTGIVER_QUERY_QUEST                           = 0x1187,
     CMSG_QUESTGIVER_QUEST_AUTOLAUNCH                      = 0x1188,
     SMSG_QUESTGIVER_QUEST_DETAILS                         = 0x1189,