Correcting headers_more extraction