Added more filter code
Added mapping for country codes