Adjust header matching scheme + formatting