Minor Bug fixes for standard vote and National Election