Modifications to make poll app work at least as it was before.