fixed heatmap and marker behavior