Fixing html regex, update to CodeWind logic