Bugfix filters.
Merge branch 'league' into develop