CivilTongue: Add poll name to filtering.

Also optimize the error checking.