Place headers in its own filter

@evansb Please check.