have reverse fall back to country table when no country is found

have reverse fall back to country table when no country is found #1672