Fixed extraction of headers_more