Fixing heatmap querying to not include nulls