Also changed usage of html_safe to make use of raw() instead so that the intended behaviour is verified with raw()