UAT-203 Factorized data-loading in Heatmap caused error

This has been corrected by adding argument to data-loading function.