Misc

- Reverts #1472
- Fixes escaping of html tags in static text