Also pass on the country to the address fields filters

This way you know for which country you are doing customisations to the fields, much needed information in many cases.