Survey module can now handle unlimited number of choices