More work on the Country Filter