diff --git a/NOTES.md b/NOTES.md
index 04e83b344..aad730919 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -160,6 +160,8 @@ Or more importantly, we need to calculate the pixel length of a linestring,
 calculate the width of a glyph, and do the necessary math so that it fills enough
 of the line without overflowing.
 
+See the [textPath element](http://www.w3.org/TR/SVG/text.html#TextPathElement) and its quirks.
+
 See:
 
 * [getComputedTextLength](http://www.w3.org/TR/SVG/text.html#__svg__SVGTextContentElement__getComputedTextLength)
diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
index 1cd515595..9f870474a 100755
--- a/js/iD/renderer/Map.js
+++ b/js/iD/renderer/Map.js
@@ -240,6 +240,15 @@ iD.Map = function(elem) {
     var apiTilesLoaded = {};
 
     function apiTiles() {
+
+        function tileAtZoom(t, distance) {
+            var power = Math.pow(2, distance);
+            return [
+                Math.floor(t[0] * power),
+                Math.floor(t[1] * power),
+                t[2] + distance];
+        }
+
         var t = projection.translate(),
             s = projection.scale(),
             z = Math.max(Math.log(s) / Math.log(2) - 8, 0);
@@ -261,7 +270,11 @@ iD.Map = function(elem) {
         });
 
         return coords.filter(function(c) {
-            return !apiTilesLoaded[c];
+            if (apiTilesLoaded[c]) return false;
+            for (var i = 0; i < 4; i++) {
+                if (apiTilesLoaded[tileAtZoom(c, -i)]) return false;
+            }
+            return true;
         }).map(function(c) {
             var x = (c[0] * ts) - tile_origin[0];
             var y = (c[1] * ts) - tile_origin[1];
@@ -286,9 +299,12 @@ iD.Map = function(elem) {
     }, 1000);
 
     function deselectClick() {
+        var hadSelection = !!selection;
         selection = null;
-        drawVector();
-        d3.select('.inspector-wrap').style('display', 'none');
+        if (hadSelection) {
+            drawVector();
+            d3.select('.inspector-wrap').style('display', 'none');
+        }
     }
 
     function selectClick(d) {