Caught a problem with grep -c output, fixing with grep -o

Caught a problem with grep -c output giving false positives, fixing
with grep -o.