Added checks for including quotes using htmlentities