Add species filter, refactor language handling.