WIP: Image annotations are mapped to the Heatmap as not comments