Some updates regarding header filtering,