WIP: Additional Country Filters

This comment should be updated or removed since the second part of it is irrelevant now.