diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index bd4cc4fb8..87d958765 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -106,7 +106,8 @@ function filterRoles(geometry) {
 function valKey(d) {
     return {
         value: d.key,
-        title: d.key
+        title: d.key,
+        count: d.count
     };
 }
 
@@ -114,7 +115,8 @@ function valKey(d) {
 function valKeyDescription(d) {
     return {
         value: d.value,
-        title: d.description || d.value
+        title: d.description || d.value,
+        count: d.count
     };
 }
 
@@ -122,7 +124,8 @@ function valKeyDescription(d) {
 function roleKey(d) {
     return {
         value: d.role,
-        title: d.role
+        title: d.role,
+        count: d.count
     };
 }
 
diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index b5f5e4a5c..2274ad498 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -181,6 +181,10 @@ export function uiFieldCombo(field, context) {
         taginfo[fn](params, function(err, data) {
             if (err) return;
 
+            data = data.filter(function(d) {
+                return !d.count || d.count > 10;
+            });
+
             var deprecatedValues = osmEntity.deprecatedTagValuesByKey()[field.key];
             if (deprecatedValues) {
                 // don't suggest deprecated tag values