Better handling of old polls