Cleaning up secondary header. #638
Fixing security vulnerability for XSS. Closes #1345