fix header extraction from query