Fix heatmap automatic scrolling when dragging a selection and searching
Small HCL improvements