applied country-league selector
solved some nasty bugs
Merge branch 'dev'