Added Advpoll patch for removing field choice index.