Fix table rate to support all countries if so desired