- Fixed escape issue in templates