Added in fix for scatterplot onClick events