Rearrange settings one more time && drop advanced headers