Fix handling of Raw HTML