diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index b18f49581..f1afbca3f 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -129,8 +129,6 @@ struct BattleGroundObjectInfo
     uint32      spellid;
 };
 
-#define MAX_QUEUED_PLAYERS_MAP 7
-
 enum BattleGroundTypeId
 {
     BATTLEGROUND_AV     = 1,
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index 193e5f430..981468dd2 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -30,9 +30,9 @@ typedef std::map<uint32, BattleGround*> BattleGroundSet;
 //typedef std::map<uint32, BattleGroundQueue*> BattleGroundQueueSet;
 typedef std::deque<BattleGround*> BGFreeSlotQueueType;
 
-#define MAX_BATTLEGROUND_QUEUES 7                           // for level ranges 10-19, 20-29, 30-39, 40-49, 50-59, 60-69, 70+
+#define MAX_BATTLEGROUND_QUEUES 8                           // for level ranges 10-19, 20-29, 30-39, 40-49, 50-59, 60-69, 70-79, 80+
 
-#define MAX_BATTLEGROUND_TYPES 9                            // each BG type will be in array
+#define MAX_BATTLEGROUND_TYPES 12                           // each BG type will be in array
 
 struct PlayerQueueInfo
 {
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index ab8e41750..65219c89b 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17923,15 +17923,15 @@ uint32 Player::GetMinLevelForBattleGroundQueueId(uint32 queue_id)
     if(queue_id < 1)
         return 0;
 
-    if(queue_id >=6)
-        queue_id = 6;
+    if(queue_id >=7)
+        queue_id = 7;
 
     return 10*(queue_id+1);
 }
 
 uint32 Player::GetMaxLevelForBattleGroundQueueId(uint32 queue_id)
 {
-    if(queue_id >=6)
+    if(queue_id >=7)
         return 255;                                         // hardcoded max level
 
     return 10*(queue_id+2)-1;
@@ -17942,8 +17942,8 @@ uint32 Player::GetBattleGroundQueueIdFromLevel() const
     uint32 level = getLevel();
     if(level <= 19)
         return 0;
-    else if (level > 69)
-        return 6;
+    else if (level > 79)
+        return 7;
     else
         return level/10 - 1;                                // 20..29 -> 1, 30-39 -> 2, ...
 }