Bringing mvc framework in line with ghaml changes for XSS protection