Add count type to Agent check

Wanted to do that initially but realized that the variables will potentially be used twice and also to avoid going over the 72 char limit on line 156.