Gh 812

*Needs migration* Tested this locally.  Contains fixed for both gh-812 and gh-869.  

I'd like to double check this on staging where there is more data once merged just to confirm with more data.