better filtering of incidents