further Encounter.country display filtering support (reverse-merged from commit 6cd30093e4cc8a908e6906fb7c10f01bea8b6c05)