Add event/find policy

Fixes regression in tests.