Updated poll parser