Removed ignore filter on Collator
Fixed value annotations on HeatMaps