better headers pre-filtering