Adds count to flag query results.
Merge branch 'class-flags' into mit-prod