[#176] Country filtering with improved performance

@zzgvh Improved performance based on our talk Friday. Can you take a look?