Enhanced matches for headers. Better header parsing.