diff --git a/LevelRange-Turtle.toc b/LevelRange-Turtle.toc
index eb2b2ac..7ba1001 100644
--- a/LevelRange-Turtle.toc
+++ b/LevelRange-Turtle.toc
@@ -1,6 +1,6 @@
 ## Interface: 11200
 ## Title: LevelRange [|cff3fcf26Turtle|r]
-## Version: 2.0.5
+## Version: 2.0.8
 ## Author: Bull3t, Tenyar97, rado-boy, blehz, Spartelfant.
 ## Notes: Shows the zone level range on the World Map. Now with 100% more turtles!
 ## Notes-esES: Muestra el rango de niveles de zona en el mapa mundial. ¡Ahora con un 100 % más de tortugas!
diff --git a/LevelRange.lua b/LevelRange.lua
index c7c26a6..aee66f2 100644
--- a/LevelRange.lua
+++ b/LevelRange.lua
@@ -18,7 +18,7 @@
 LEVELRANGE_NAME     = "LevelRange"
 
 -- Version Number
-LEVELRANGE_VERSION  = "2.0.5";
+LEVELRANGE_VERSION  = "2.0.8";
 
 -- Details
 Details = {
@@ -204,7 +204,7 @@ LEVELRANGE_INSTANCES = {
     [LEVELRANGE_TANARIS]            = {LEVELRANGE_ZULFARRAK, " (44-54)", LEVELRANGE_COTBLACKMORASS, " (60+)"},
     -- added in patch 1.18
     [LEVELRANGE_BALOR]              = {LEVELRANGE_STORMWROUGHTRUINS, " (35-41)"},
-    [LEVELRANGE_GRIMREACHES]        = {LEVELRANGE_DRAGONMAWRETREAT, " (27-33)"},
+    [LEVELRANGE_WETLANDS]           = {LEVELRANGE_DRAGONMAWRETREAT, " (27-33)"},
 };
 
 -- Raids
@@ -381,25 +381,27 @@ local lLR_OldUpdate = function() end;
 -- Replacement function to draw all the extra goodies of LevelRange
 function LevelRange_WorldMapButton_OnUpdate(arg1)
     lLR_OldUpdate(arg1);
-    local areaName = WorldMapFrame.areaName;
+
+    local areaNameRaw = WorldMapFrame.areaName or "";
+    local _, _, areaNameTrimmed = string.find(areaNameRaw, "^%s*(.-)%s*$"); -- 2.0.7: Fixed code added in 2.0.6 to trim whitespace to deal with patch 1.18 bug for Northwind zone: In-game name contains trailing space 'Northwind '.
     local zoneNum = GetCurrentMapZone();
 
     -- Zone name equivalence map
-    if LEVELRANGE_SUBZONES[areaName] then
-        areaName = LEVELRANGE_SUBZONES[areaName];
+    if LEVELRANGE_SUBZONES[areaNameTrimmed] then
+        areaNameTrimmed = LEVELRANGE_SUBZONES[areaNameTrimmed];
     end
 
     -- Bail out if nothing has changed
-    if zoneNum == lLR_CurrentZone and areaName == lLR_CurrentArea then
+    if zoneNum == lLR_CurrentZone and areaNameRaw == lLR_CurrentArea then
         return;
     else
       lLR_CurrentZone = zoneNum;
-      lLR_CurrentArea = areaName;
+      lLR_CurrentArea = areaNameRaw;
     end
 
     -- Continent or zone map?
     if zoneNum == 0 then
-        lUpdateTooltip(areaName);
+        lUpdateTooltip(areaNameTrimmed);
     else
         lUpdateTooltip(nil);            -- hide it
     end
diff --git a/Readme.txt b/Readme.txt
index 0a687ee..caa842b 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -9,7 +9,7 @@ Details
 ----------------------
 Title: 	        LevelRange
 Interface:      11200
-Version:        2.0.5
+Version:        2.0.8
 
 Author:         Bull3t, Tenyar97, rado-boy, blehz, Spartelfant.
 Addon Website:  https://github.com/Tenyar97/LevelRange-Turtle
@@ -22,6 +22,15 @@ Current Features:
 ----------------------
 Change Log
 ----------------------
+2.0.8 - Update (Spartelfant)
+ [*] Fixed location of Dragonmaw Retreat: I had listed it mistakenly as being in Grim Reaches, but it's located in Wetlands.
+
+2.0.7 - Update (Spartelfant)
+ [*] Fixed bug in workaround for game bug. I previously used string.match() which is not available in-game, but during testing I had another addon active that made this function available, which is why I did not catch this.
+
+2.0.6 - Update (Spartelfant)
+ [*] Added workaround for game bug that prevented the new Northwind zone from showing a tooltip: The game included a trailing space, so the actual zone name is 'Northwind '.
+
 2.0.5 - Update (Spartelfant)
  [*] New zones added for patch 1.18 (Grim Reaches, Northwind, Balor)
  [*] New dungeons added for patch 1.18 (Stormwrought Ruins, Dragonmaw Retreat)