Poll option property updated to prevent unnecessary database hits
Poll templates updated