Added secondary unit filters to sighted events

Added secondary unit filters to all sighted events I found which seemed
like they might suffer from the same problem as bug #22466.

Fixes bug #22466.