This is how I have it right now. However, it's rather confusing as I have filter and chart widgets set up, and I would need double the filters and charts to ensure that the right data is displayed regardless of which layer style (heat map or point) you are looking at.