CLOUD-349 fixed event filtering