Added option to constrain by country