- xss exceptions were broken
- adding templates was broken