diff --git a/js/id/behavior/lasso.js b/js/id/behavior/lasso.js
index 0a26f311d..95112d8c2 100644
--- a/js/id/behavior/lasso.js
+++ b/js/id/behavior/lasso.js
@@ -49,7 +49,7 @@ iD.behavior.Lasso = function(context) {
                 .on('mouseup.lasso', null);
 
             if (d3.event.clientX !== pos[0] || d3.event.clientY !== pos[1]) {
-                var selected = context.graph().intersects(extent);
+                var selected = context.history().intersects(extent);
 
                 if (selected.length) {
                     context.enter(iD.modes.Select(context, _.pluck(selected, 'id')));
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index ef101dbc7..39f91d0b1 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -43,7 +43,7 @@ iD.Map = function(context) {
                 }
             }, true)
             .on('mouseup.zoom', function() {
-                if (resetTransform) redraw();
+                if (resetTransform()) redraw();
             })
             .attr('id', 'surface')
             .call(iD.svg.Surface());
@@ -65,7 +65,7 @@ iD.Map = function(context) {
             graph = context.graph();
 
         if (!difference) {
-            all = graph.intersects(extent);
+            all = context.history().intersects(extent);
             filter = d3.functor(true);
         } else {
             var complete = difference.complete(extent);
diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js
index 596c576ad..7f98636ed 100644
--- a/js/id/ui/contributors.js
+++ b/js/id/ui/contributors.js
@@ -2,7 +2,7 @@ iD.ui.contributors = function(context) {
     function update(selection) {
         var users = {},
             limit = 3,
-            entities = context.graph().intersects(context.map().extent());
+            entities = context.history().intersects(context.map().extent());
 
         for (var i in entities) {
             if (entities[i].user) users[entities[i].user] = true;