Rewrite of heatmap axis threshold dropping logic