WATERSMART-342
Switched how this is being done to be more consistent with how the data makes it to the download
WATERSMART-341
Added text from Blodgett, adjust accordingly
WATERSMART-341
Adjusted accordingly