Update column to use description only
Different criteria for counting
HTML escape
Fix use of dates
Merge pull request #2459 from dimagi/fri-feedback

Fri reporting feedback