diff --git a/js/id/ui/address.js b/js/id/ui/address.js
index fb96169f1..75a712768 100644
--- a/js/id/ui/address.js
+++ b/js/id/ui/address.js
@@ -37,22 +37,22 @@ iD.ui.preset.address = function() {
             .property('type', 'text')
             .attr('placeholder', 'Housename')
             .attr('class', 'addr-housename')
-            .data({ 'key': 'addr:housename' });
+            .datum({ 'key': 'addr:housename' });
 
         selection.append('input')
             .property('type', 'text')
             .attr('placeholder', '123')
             .attr('class', 'addr-number')
-            .data({ 'key': 'addr:housenumber' });
+            .datum({ 'key': 'addr:housenumber' });
 
         var streetwrap = selection.append('span')
-            .attr('class', 'input-wrap-position');
+            .attr('class', 'input-wrap-position')
+            .datum({ 'key': 'addr:streetname' });
 
         streetwrap.append('input')
             .property('type', 'text')
             .attr('placeholder', 'Oak Street')
-            .attr('class', 'addr-streetname')
-            .data({ 'key': 'addr:streetname' });
+            .attr('class', 'addr-streetname');
 
         streetwrap.call(d3.combobox().data(getStreets()));
     }
diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js
index 2a0d4af62..408571a20 100644
--- a/js/id/ui/taglist.js
+++ b/js/id/ui/taglist.js
@@ -13,6 +13,7 @@ iD.ui.Taglist = function() {
                 .attr('class','hide-toggle')
                 .text('Additional tags')
                 .on('click', function() {
+                    collapsebutton.classed('expanded', wrap.classed('hide'));
                     wrap.call(iD.ui.Toggle(wrap.classed('hide')));
                     selection.node().parentNode.scrollTop += 200;
                 });
@@ -38,7 +39,7 @@ iD.ui.Taglist = function() {
             .attr('class', 'label')
             .text(t('inspector.new_tag'));
 
-        collapsebutton.classed('expanded', collapsed);
+        collapsebutton.classed('expanded', !collapsed);
         wrap.classed('hide', collapsed);
     }