Fixed the event build/ident loop in the filter