fixed rawhtml issues