More work on VoteRetriever