diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index a510bfc7a..35d18deec 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -189,6 +189,7 @@ export function Map(context) {
     }
 
     function zoomPan(manualEvent) {
+        return; // TODO
 
         var eventTransform = (manualEvent || d3.event).transform;
 
diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index f408302d5..086477d52 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -118,7 +118,7 @@ export function FeatureList(context) {
                 });
             }
 
-            var visible = context.surface().selectAll('.point, .line, .area')[0];
+            var visible = context.surface().selectAll('.point, .line, .area').nodes();
             for (var i = 0; i < visible.length && result.length <= 200; i++) {
                 addEntity(visible[i].__data__);
             }