poll template rewriting - added options and choosing which are correct