Added checks for more html tags