Hotfix so that election tag search works well
Fixed conflicts in merge