Removed the need of using raw filter in templates