diff --git a/modules/ui/tag_reference.js b/modules/ui/tag_reference.js
index b5e5e5ec8..35a96376c 100644
--- a/modules/ui/tag_reference.js
+++ b/modules/ui/tag_reference.js
@@ -170,8 +170,14 @@ export function uiTagReference(tag) {
 
 
     tagReference.body = function(selection) {
+
+        var tagid = tag.rtype || (tag.key + '-' + tag.value);
+
         body = selection.selectAll('.tag-reference-body')
-            .data([0]);
+            .data([tagid], function(d) { return d; });
+
+        body.exit()
+            .remove();
 
         body = body.enter()
             .append('div')