Headers management improvements