Fix event filtering