more changes for text header support