diff --git a/classes/election_cycle.py b/classes/election_cycle.py
index 2f3aac0..8eac21b 100644
--- a/classes/election_cycle.py
+++ b/classes/election_cycle.py
@@ -26,9 +26,7 @@ from utils import (
     build_highcouncil_votes_str,
     build_votes_str,
     edit_clan_council_info,
-    get_cl_election_name,
     get_datetime,
-    get_dm_election_name,
     get_election_name,
 )
 
@@ -298,7 +296,7 @@ class ElectionCycle:
             stmt = (
                 select(Votes.VotedForId)
                 .where(Votes.ElectionCycle == election_name)
-                .where(Votes.Type == VoteType.COUNCIL.value)
+                .where(Votes.Type == VoteType.COUNCIL)
             )
             vote_count = collections.Counter(session.scalars(stmt))
 
@@ -363,11 +361,13 @@ class ElectionCycle:
             self.config.params.clan_council_role_id
         )
 
+        election_cycle = get_election_name(self.config)
+
         with Session(engine) as session:
             # role management
             stmt = (
                 select(CouncilMembers.MemberId)
-                .where(CouncilMembers.ElectionCycle == get_election_name(self.config))
+                .where(CouncilMembers.ElectionCycle == election_cycle)
                 .where(CouncilMembers.Elected == true())
             )
 
@@ -384,14 +384,19 @@ class ElectionCycle:
 
             # announce high council members
             # ties are undefined behavior.
-            dm_election = get_dm_election_name(self.config)
-            cl_election = get_cl_election_name(self.config)
-            stmt = select(Votes.VotedForId).where(Votes.ElectionCycle == dm_election)
+            stmt = (
+                select(Votes.VotedForId)
+                .where(Votes.ElectionCycle == election_cycle)
+                .where(Votes.Type == VoteType.DISCORDMANAGER)
+            )
             dm_votes = collections.Counter(session.scalars(stmt))
-            stmt = select(Votes.VotedForId).where(Votes.ElectionCycle == cl_election)
+            stmt = (
+                select(Votes.VotedForId)
+                .where(Votes.ElectionCycle == election_cycle)
+                .where(Votes.Type == VoteType.CLANLEADER)
+            )
             cl_votes = collections.Counter(session.scalars(stmt))
 
-            election_cycle = get_election_name(self.config)
             try:
                 dm_winner = max(dm_votes, key=dm_votes.get)
                 stmt = (