change order of pushstream and more headers