Fix loosing layer details upon heatmap creation