Fix to scrolling the heatmaps

- Scrolling would reset the organisation data -> fixed
Merge branch 'develop'