diff --git a/modules/ui/disclosure.js b/modules/ui/disclosure.js
index 65bde0359..cbe973bfd 100644
--- a/modules/ui/disclosure.js
+++ b/modules/ui/disclosure.js
@@ -12,9 +12,10 @@ export function Disclosure() {
         var $link = selection.selectAll('.hide-toggle')
             .data([0]);
 
-        $link.enter().append('a')
+        $link = $link.enter().append('a')
             .attr('href', '#')
-            .attr('class', 'hide-toggle');
+            .attr('class', 'hide-toggle')
+            .merge($link);
 
         $link.text(title)
             .on('click', toggle)
@@ -23,7 +24,7 @@ export function Disclosure() {
         var $body = selection.selectAll('div')
             .data([0]);
 
-        $body.enter().append('div');
+        $body = $body.enter().append('div').merge($body);
 
         $body.classed('hide', !expanded)
             .call(content);
diff --git a/test/spec/ui/raw_tag_editor.js b/test/spec/ui/raw_tag_editor.js
index 96ac2cc61..ca1b2da7f 100644
--- a/test/spec/ui/raw_tag_editor.js
+++ b/test/spec/ui/raw_tag_editor.js
@@ -54,23 +54,23 @@ describe('iD.ui.RawTagEditor', function() {
     });
 
     it('adds tags when pressing the TAB key on last input.value', function (done) {
-        expect(element.selectAll('.tag-list li')[0].length).to.eql(1);
-        var input = d3.select('.tag-list li:last-child input.value')[0][0];
+        expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
+        var input = d3.select('.tag-list li:last-child input.value').nodes()[0];
         happen.keydown(d3.select(input).node(), {keyCode: 9});
         setTimeout(function() {
-            expect(element.selectAll('.tag-list li')[0].length).to.eql(2);
-            expect(element.select('.tag-list').selectAll('input')[0][2].value).to.be.empty;
-            expect(element.select('.tag-list').selectAll('input')[0][3].value).to.be.empty;
+            expect(element.selectAll('.tag-list li').nodes().length).to.eql(2);
+            expect(element.select('.tag-list').selectAll('input').nodes()[2].value).to.be.empty;
+            expect(element.select('.tag-list').selectAll('input').nodes()[3].value).to.be.empty;
             done();
         }, 20);
     });
 
     it('does not add a tag when pressing TAB while shift is pressed', function (done) {
-        expect(element.selectAll('.tag-list li')[0].length).to.eql(1);
-        var input = d3.select('.tag-list li:last-child input.value')[0][0];
+        expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
+        var input = d3.select('.tag-list li:last-child input.value').nodes()[0];
         happen.keydown(d3.select(input).node(), {keyCode: 9, shiftKey: true});
         setTimeout(function() {
-            expect(element.selectAll('.tag-list li')[0].length).to.eql(1);
+            expect(element.selectAll('.tag-list li').nodes().length).to.eql(1);
             done();
         }, 20);
     });