Fix skipping of responses on unitId mismatch

[kevingarman]

The unitId filter was dropping out of the loop completely thus missing responses that were valid but behind responses that were not.