diff --git a/esm/components/data_layer/base.js b/esm/components/data_layer/base.js
index 3d13567c..881c9cf2 100644
--- a/esm/components/data_layer/base.js
+++ b/esm/components/data_layer/base.js
@@ -1225,7 +1225,7 @@ class BaseDataLayer {
             // This method may be used on two kinds of events: directly attached, or bubbled.
             // D3 doesn't natively support bubbling very well; if no data is bound on the currentTarget, check to see
             //  if there is data available at wherever the event was initiated from
-            element = d3.select(d3.event.target).datum();
+            element = element || d3.select(d3.event.target).datum();
 
             // Do nothing if the required control and shift key presses (or lack thereof) doesn't match the event
             if (requiredKeyStates.ctrl !== !!d3.event.ctrlKey || requiredKeyStates.shift !== !!d3.event.shiftKey) {
diff --git a/esm/layouts/index.js b/esm/layouts/index.js
index d9284398..944c48a0 100644
--- a/esm/layouts/index.js
+++ b/esm/layouts/index.js
@@ -224,8 +224,7 @@ const coaccessibility_layer = {
         {
             scale_function: 'ordinal_cycle',
             parameters: {
-                // Modified from colorbrewer 9-class GnBu (balance separate categories with aesthetics)
-                values: ['#ccebc5', '#a8ddb5', '#7bccc4', '#4eb3d3', '#2b8cbe', '#0868ac', '#084081'],
+                values: ['#1f77b4', '#aec7e8', '#ff7f0e', '#ffbb78', '#2ca02c', '#98df8a', '#d62728', '#ff9896', '#9467bd', '#c5b0d5', '#8c564b', '#c49c94', '#e377c2', '#f7b6d2', '#7f7f7f', '#c7c7c7', '#bcbd22', '#dbdb8d', '#17becf', '#9edae5'], // Drawn from d3v3 "category20"
             },
         },
     ],