More changes for new NativeVotes features