header fix and event filtering