diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index 283772a6de..2ada370cbd 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -194,7 +194,7 @@ export default {
         _inflight = {};
         _taginfoCache = {};
         _popularKeys = {
-            // manually exclude some keys – #5377, #7485
+            // manually exclude some keys – #5377, #7485            
             postal_code: true,
             full_name: true,
             loc_name: true,
@@ -222,7 +222,7 @@ export default {
         this.keys(params, function(err, data) {
             if (err) return;
             data.forEach(function(d) {
-                if (d.value === 'opening_hours') return;  // exception
+                if (d.value === 'opening_hours') return;  //exception
                 _popularKeys[d.value] = true;
             });
         });
@@ -289,7 +289,7 @@ export default {
     values: function(params, callback) {
         // Exclude popular keys from values lookups.. see #3955
         var key = params.key;
-        if (key && _popularKeys[key]) {
+        if (key && _popularKeys[key] || key.slice(0,4)==='name') {
             callback(null, []);
             return;
         }