diff --git a/js/id/taginfo.js b/js/id/taginfo.js
index 051339d27..103c7e565 100644
--- a/js/id/taginfo.js
+++ b/js/id/taginfo.js
@@ -1,8 +1,41 @@
 iD.taginfo = function() {
     var taginfo = {},
-        endpoint = 'http://taginfo.openstreetmap.org/api/2/';
+        endpoint = 'http://taginfo.openstreetmap.org/api/2/',
+        tag_sorts = {
+            point: 'count_nodes',
+            vertex: 'count_nodes',
+            area: 'count_ways',
+            line: 'count_ways'
+        },
+        tag_filters = {
+            point: 'nodes',
+            vertex: 'nodes',
+            area: 'ways',
+            line: 'ways'
+        };
+
+
+    function sets(parameters, n, o) {
+        if (parameters.geometry && o[parameters.geometry]) {
+            parameters[n] = o[parameters.geometry];
+        }
+        return parameters;
+    }
+
+    function setFilter(parameters) {
+        return sets(parameters, 'filter', tag_filters);
+    }
+
+    function setSort(parameters) {
+        return sets(parameters, 'sortname', tag_sorts);
+    }
+
+    function clean(parameters) {
+        return _.omit(parameters, 'geometry');
+    }
 
     taginfo.keys = function(parameters, callback) {
+        parameters = clean(setSort(setFilter(parameters)));
         d3.json(endpoint + 'db/keys?' +
             iD.util.qsString(_.extend({
                 rp: 6,
@@ -13,6 +46,7 @@ iD.taginfo = function() {
     };
 
     taginfo.values = function(parameters, callback) {
+        parameters = clean(setSort(setFilter(parameters)));
         d3.json(endpoint + 'db/keys/values?' +
             iD.util.qsString(_.extend({
                 rp: 20,
@@ -23,6 +57,7 @@ iD.taginfo = function() {
     };
 
     taginfo.docs = function(parameters, callback) {
+        parameters = clean(setSort(parameters));
         d3.json(endpoint + 'wiki/tags?' +
             iD.util.qsString(parameters), callback);
     };
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 40bea7889..6ad48acc5 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -7,7 +7,7 @@ iD.Inspector = function() {
     function inspector(selection) {
         var entity = selection.datum();
 
-        selection.html("").append('button')
+        selection.html('').append('button')
             .attr('class', 'narrow close')
             .html("<span class='icon close'></span>")
             .on('click', function() {
@@ -29,13 +29,16 @@ iD.Inspector = function() {
 
         tagList = inspectorwrap.append('ul');
 
-        inspectorwrap.append('div').attr('class', 'add-tag-row').append('button')
-            .attr('class', 'add-tag')
-            .text('+ Add New Tag')
-            .on('click', function() {
-                addTag();
-                focusNewKey();
-            });
+        inspectorwrap
+            .append('div')
+            .attr('class', 'add-tag-row')
+            .append('button')
+                .attr('class', 'add-tag')
+                .text('+ Add New Tag')
+                .on('click', function() {
+                    addTag();
+                    focusNewKey();
+                });
 
         drawTags(entity.tags);
 
@@ -87,6 +90,8 @@ iD.Inspector = function() {
     }
 
     function drawTags(tags) {
+        var entity = tagList.datum();
+
         tags = d3.entries(tags);
 
         if (!tags.length) {
@@ -134,7 +139,9 @@ iD.Inspector = function() {
                 .attr('tabindex', -1)
                 .attr('target', '_blank')
                 .on('click', function(d) {
-                    taginfo.docs(d, function(err, docs) {
+                    taginfo.docs(_.extend({}, d, {
+                            geometry: entity.geometry()
+                        }), function(err, docs) {
                         var en = _.find(docs, function(d) {
                             return d.lang == 'en';
                         });
@@ -174,13 +181,18 @@ iD.Inspector = function() {
     }
 
     function bindTypeahead() {
-        var row = d3.select(this),
+        var entity = tagList.datum(),
+            geometry = entity.geometry(),
+            row = d3.select(this),
             key = row.selectAll('.key'),
             value = row.selectAll('.value');
 
         key.call(d3.typeahead()
             .data(function(_, callback) {
-                taginfo.keys({query: key.property('value')}, function(err, data) {
+                taginfo.keys({
+                    geometry: geometry,
+                    query: key.property('value')
+                }, function(err, data) {
                     callback(data.data.map(function (d) {
                         return {value: d.key};
                     }));
@@ -191,6 +203,7 @@ iD.Inspector = function() {
             .data(function(_, callback) {
                 taginfo.values({
                     key: key.property('value'),
+                    geometry: geometry,
                     query: value.property('value')
                 }, function(err, data) {
                     callback(data.data.map(function (d) {