Big update to parser, refs #6550, refs #6533
Correct counts for unmatched