be more flexible about county naming